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

Git: Do not suggest to continue command when commit editor is active

Browse Source 
When executing mergetool from the commit editor it is unlikely that the user
wants to do anything but to commit.

Change-Id: I1302951c4afee554b35a261d60f402b56c077681
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2016-01-05 23:36:47 +02:00
committed by Orgad Shaneh
parent 1dc90bcf44
commit eb375d734d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2084,6 +2084,8 @@ GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &wo
void GitClient::continueCommandIfNeeded(const QString &workingDirectory, bool allowContinue) void GitClient::continueCommandIfNeeded(const QString &workingDirectory, bool allowContinue)
{ {
if (GitPlugin::instance()->isCommitEditorOpen())
return;
CommandInProgress command = checkCommandInProgress(workingDirectory); CommandInProgress command = checkCommandInProgress(workingDirectory);
ContinueCommandMode continueMode; ContinueCommandMode continueMode;
if (allowContinue) if (allowContinue)

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

@@ -91,6 +91,7 @@ public:
GitClient *client() const; GitClient *client() const;
Gerrit::Internal::GerritPlugin *gerritPlugin() const; Gerrit::Internal::GerritPlugin *gerritPlugin() const;
bool isCommitEditorOpen() const;
public slots: public slots:
void startCommit(); void startCommit();
@@ -190,7 +191,6 @@ private:
const Core::Context &context); const Core::Context &context);
void updateRepositoryBrowserAction(); void updateRepositoryBrowserAction();
bool isCommitEditorOpen() const;
Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd); Core::IEditor *openSubmitEditor(const QString &fileName, const CommitData &cd);
void cleanCommitMessageFile(); void cleanCommitMessageFile();
void cleanRepository(const QString &directory); void cleanRepository(const QString &directory);