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'),
make_option('-d', '--description',
help = 'show a short description for each patch',
action = 'store_true'),
"""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 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()
+ # 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:
applied = applied[-6:]
unapplied = unapplied[:5]
patches = applied + unapplied
+
+ if options.count:
+ print len(patches)
+ return
+
if not patches:
return
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: