Make sure that we only uncommit commits with exactly one parent

If we encounter a commit with 0, or 2 or more parents, fail with a
nice error message instead of crashing.

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

diff --git a/stgit/commands/uncommit.py b/stgit/commands/uncommit.py
index 933ec60adf0f4ccf942efa5fcfe59b606d06771a..272c5dbc9f4189020b23bb6cd2666e8fd98e15ee 100644 (file)
--- a/stgit/commands/uncommit.py
+++ b/stgit/commands/uncommit.py
@@ -85,13 +85,23 @@ def func(parser, options, args):
         patchnames = args
         patch_nr = len(patchnames)
 
         patchnames = args
         patch_nr = len(patchnames)
 

+    def get_parent(c):
+        next = c.data.parents
+        try:
+            [next] = next
+        except ValueError:
+            raise common.CmdException(
+                'Trying to uncommit %s, which does not have exactly one parent'
+                % c.sha1)
+        return next
+

     commits = []
     next_commit = stack.base
     if patch_nr:
         out.start('Uncommitting %d patches' % patch_nr)
         for i in xrange(patch_nr):
             commits.append(next_commit)
     commits = []
     next_commit = stack.base
     if patch_nr:
         out.start('Uncommitting %d patches' % patch_nr)
         for i in xrange(patch_nr):
             commits.append(next_commit)

-            next_commit = next_commit.data.parent
+            next_commit = get_parent(next_commit)

     else:
         if options.exclusive:
             out.start('Uncommitting to %s (exclusive)' % to_commit)
     else:
         if options.exclusive:
             out.start('Uncommitting to %s (exclusive)' % to_commit)


@@ -103,7 +113,7 @@ def func(parser, options, args):
                     commits.append(next_commit)
                 break
             commits.append(next_commit)
                     commits.append(next_commit)
                 break
             commits.append(next_commit)

-            next_commit = next_commit.data.parent
+            next_commit = get_parent(next_commit)

         patch_nr = len(commits)
 
     taken_names = set(stack.patchorder.applied + stack.patchorder.unapplied)
         patch_nr = len(commits)
 
     taken_names = set(stack.patchorder.applied + stack.patchorder.unapplied)

diff --git a/t/t1300-uncommit.sh b/t/t1300-uncommit.sh
index 0d952a77178694c66fef3502173168d74480fe72..a906d135d9c1ee077c1f7042390b3297044e4196 100755 (executable)
--- a/t/t1300-uncommit.sh
+++ b/t/t1300-uncommit.sh
@@ -78,7 +78,7 @@ test_expect_success \
     stg commit --all
 '
 
     stg commit --all
 '
 

-test_expect_failure 'Uncommit a commit with not precisely one parent' '
+test_expect_success 'Uncommit a commit with not precisely one parent' '

     stg uncommit -n 5 ; [ $? = 2 ] &&
     [ "$(echo $(stg series))" = "" ]
 '
     stg uncommit -n 5 ; [ $? = 2 ] &&
     [ "$(echo $(stg series))" = "" ]
 '