aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2015-04-14 15:27:39 +0200
committerTobias Hunger <[email protected]>2015-04-15 12:24:24 +0000
commitbe3e0438c630cccea5a6a8ad2118884b0a595979 (patch)
treece6edb38de002921092f596f3dfdbeb8eecd3f87 /src/plugins/git/gitclient.h
parentd45dea6cf82e9a46b4c980f4562315d9366bf9dd (diff)
Git: Rename asyncCommand to vcsExecAbortable
This name makes it more clear what the method does. Refactor to use VcsBaseClientImpl::vcsExec. Change-Id: I4cf742c2b172d2589bd7d6740461e4a4c8d470ed Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 25ddab8d30c..9c4c9e9c39c 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -143,6 +143,8 @@ public:
Utils::FileName vcsBinary() const override;
unsigned gitVersion(QString *errorMessage = 0) const;
+ VcsBase::VcsCommand *vcsExecAbortable(const QString &workingDirectory, const QStringList &arguments);
+
QString findRepositoryForDirectory(const QString &dir) const;
QString findGitDirForRepository(const QString &repositoryDir) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
@@ -266,8 +268,7 @@ public:
void rebase(const QString &workingDirectory, const QString &argument);
void cherryPick(const QString &workingDirectory, const QString &argument);
void revert(const QString &workingDirectory, const QString &argument);
- void asyncCommand(const QString &workingDirectory, const QStringList &arguments,
- bool hasProgress = false);
+
bool synchronousRevert(const QString &workingDirectory, const QString &commit);
bool synchronousCherryPick(const QString &workingDirectory, const QString &commit);
void interactiveRebase(const QString &workingDirectory, const QString &commit, bool fixup);