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

Vcs: Make VcsBaseClient return stderr on fullySynchronous execution

Browse Source 
Change-Id: I7a72a2f865148d7cf375897ec944a45f4b440818
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-04-10 15:23:20 +02:00
parent 60f5372b67
commit 7c083eadee
5 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,7 +244,7 @@ QString MercurialClient::shortDescriptionSync(const QString &workingDirectory,
QByteArray outputData;
if (!vcsFullySynchronousExec(workingDirectory, args, &outputData))
return revision;
description = SynchronousProcess::normalizeNewlines(QString::fromLocal8Bit(outputData));
description = commandOutputFromLocal8Bit(outputData);
if (description.endsWith(QLatin1Char('\n')))
description.truncate(description.size() - 1);
return description;