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

Git: Return QByteArray in synchronousShow

Browse Source 
Will be used by Grep

Change-Id: I9346707eef2fe55085b0edf090e117fe45afe8bf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-02-07 23:34:25 +02:00
committed by Orgad Shaneh
parent 71166d06d0
commit d4816850f0
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1814,7 +1814,7 @@ SubmoduleDataMap GitClient::submoduleList(const QString &workingDirectory) const
}
bool GitClient::synchronousShow(const QString &workingDirectory, const QString &id,
QString *output, QString *errorMessage) const
QByteArray *output, QString *errorMessage) const
{
if (!canShow(id)) {
*errorMessage = msgCannotShow(id);
@@ -1822,12 +1822,9 @@ bool GitClient::synchronousShow(const QString &workingDirectory, const QString &
}
QStringList args(QLatin1String("show"));
args << QLatin1String(decorateOption) << QLatin1String(noColorOption) << id;
QByteArray outputText;
QByteArray errorText;
const bool rc = vcsFullySynchronousExec(workingDirectory, args, &outputText, &errorText);
if (rc)
*output = commandOutputFromLocal8Bit(outputText);
else
const bool rc = vcsFullySynchronousExec(workingDirectory, args, output, &errorText);
if (!rc)
msgCannotRun(QStringList(QLatin1String("show")), workingDirectory, errorText, errorMessage);
return rc;
}

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

@@ -226,7 +226,7 @@ public:
QString *errorMessage = 0) const;
SubmoduleDataMap submoduleList(const QString &workingDirectory) const;
bool synchronousShow(const QString &workingDirectory, const QString &id,
QString *output, QString *errorMessage) const;
QByteArray *output, QString *errorMessage) const;
bool synchronousRevListCmd(const QString &workingDirectory, const QStringList &arguments,
QString *output, QString *errorMessage = 0) const;