X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/948dae344afd7633b7a074beb36113c1b46527eb..f483998b7e3bd7eef30b4614d075373965142f29:/stgit/commands/series.py

diff --git a/stgit/commands/series.py b/stgit/commands/series.py
index 105eeb9..788e57b 100644
--- a/stgit/commands/series.py
+++ b/stgit/commands/series.py
@@ -19,20 +19,24 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 import sys, os
 from optparse import OptionParser, make_option
 
+import stgit.commands.common
 from stgit.commands.common import *
 from stgit.utils import *
 from stgit import stack, git
 
 
 help = 'print the patch series'
-usage = """%prog [options]
+usage = """%prog [options] [<patch-range>]
 
-Show all the patches in the series. The applied patches are prefixed
-with a '+' and the unapplied ones with a '-'. The current patch is
-prefixed with a '>'. Empty patches are prefixed with a '0'."""
+Show all the patches in the series or just those in the given
+range. The applied patches are prefixed with a '+' and the unapplied
+ones with a '-'. The current patch is prefixed with a '>'. Empty
+patches are prefixed with a '0'."""
 
 options = [make_option('-b', '--branch',
                        help = 'use BRANCH instead of the default one'),
+           make_option('-m', '--missing', metavar = 'BRANCH',
+                       help = 'show patches in BRANCH missing in current'),
            make_option('-c', '--count',
                        help = 'print the number of patches in the series',
                        action = 'store_true'),
@@ -43,6 +47,12 @@ options = [make_option('-b', '--branch',
                        help = 'check whether patches are empty '
                        '(much slower)',
                        action = 'store_true'),
+           make_option('--showbranch',
+                       help = 'append the branch name to the listed patches',
+                       action = 'store_true'),
+           make_option('--noprefix',
+                       help = 'do not show the patch status prefix',
+                       action = 'store_true'),
            make_option('-s', '--short',
                        help = 'list just the patches around the topmost patch',
                        action = 'store_true'),
@@ -55,30 +65,54 @@ def __get_description(patch):
     """Extract and return a patch's short description
     """
     p = crt_series.get_patch(patch)
-    descr = p.get_description().strip()
+    descr = (p.get_description() or '').strip()
     descr_lines = descr.split('\n')
     return descr_lines[0].rstrip()
 
-def __print_patch(patch, prefix, empty_prefix, length, options):
-    if options.empty and crt_series.empty_patch(patch):
+def __print_patch(patch, branch_str, prefix, empty_prefix, length, options):
+    if options.noprefix:
+        prefix = ''
+    elif options.empty and crt_series.empty_patch(patch):
         prefix = empty_prefix
+
+    patch_str = patch + branch_str
+
     if options.description:
-        print prefix + patch.ljust(length) + '  | ' + __get_description(patch)
+        print prefix + patch_str.ljust(length) + '  | ' \
+              + __get_description(patch)
     else:
-        print prefix + patch
+        print prefix + patch_str
 
 def func(parser, options, args):
     """Show the patch series
     """
-    if len(args) != 0:
-        parser.error('incorrect number of arguments')
+    global crt_series
+
+    if options.missing:
+        # switch the series, the one specified with --missing should
+        # become the current
+        cmp_series = crt_series
+        crt_series = stack.Series(options.missing)
+        stgit.commands.common.crt_series = crt_series
+
+        cmp_patches = cmp_series.get_applied() + cmp_series.get_unapplied()
+    else:
+        cmp_patches = []
 
     applied = crt_series.get_applied()
     unapplied = crt_series.get_unapplied()
 
-    if options.count:
-        print len(applied) + len(unapplied)
-        return
+    # the filtering range covers the whole series
+    if args:
+        show_patches = parse_patches(args, applied + unapplied, len(applied))
+    else:
+        show_patches = applied + unapplied
+
+    # filter the patches
+    applied = [p for p in applied
+               if p in show_patches and p not in cmp_patches]
+    unapplied = [p for p in unapplied
+                 if p in show_patches and p not in cmp_patches]
 
     if options.short:
         if len(applied) > 5:
@@ -87,10 +121,23 @@ def func(parser, options, args):
             unapplied = unapplied[:5]
 
     patches = applied + unapplied
+
+    if options.count:
+        print len(patches)
+        return
+
     if not patches:
         return
 
+    if options.showbranch:
+        branch_str = '@' + crt_series.get_branch()
+    else:
+        branch_str = ''
+
     if options.graphical:
+        if options.missing:
+            raise CmdException, '--graphical not supported with --missing'
+
         if applied:
             gitk_args = ' %s^..%s' % (git_id(applied[0]), git_id(applied[-1]))
         else:
@@ -105,13 +152,14 @@ def func(parser, options, args):
     else:
         max_len = 0
         if len(patches) > 0:
-            max_len = max([len(i) for i in patches])
+            max_len = max([len(i + branch_str) for i in patches])
 
         if len(applied) > 0:
             for p in applied [0:-1]:
-                __print_patch(p, '+ ', '0 ', max_len, options)
+                __print_patch(p, branch_str, '+ ', '0 ', max_len, options)
 
-            __print_patch(applied[-1], '> ', '0>', max_len, options)
+            __print_patch(applied[-1], branch_str, '> ', '0>', max_len,
+                          options)
 
         for p in unapplied:
-            __print_patch(p, '- ', '0 ', max_len, options)
+            __print_patch(p, branch_str, '- ', '0 ', max_len, options)