feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS: Fallback to raw revision if decorate fails

Browse Source 
Change-Id: I64537306723dc1bd3c979f22af2213f0f5cd8f84
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Orgad Shaneh
2012-06-04 22:06:15 +03:00
committed by Tobias Hunger
parent ddc0c89bd6
commit a452db5055
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -1156,7 +1156,7 @@ QString GitClient::synchronousShortDescription(const QString &workingDirectory,
VcsBase::VcsBaseOutputWindow *outputWindow = VcsBase::VcsBaseOutputWindow::instance();
outputWindow->appendSilently(tr("Cannot describe revision \"%1\" in \"%2\": %3")
.arg(revision, workingDirectory, commandOutputFromLocal8Bit(errorText)));
return QString();
return revision;
}
description = commandOutputFromLocal8Bit(outputTextData);
if (description.endsWith(QLatin1Char('\n')))

2
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -211,7 +211,7 @@ QString MercurialClient::shortDescriptionSync(const QString &workingDirectory,
args << QLatin1String("--template") << format;
QByteArray outputData;
if (!vcsFullySynchronousExec(workingDirectory, args, &outputData))
return QString();
return revision;
description = QString::fromLocal8Bit(outputData);
description.remove(QLatin1Char('\r'));
if (description.endsWith(QLatin1Char('\n')))