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

diff --git a/stgit/commands/series.py b/stgit/commands/series.py
index 7ed88c0..105eeb9 100644
--- a/stgit/commands/series.py
+++ b/stgit/commands/series.py
@@ -32,13 +32,41 @@ 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')]
-options = [make_option('-e', '--empty',
+                       help = 'use BRANCH instead of the default one'),
+           make_option('-c', '--count',
+                       help = 'print the number of patches in the series',
+                       action = 'store_true'),
+           make_option('-d', '--description',
+                       help = 'show a short description for each patch',
+                       action = 'store_true'),
+           make_option('-e', '--empty',
                        help = 'check whether patches are empty '
                        '(much slower)',
-                       action = 'store_true') ]
+                       action = 'store_true'),
+           make_option('-s', '--short',
+                       help = 'list just the patches around the topmost patch',
+                       action = 'store_true'),
+           make_option('-g', '--graphical',
+                       help = 'run gitk instead of printing',
+                       action = 'store_true')]
 
 
+def __get_description(patch):
+    """Extract and return a patch's short description
+    """
+    p = crt_series.get_patch(patch)
+    descr = p.get_description().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):
+        prefix = empty_prefix
+    if options.description:
+        print prefix + patch.ljust(length) + '  | ' + __get_description(patch)
+    else:
+        print prefix + patch
+
 def func(parser, options, args):
     """Show the patch series
     """
@@ -46,21 +74,44 @@ def func(parser, options, args):
         parser.error('incorrect number of arguments')
 
     applied = crt_series.get_applied()
-    if len(applied) > 0:
-        for p in applied [0:-1]:
-            if options.empty and crt_series.empty_patch(p):
-                print '0', p
-            else:
-                print '+', p
-        p = applied[-1]
-
-        if options.empty and crt_series.empty_patch(p):
-            print '0>%s' % p
-        else:
-            print '> %s' % p
+    unapplied = crt_series.get_unapplied()
+
+    if options.count:
+        print len(applied) + len(unapplied)
+        return
+
+    if options.short:
+        if len(applied) > 5:
+            applied = applied[-6:]
+        if len(unapplied) > 5:
+            unapplied = unapplied[:5]
 
-    for p in crt_series.get_unapplied():
-        if options.empty and crt_series.empty_patch(p):
-            print '0', p
+    patches = applied + unapplied
+    if not patches:
+        return
+
+    if options.graphical:
+        if applied:
+            gitk_args = ' %s^..%s' % (git_id(applied[0]), git_id(applied[-1]))
         else:
-            print '-', p
+            gitk_args = ''
+
+        for p in unapplied:
+            patch_id = git_id(p)
+            gitk_args += ' %s^..%s' % (patch_id, patch_id)
+
+        if os.system('gitk%s' % gitk_args) != 0:
+            raise CmdException, 'gitk execution failed'
+    else:
+        max_len = 0
+        if len(patches) > 0:
+            max_len = max([len(i) for i in patches])
+
+        if len(applied) > 0:
+            for p in applied [0:-1]:
+                __print_patch(p, '+ ', '0 ', max_len, options)
+
+            __print_patch(applied[-1], '> ', '0>', max_len, options)
+
+        for p in unapplied:
+            __print_patch(p, '- ', '0 ', max_len, options)