From 6c02c27e9e5891440dc99565e4dee01618a76d5e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 28 Nov 2013 10:54:39 +0100
Subject: [PATCH] Change GitClient::executeGit() to take flags instead of bool.
Change-Id: I3cb83914be7e9665f49baf9f563c753c6c3919f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
src/plugins/git/gitclient.cpp | 18 +++++++++++-------
src/plugins/git/gitclient.h | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index af2bc36bd11..ac1f8b497cf 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -1537,7 +1537,7 @@ void GitClient::blame(const QString &workingDirectory,
arguments << QLatin1String("--") << fileName;
if (!revision.isEmpty())
arguments << revision;
- executeGit(workingDirectory, arguments, editor, false, false, lineNumber);
+ executeGit(workingDirectory, arguments, editor, false, 0, lineNumber);
}
bool GitClient::synchronousCheckout(const QString &workingDirectory,
@@ -1567,7 +1567,10 @@ void GitClient::reset(const QString &workingDirectory, const QString &argument,
if (!commit.isEmpty())
arguments << commit;
- executeGit(workingDirectory, arguments, 0, true, argument == QLatin1String("--hard"));
+ unsigned flags = 0;
+ if (argument == QLatin1String("--hard"))
+ flags |= VcsBasePlugin::ExpectRepoChanges;
+ executeGit(workingDirectory, arguments, 0, true, flags);
}
void GitClient::addFile(const QString &workingDirectory, const QString &fileName)
@@ -2427,14 +2430,13 @@ VcsBase::Command *GitClient::executeGit(const QString &workingDirectory,
const QStringList &arguments,
VcsBase::VcsBaseEditorWidget* editor,
bool useOutputToWindow,
- bool expectChanges,
+ unsigned additionalFlags,
int editorLineNumber)
{
outputWindow()->appendCommand(workingDirectory, settings()->stringValue(GitSettings::binaryPathKey), arguments);
VcsBase::Command *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber);
command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey));
- if (expectChanges)
- command->addFlags(VcsBasePlugin::ExpectRepoChanges);
+ command->addFlags(additionalFlags);
command->execute();
return command;
}
@@ -2563,7 +2565,8 @@ void GitClient::updateSubmodulesIfNeeded(const QString &workingDirectory, bool p
QStringList arguments;
arguments << QLatin1String("submodule") << QLatin1String("update");
- VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true, true);
+ VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true,
+ VcsBasePlugin::ExpectRepoChanges);
connect(cmd, SIGNAL(finished(bool,int,QVariant)), this, SLOT(finishSubmoduleUpdate()));
}
@@ -3510,7 +3513,8 @@ void GitClient::stashPop(const QString &workingDirectory, const QString &stash)
arguments << QLatin1String("pop");
if (!stash.isEmpty())
arguments << stash;
- VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true, true);
+ VcsBase::Command *cmd = executeGit(workingDirectory, arguments, 0, true,
+ VcsBasePlugin::ExpectRepoChanges);
new ConflictHandler(cmd, workingDirectory);
}
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index ff8cc55edc4..26a300fd434 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -367,7 +367,7 @@ private:
const QStringList &arguments,
VcsBase::VcsBaseEditorWidget* editor = 0,
bool useOutputToWindow = false,
- bool expectChanges = false,
+ unsigned additionalFlags = 0,
int editorLineNumber = -1);
// Fully synchronous git execution (QProcess-based).
--
GitLab