Fixes "stg goto `stg top`" to no-op & adds test

[stgit] / stgit / commands / common.py

diff --git a/stgit/commands/common.py b/stgit/commands/common.py
index 6843dcf..88b1b94 100644 (file)
--- a/stgit/commands/common.py
+++ b/stgit/commands/common.py
@@ -98,6 +98,8 @@ def git_id(rev):
                 return series.get_patch(patch).get_old_top()
             elif patch_id == 'bottom.old':
                 return series.get_patch(patch).get_old_bottom()
                 return series.get_patch(patch).get_old_top()
             elif patch_id == 'bottom.old':
                 return series.get_patch(patch).get_old_bottom()

+            elif patch_id == 'log':
+                return series.get_patch(patch).get_log()

         if patch == 'base' and patch_id == None:
             return read_string(series.get_base_file())
     except RevParseException:
         if patch == 'base' and patch_id == None:
             return read_string(series.get_base_file())
     except RevParseException:


@@ -111,10 +113,10 @@ def check_local_changes():
 
 def check_head_top_equal():
     if not crt_series.head_top_equal():
 
 def check_head_top_equal():
     if not crt_series.head_top_equal():

-        raise CmdException, \
-              'HEAD and top are not the same. You probably committed\n' \
-              '  changes to the tree outside of StGIT. If you know what you\n' \
-              '  are doing, use the "refresh -f" command'
+        raise CmdException(
+            'HEAD and top are not the same. You probably committed\n'
+            '  changes to the tree outside of StGIT. To bring them\n'
+            '  into StGIT, use the "assimilate" command')

 
 def check_conflicts():
     if os.path.exists(os.path.join(basedir.get(), 'conflicts')):
 
 def check_conflicts():
     if os.path.exists(os.path.join(basedir.get(), 'conflicts')):


@@ -194,20 +196,68 @@ def push_patches(patches, check_merged = False):
             else:
                 print 'done'
 
             else:
                 print 'done'
 

-def pop_patches(patches):
+def pop_patches(patches, keep = False):

     """Pop the patches in the list from the stack. It is assumed that
     the patches are listed in the stack reverse order.
     """
     """Pop the patches in the list from the stack. It is assumed that
     the patches are listed in the stack reverse order.
     """

-    p = patches[-1]
-    if len(patches) == 1:
-        print 'Popping patch "%s"...' % p,
+    if len(patches) == 0:
+        print 'nothing to push/pop'

     else:
     else:

-        print 'Popping "%s" - "%s" patches...' % (patches[0], p),
-    sys.stdout.flush()
+        p = patches[-1]
+        if len(patches) == 1:
+            print 'Popping patch "%s"...' % p,
+        else:
+            print 'Popping "%s" - "%s" patches...' % (patches[0], p),
+        sys.stdout.flush()
+
+        crt_series.pop_patch(p, keep)
+
+        print 'done'
+
+def parse_patches(patch_args, patch_list):
+    """Parse patch_args list for patch names in patch_list and return
+    a list. The names can be individual patches and/or in the
+    patch1..patch2 format.
+    """
+    patches = []
+
+    for name in patch_args:
+        pair = name.split('..')
+        for p in pair:
+            if p and not p in patch_list:
+                raise CmdException, 'Unknown patch name: %s' % p
+
+        if len(pair) == 1:
+            # single patch name
+            pl = pair
+        elif len(pair) == 2:
+            # patch range [p1]..[p2]
+            # inclusive boundary
+            if pair[0]:
+                first = patch_list.index(pair[0])
+            else:
+                first = 0
+            # exclusive boundary
+            if pair[1]:
+                last = patch_list.index(pair[1]) + 1
+            else:
+                last = len(patch_list)
+
+            if last > first:
+                pl = patch_list[first:last]
+            else:
+                pl = patch_list[(last - 1):(first + 1)]
+                pl.reverse()
+        else:
+            raise CmdException, 'Malformed patch name: %s' % name
+
+        for p in pl:
+            if p in patches:
+                raise CmdException, 'Duplicate patch name: %s' % p

 
 

-    crt_series.pop_patch(p)
+        patches += pl

 
 

-    print 'done'
+    return patches

 
 def name_email(address):
     """Return a tuple consisting of the name and email parsed from a
 
 def name_email(address):
     """Return a tuple consisting of the name and email parsed from a