diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 5e6bddd9eaf934ffb79f5e29d077a52a3de81083..5d23f7ebed5614a358410e1f533c46eccc1c739c 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1649,14 +1649,15 @@ void GitClient::addFile(const QString &workingDirectory, const QString &fileName } bool GitClient::synchronousLog(const QString &workingDirectory, const QStringList &arguments, - QString *output, QString *errorMessageIn) + QString *output, QString *errorMessageIn, unsigned flags) { QByteArray outputText; QByteArray errorText; QStringList allArguments; allArguments << QLatin1String("log") << QLatin1String(noColorOption); allArguments.append(arguments); - const bool rc = fullySynchronousGit(workingDirectory, allArguments, &outputText, &errorText); + const bool rc = fullySynchronousGit(workingDirectory, allArguments, &outputText, &errorText, + flags); if (rc) { QString encodingName = readConfigValue(workingDirectory, QLatin1String("i18n.logOutputEncoding")); if (encodingName.isEmpty()) diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index 61dcbb2931eccb5be496a553d53727548c2e0f66..4d6a5750311f9256ceb7741f3538d27c33552008 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -157,7 +157,9 @@ public: void addFile(const QString &workingDirectory, const QString &fileName); bool synchronousLog(const QString &workingDirectory, const QStringList &arguments, - QString *output, QString *errorMessage = 0); + QString *output, + QString *errorMessage = 0, + unsigned flags = 0); bool synchronousAdd(const QString &workingDirectory, const QStringList &files); bool synchronousDelete(const QString &workingDirectory, bool force, diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index 16c1abdadf7dc216041c75325702a9bb481f2dac..b955c81bb2c100f3a2a8431a11312d2063617251 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -32,6 +32,7 @@ #include "gitclient.h" #include <vcsbase/vcsbaseoutputwindow.h> +#include <vcsbase/vcsbaseplugin.h> #include <utils/qtcassert.h> @@ -45,6 +46,8 @@ #include <QComboBox> #include <QPainter> +using namespace VcsBase; + namespace Git { namespace Internal { @@ -76,7 +79,7 @@ bool LogChangeWidget::init(const QString &repository, const QString &commit, Log if (!populateLog(repository, commit, flags)) return false; if (!m_model->rowCount()) { - VcsBase::VcsBaseOutputWindow::instance()->appendError( + VcsBaseOutputWindow::instance()->appendError( GitPlugin::instance()->gitClient()->msgNoCommits(flags & IncludeRemotes)); return false; } @@ -158,7 +161,7 @@ bool LogChangeWidget::populateLog(const QString &repository, const QString &comm if (!(flags & IncludeRemotes)) arguments << QLatin1String("--not") << QLatin1String("--remotes"); QString output; - if (!client->synchronousLog(repository, arguments, &output)) + if (!client->synchronousLog(repository, arguments, &output, 0, VcsBasePlugin::NoOutput)) return false; foreach (const QString &line, output.split(QLatin1Char('\n'))) { const int colonPos = line.indexOf(QLatin1Char(':'));