Git - move ensureStash inside StashGuard

this is where stash popup question belongs

Change-Id: Ib3435f12eacd0b932ba2a67ecd728e5a41c0c64a
Reviewed-by: Orgad Shaneh <[email protected]>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index b6e9315c013..046c9ae9543 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -87,15 +87,15 @@ class GitClient : public QObject
     Q_OBJECT
 
 public:
-    enum StashResult { StashUnchanged, StashCanceled, StashFailed,
-                       Stashed, NotStashed /* User did not want it */ };
-
     enum CommandInProgress { NoCommand, Revert, CherryPick,
                              Rebase, Merge, RebaseMerge };
 
     class StashGuard
     {
     public:
+        enum StashResult { StashUnchanged, StashCanceled, StashFailed,
+                           Stashed, NotStashed /* User did not want it */ };
+
         StashGuard(const QString &workingDirectory, const QString &keyword,
                    StashFlag flag = Default);
         ~StashGuard();
@@ -106,6 +106,9 @@ public:
         QString stashMessage() const { return message; }
 
     private:
+        void stashPrompt(const QString &keyword, QString *errorMessage);
+        void executeStash(const QString &keyword, QString *errorMessage);
+
         bool pop;
         StashResult stashResult;
         QString message;
@@ -260,9 +263,6 @@ public:
 
     QString readConfigValue(const QString &workingDirectory, const QString &configVar) const;
 
-    StashResult ensureStash(const QString &workingDirectory, const QString &keyword,
-                            StashFlag flag, QString *message, QString *errorMessage = 0);
-
     bool getCommitData(const QString &workingDirectory, bool amend,
                        QString *commitTemplate, CommitData *commitData,
                        QString *errorMessage);