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

Git: Continue command after failed merge tool attempt

Browse Source 
Change-Id: Ic3b7d4aee51897e226a78979bbecb82f06095b2d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-03-27 13:40:32 +02:00
committed by Orgad Shaneh
parent fec491a290
commit 187bb36945
3 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,9 +305,7 @@ public:
CommandInProgress checkCommandInProgress(const QString &workingDirectory);
QString commandInProgressDescription(const QString &workingDirectory);
void continueCommandIfNeeded(const QString &workingDirectory);
void continuePreviousGitCommand(const QString &workingDirectory, const QString &msgBoxTitle, QString msgBoxText,
const QString &buttonName, const QString &gitCommand, bool requireChanges = true);
void continueCommandIfNeeded(const QString &workingDirectory, bool allowContinue = true);
QString extendedShowDescription(const QString &workingDirectory, const QString &text);
@@ -405,6 +403,16 @@ private:
const QString &gitBinDirectory);
bool cleanList(const QString &workingDirectory, const QString &flag, QStringList *files, QString *errorMessage);
enum ContinueCommandMode {
ContinueOnly,
SkipOnly,
SkipIfNoChanges
};
void continuePreviousGitCommand(const QString &workingDirectory, const QString &msgBoxTitle,
QString msgBoxText, const QString &buttonName,
const QString &gitCommand, ContinueCommandMode continueMode);
mutable QString m_gitVersionForBinary;
mutable unsigned m_cachedGitVersion;