Merge pull request #114 from gitcd-io/stash-changes

Stash changes while create new feature branches

Author: claudio-walser

.github/tests/git-cd-start.sh

@@ -3,10 +3,33 @@ set -e
 # change workdir to travis-gitcd
 cd ~/build/gitcd-io/travis-gitcd
 
-git-cd start github-$GITHUB_RUN_NUMBER-$PYTHON_VERSION
+# Create an uncommitted change to test stash functionality
+echo "Test uncommitted change for stash" >> README.rst
+
+# Start a new feature branch with expect to handle the stash prompt
+/usr/bin/expect <<EOD
+set timeout 30
+spawn git-cd start github-${GITHUB_RUN_NUMBER}-${PYTHON_VERSION}
+expect {
+    "You have uncommitted changes. Do you want me to stash them and re-apply after creating the new branch?" {
+        send "yes\r"
+        exp_continue
+    }
+    eof
+}
+EOD
 
 # assert that new feature branch exists remote
 git branch -a | grep "origin/feature/github-$GITHUB_RUN_NUMBER-$PYTHON_VERSION"
 
+# assert the uncommitted changes are still there (stash pop was successful)
+if ! git status --porcelain | grep -q "README.rst"; then
+    echo "Expected uncommitted changes to be restored but found none"
+    exit 1
+fi
+
+# clean up: discard the uncommitted changes
+git checkout -- README.rst
+
 # change back to original workdir
 cd -

.github/workflows/test.yml

@@ -108,10 +108,10 @@ jobs:
 
     - name: Test git-cd start
       run: bash .github/tests/git-cd-start.sh
-    
+
     - name: Add test build
       run: bash .github/tests/git-add-build.sh
-    
+
     - name: Test git-cd refresh
       run: bash .github/tests/git-cd-refresh.sh
 

gitcd/git/repository.py

@@ -158,6 +158,14 @@ def hasUncommitedChanges(self) -> bool:
 
         return True
 
+    def stash(self) -> bool:
+        self.verboseCli.execute("git stash")
+        return True
+
+    def stashPop(self) -> bool:
+        self.verboseCli.execute("git stash pop")
+        return True
+
     def update(self) -> bool:
         self.cli.execute('git fetch -p')
 

gitcd/interface/cli/start.py

@@ -57,6 +57,32 @@ def run(self, branch: Branch):
         testBranch = self.config.getTest()
         testBranchAsString = self.config.getString(testBranch)
 
+        # Check for uncommitted changes and offer to stash
+        stashed = False
+        if self.repository.hasUncommitedChanges():
+            stashChanges = self.interface.askFor(
+                "You have uncommitted changes." +
+                " Do you want me to stash them and re-apply after" +
+                " creating the new branch?",
+                ["yes", "no"],
+                "yes"
+            )
+
+            if stashChanges == "yes":
+                self.repository.stash()
+                stashed = True
+            else:
+                abort = self.interface.askFor(
+                    "Do you want me to abort and let you" +
+                    " commit or discard your changes first?",
+                    ["yes", "no"],
+                    "yes"
+                )
+
+                if abort == "yes":
+                    import sys
+                    sys.exit(1)
+
         # few checks on the new feature branch
         if '%s%s' % (featurePrefixAsString, branch.getName()) == masterBranch:
             # maybe i should use while here
@@ -83,3 +109,7 @@ def run(self, branch: Branch):
         branch = self.checkDoubleFeaturePrefix(branch)
 
         remote.createFeature(branch)
+
+        # Re-apply stashed changes if we stashed them earlier
+        if stashed:
+            self.repository.stashPop()