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

Git: Allow push after fixup

Browse Source 
Direct push after fixup is really useful, especially on gerrit, because
it allows easy fixing and direct pushing commits under HEAD.

Change-Id: I83980e451c9ae86ac1ac0a55170d6d4141f27d49
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-09-30 01:46:10 +02:00
parent abfa553986
commit 6c61559399
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@
#define GITCLIENT_H
#include "gitsettings.h"
#include "commitdata.h"
#include <coreplugin/editormanager/ieditor.h>
@@ -110,7 +111,8 @@ public:
enum StashResult { StashUnchanged, StashCanceled, StashFailed,
Stashed, NotStashed /* User did not want it */ };
bool init(const QString &workingDirectory, const QString &command, StashFlag flag = Default);
bool init(const QString &workingDirectory, const QString &command,
StashFlag flag = Default, PushAction pushAction = NoPush);
bool stashingFailed() const;
void end();
StashResult result() const { return m_stashResult; }
@@ -125,6 +127,7 @@ public:
QString m_workingDir;
GitClient *m_client;
StashFlag m_flags;
PushAction m_pushAction;
};
static const char *stashNamePrefix;
@@ -322,7 +325,8 @@ public:
QProcessEnvironment processEnvironment() const;
bool beginStashScope(const QString &workingDirectory, const QString &command, StashFlag flag = Default);
bool beginStashScope(const QString &workingDirectory, const QString &command,
StashFlag flag = Default, PushAction pushAction = NoPush);
StashInfo &stashInfo(const QString &workingDirectory);
void endStashScope(const QString &workingDirectory);
bool isValidRevision(const QString &revision) const;