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

Git: Suppress command logging for internal git-remote calls

Browse Source 
Change-Id: I8cd93d0f5fdcc685af1cf1526eecf97d3b19eeff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-04-23 08:59:43 +03:00
committed by Orgad Shaneh
parent 42075c1224
commit 2a8350eca8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2331,13 +2331,13 @@ bool GitClient::synchronousForEachRefCmd(const QString &workingDirectory, QStrin
} }
bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, bool GitClient::synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs,
QString *output, QString *errorMessage) QString *output, QString *errorMessage, bool silent)
{ {
remoteArgs.push_front(QLatin1String("remote")); remoteArgs.push_front(QLatin1String("remote"));
QByteArray outputText; QByteArray outputText;
QByteArray errorText; QByteArray errorText;
const bool rc = fullySynchronousGit(workingDirectory, remoteArgs, &outputText, &errorText); if (!fullySynchronousGit(workingDirectory, remoteArgs, &outputText, &errorText,
if (!rc) { silent ? VcsBasePlugin::SuppressCommandLogging : 0)) {
msgCannotRun(remoteArgs, workingDirectory, errorText, errorMessage); msgCannotRun(remoteArgs, workingDirectory, errorText, errorMessage);
return false; return false;
} }
@@ -2352,7 +2352,7 @@ QMap<QString,QString> GitClient::synchronousRemotesList(const QString &workingDi
QString output; QString output;
QString error; QString error;
QStringList args(QLatin1String("-v")); QStringList args(QLatin1String("-v"));
if (!synchronousRemoteCmd(workingDirectory, args, &output, &error)) { if (!synchronousRemoteCmd(workingDirectory, args, &output, &error, true)) {
msgCannotRun(error, errorMessage); msgCannotRun(error, errorMessage);
return result; return result;
} }

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

@@ -206,7 +206,7 @@ public:
bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args, bool synchronousForEachRefCmd(const QString &workingDirectory, QStringList args,
QString *output, QString *errorMessage = 0); QString *output, QString *errorMessage = 0);
bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs, bool synchronousRemoteCmd(const QString &workingDirectory, QStringList remoteArgs,
QString *output, QString *errorMessage); QString *output, QString *errorMessage, bool silent = false);
QMap<QString,QString> synchronousRemotesList(const QString &workingDirectory, QMap<QString,QString> synchronousRemotesList(const QString &workingDirectory,
QString *errorMessage = 0); QString *errorMessage = 0);