Fix "stg resolved" to work with new conflict representation

[stgit] / stgit / commands / goto.py

diff --git a/stgit/commands/goto.py b/stgit/commands/goto.py
index a4427faae58d6415611bceb7c48771586cca9aec..84b840b52fd2044b87f358ef4303d0268cc798de 100644 (file)
--- a/stgit/commands/goto.py
+++ b/stgit/commands/goto.py
@@ -27,10 +27,10 @@ help = 'push or pop patches to the given one'
 usage = """%prog [options] <name>
 
 Push/pop patches to/from the stack until the one given on the command
 usage = """%prog [options] <name>
 
 Push/pop patches to/from the stack until the one given on the command

-line becomes current. This is a shortcut for the 'push --to' or 'pop
---to' commands. There is no '--undo' option for 'goto'. Use the 'push'
-command for this."""
+line becomes current. There is no '--undo' option for 'goto'. Use the
+'push --undo' command for this."""

 
 

+directory = DirectoryGotoToplevel()

 options = [make_option('-k', '--keep',
                        help = 'keep the local changes when popping patches',
                        action = 'store_true')]
 options = [make_option('-k', '--keep',
                        help = 'keep the local changes when popping patches',
                        action = 'store_true')]


@@ -43,7 +43,7 @@ def func(parser, options, args):
         parser.error('incorrect number of arguments')
 
     check_conflicts()
         parser.error('incorrect number of arguments')
 
     check_conflicts()

-    check_head_top_equal()
+    check_head_top_equal(crt_series)

 
     if not options.keep:
         check_local_changes()
 
     if not options.keep:
         check_local_changes()


@@ -55,13 +55,13 @@ def func(parser, options, args):
     if patch in applied:
         applied.reverse()
         patches = applied[:applied.index(patch)]
     if patch in applied:
         applied.reverse()
         patches = applied[:applied.index(patch)]

-        pop_patches(patches, options.keep)
+        pop_patches(crt_series, patches, options.keep)

     elif patch in unapplied:
         if options.keep:
             raise CmdException, 'Cannot use --keep with patch pushing'
         patches = unapplied[:unapplied.index(patch)+1]
     elif patch in unapplied:
         if options.keep:
             raise CmdException, 'Cannot use --keep with patch pushing'
         patches = unapplied[:unapplied.index(patch)+1]

-        push_patches(patches)
+        push_patches(crt_series, patches)

     else:
         raise CmdException, 'Patch "%s" does not exist' % patch
 
     else:
         raise CmdException, 'Patch "%s" does not exist' % patch
 

-    print_crt_patch()
+    print_crt_patch(crt_series)