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.out import *
-from stgit import stack, git
-
-
-help = 'print the patch series'
-usage = """%prog [options] [<patch-range>]
-
+from stgit.argparse import opt
+from stgit.commands import common
+from stgit.commands.common import parse_patches
+from stgit.out import out
+from stgit.config import config
+from stgit import argparse
+
+help = 'Print the patch series'
+kind = 'stack'
+usage = ['[options] [<patch-range>]']
+description = """
Show all the patches in the series or just those in the given
range. The applied patches are prefixed with a '+', the unapplied ones
with a '-' and the hidden 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('-a', '--all',
- help = 'show all patches, including the hidden ones',
- action = 'store_true'),
- make_option('-i', '--invisible',
- help = 'show the hidden patches only',
- action = 'store_true'),
- 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'),
- make_option('--author',
- help = 'show the author name for each patch',
- action = 'store_true'),
- make_option('-e', '--empty',
- 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'),
- make_option('-g', '--graphical',
- help = 'run gitk instead of printing',
- action = 'store_true')]
-
-
-def __get_description(patch):
+args = [argparse.patch_range(argparse.applied_patches,
+ argparse.unapplied_patches,
+ argparse.hidden_patches)]
+options = [
+ opt('-b', '--branch', args = [argparse.stg_branches],
+ short = 'Use BRANCH instead of the default branch'),
+ opt('-a', '--all', action = 'store_true',
+ short = 'Show all patches, including the hidden ones'),
+ opt('-A', '--applied', action = 'store_true',
+ short = 'Show the applied patches only'),
+ opt('-U', '--unapplied', action = 'store_true',
+ short = 'Show the unapplied patches only'),
+ opt('-H', '--hidden', action = 'store_true',
+ short = 'Show the hidden patches only'),
+ opt('-m', '--missing', metavar = 'BRANCH', args = [argparse.stg_branches],
+ short = 'Show patches in BRANCH missing in current'),
+ opt('-c', '--count', action = 'store_true',
+ short = 'Print the number of patches in the series'),
+ opt('-d', '--description', action = 'store_true',
+ short = 'Show a short description for each patch'),
+ opt('--author', action = 'store_true',
+ short = 'Show the author name for each patch'),
+ opt('-e', '--empty', action = 'store_true',
+ short = 'Check whether patches are empty'),
+ opt('--showbranch', action = 'store_true',
+ short = 'Append the branch name to the listed patches'),
+ opt('--noprefix', action = 'store_true',
+ short = 'Do not show the patch status prefix'),
+ opt('-s', '--short', action = 'store_true',
+ short = 'List just the patches around the topmost patch')]
+
+directory = common.DirectoryHasRepositoryLib()
+
+def __get_description(stack, patch):
"""Extract and return a patch's short description
"""
- p = crt_series.get_patch(patch)
- descr = (p.get_description() or '').strip()
+ cd = stack.patches.get(patch).commit.data
+ descr = cd.message.strip()
descr_lines = descr.split('\n')
return descr_lines[0].rstrip()
-def __get_author(patch):
+def __get_author(stack, patch):
"""Extract and return a patch's short description
"""
- p = crt_series.get_patch(patch)
- return p.get_authname();
+ cd = stack.patches.get(patch).commit.data
+ return cd.author.name
-def __print_patch(patch, branch_str, prefix, empty_prefix, length, options):
+def __print_patch(stack, patch, branch_str, prefix, length, options):
"""Print a patch name, description and various markers.
"""
if options.noprefix:
prefix = ''
- elif options.empty and crt_series.empty_patch(patch):
- prefix = empty_prefix
+ elif options.empty:
+ if stack.patches.get(patch).is_empty():
+ prefix = '0' + prefix
+ else:
+ prefix = ' ' + prefix
- patch_str = patch + branch_str
+ patch_str = branch_str + patch
if options.description or options.author:
patch_str = patch_str.ljust(length)
if options.description:
- out.stdout(prefix + patch_str + ' | ' + __get_description(patch))
+ out.stdout(prefix + patch_str + ' # ' + __get_description(stack, patch))
elif options.author:
- out.stdout(prefix + patch_str + ' | ' + __get_author(patch))
+ out.stdout(prefix + patch_str + ' # ' + __get_author(stack, patch))
else:
out.stdout(prefix + patch_str)
def func(parser, options, args):
"""Show the patch series
"""
- global crt_series
-
if options.all and options.short:
- raise CmdException, 'combining --all and --short is meaningless'
-
+ raise common.CmdException, 'combining --all and --short is meaningless'
+
+ stack = directory.repository.get_stack(options.branch)
+ if options.missing:
+ cmp_stack = stack
+ stack = directory.repository.get_stack(options.missing)
+
# current series patches
- if options.invisible:
- applied = unapplied = []
- hidden = crt_series.get_hidden()
+ applied = unapplied = hidden = ()
+ if options.applied or options.unapplied or options.hidden:
+ if options.all:
+ raise common.CmdException, \
+ '--all cannot be used with --applied/unapplied/hidden'
+ if options.applied:
+ applied = stack.patchorder.applied
+ if options.unapplied:
+ unapplied = stack.patchorder.unapplied
+ if options.hidden:
+ hidden = stack.patchorder.hidden
elif options.all:
- applied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
- hidden = crt_series.get_hidden()
+ applied = stack.patchorder.applied
+ unapplied = stack.patchorder.unapplied
+ hidden = stack.patchorder.hidden
else:
- applied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
- hidden = []
+ applied = stack.patchorder.applied
+ unapplied = stack.patchorder.unapplied
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 = applied + unapplied + hidden
-
- # new current series patches
- if options.invisible:
- applied = unapplied = []
- hidden = crt_series.get_hidden()
- elif options.all:
- applied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
- hidden = crt_series.get_hidden()
- else:
- applied = crt_series.get_applied()
- unapplied = crt_series.get_unapplied()
- hidden = []
+ cmp_patches = cmp_stack.patchorder.all
else:
- cmp_patches = []
+ cmp_patches = ()
# the filtering range covers the whole series
if args:
return
if options.showbranch:
- branch_str = '@' + crt_series.get_name()
+ branch_str = stack.name + ':'
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:
- 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 + branch_str) for i in patches])
+ max_len = 0
+ if len(patches) > 0:
+ max_len = max([len(i + branch_str) for i in patches])
- if applied:
- for p in applied[:-1]:
- __print_patch(p, branch_str, '+ ', '0 ', max_len, options)
- __print_patch(applied[-1], branch_str, '> ', '0>', max_len,
- options)
+ if applied:
+ for p in applied[:-1]:
+ __print_patch(stack, p, branch_str, '+ ', max_len, options)
+ __print_patch(stack, applied[-1], branch_str, '> ', max_len,
+ options)
- for p in unapplied:
- __print_patch(p, branch_str, '- ', '0 ', max_len, options)
+ for p in unapplied:
+ __print_patch(stack, p, branch_str, '- ', max_len, options)
- for p in hidden:
- __print_patch(p, branch_str, '! ', '! ', max_len, options)
+ for p in hidden:
+ __print_patch(stack, p, branch_str, '! ', max_len, options)
~mdw / stgit / blobdiff