Handle failed pushes differently depending on cause

Specifically, if the push failed because of a merge conflict, the
patch should be applied but empty; and if it fails for any other
reason (such as a too-dirty worktree), the patch should not be
applied.

This fixes the data loss bug tested for by t3000.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index cdfe885c25dc10cb374812e4da9e5e87f4f558d8..35b9bbffeebe578708e264872bc043e67627a56b 100644 (file)
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -433,6 +433,9 @@ class Repository(RunWithEnv):
 class MergeException(exception.StgException):
     pass
 
 class MergeException(exception.StgException):
     pass
 

+class MergeConflictException(MergeException):
+    pass
+

 class Index(RunWithEnv):
     def __init__(self, repository, filename):
         self.__repository = repository
 class Index(RunWithEnv):
     def __init__(self, repository, filename):
         self.__repository = repository


@@ -517,14 +520,18 @@ class IndexAndWorktree(RunWithEnv):
         assert isinstance(ours, Tree)
         assert isinstance(theirs, Tree)
         try:
         assert isinstance(ours, Tree)
         assert isinstance(theirs, Tree)
         try:

-            self.run(['git', 'merge-recursive', base.sha1, '--', ours.sha1,
-                      theirs.sha1],
-                     env = { 'GITHEAD_%s' % base.sha1: 'ancestor',
-                             'GITHEAD_%s' % ours.sha1: 'current',
-                             'GITHEAD_%s' % theirs.sha1: 'patched'}
-                     ).cwd(self.__worktree.directory).discard_output()
+            r = self.run(['git', 'merge-recursive', base.sha1, '--', ours.sha1,
+                          theirs.sha1],
+                         env = { 'GITHEAD_%s' % base.sha1: 'ancestor',
+                                 'GITHEAD_%s' % ours.sha1: 'current',
+                                 'GITHEAD_%s' % theirs.sha1: 'patched'}
+                         ).cwd(self.__worktree.directory)
+            r.discard_output()

         except run.RunException, e:
         except run.RunException, e:

-            raise MergeException('Index/worktree dirty')
+            if r.exitcode == 1:
+                raise MergeConflictException()
+            else:
+                raise MergeException('Index/worktree dirty')

     def changed_files(self):
         return self.run(['git', 'diff-files', '--name-only']).output_lines()
     def update_index(self, files):
     def changed_files(self):
         return self.run(['git', 'diff-files', '--name-only']).output_lines()
     def update_index(self, files):

diff --git a/stgit/lib/transaction.py b/stgit/lib/transaction.py
index 3613b158b07e68895f471ca35a2125dc2beb7d34..2946a67840be7c63fa90a9d5e233b567f30dbe26 100644 (file)
--- a/stgit/lib/transaction.py
+++ b/stgit/lib/transaction.py
@@ -197,10 +197,12 @@ class StackTransaction(object):
                 tree = iw.index.write_tree()
                 self.__current_tree = tree
                 s = ' (modified)'
                 tree = iw.index.write_tree()
                 self.__current_tree = tree
                 s = ' (modified)'

-            except git.MergeException:
+            except git.MergeConflictException:

                 tree = ours
                 merge_conflict = True
                 s = ' (conflict)'
                 tree = ours
                 merge_conflict = True
                 s = ' (conflict)'

+            except git.MergeException, e:
+                self.__halt(str(e))

         cd = cd.set_tree(tree)
         self.patches[pn] = self.__stack.repository.commit(cd)
         del self.unapplied[self.unapplied.index(pn)]
         cd = cd.set_tree(tree)
         self.patches[pn] = self.__stack.repository.commit(cd)
         del self.unapplied[self.unapplied.index(pn)]

diff --git a/t/t3000-dirty-merge.sh b/t/t3000-dirty-merge.sh
index dd81c9eafa7617469ee8facbcc43721e3cacec2c..d87bba17098ec24aaf79505f0c150c3f6b788fb4 100755 (executable)
--- a/t/t3000-dirty-merge.sh
+++ b/t/t3000-dirty-merge.sh
@@ -22,7 +22,7 @@ test_expect_success 'Pop one patch and update the other' '
     stg refresh
 '
 
     stg refresh
 '
 

-test_expect_failure 'Push with dirty worktree' '
+test_expect_success 'Push with dirty worktree' '

     echo 4 > a &&
     [ "$(echo $(stg applied))" = "p1" ] &&
     [ "$(echo $(stg unapplied))" = "p2" ] &&
     echo 4 > a &&
     [ "$(echo $(stg applied))" = "p1" ] &&
     [ "$(echo $(stg unapplied))" = "p2" ] &&