X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/0aebdb85d6ff005a9ba9b020266e812c115b1ba0..6dd8fafabb5b8e266a85f13c8851ca8a66a1a405:/stgit/commands/series.py diff --git a/stgit/commands/series.py b/stgit/commands/series.py index 3b2d3bf..2c75876 100644 --- a/stgit/commands/series.py +++ b/stgit/commands/series.py @@ -22,6 +22,7 @@ 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 @@ -29,12 +30,19 @@ help = 'print the patch series' usage = """%prog [options] [] 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'.""" +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'.""" +directory = DirectoryHasRepository() 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', @@ -43,10 +51,19 @@ options = [make_option('-b', '--branch', 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'), @@ -63,19 +80,53 @@ def __get_description(patch): 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 __get_author(patch): + """Extract and return a patch's short description + """ + p = crt_series.get_patch(patch) + return p.get_authname(); + +def __print_patch(patch, branch_str, prefix, empty_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 + + patch_str = patch + branch_str + + if options.description or options.author: + patch_str = patch_str.ljust(length) + if options.description: - print prefix + patch.ljust(length) + ' | ' + __get_description(patch) + out.stdout(prefix + patch_str + ' | ' + __get_description(patch)) + elif options.author: + out.stdout(prefix + patch_str + ' | ' + __get_author(patch)) else: - print prefix + patch + 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' + + # 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 = [] + if options.missing: # switch the series, the one specified with --missing should # become the current @@ -83,40 +134,62 @@ def func(parser, options, args): crt_series = stack.Series(options.missing) stgit.commands.common.crt_series = crt_series - cmp_patches = cmp_series.get_applied() + cmp_series.get_unapplied() + 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 = [] 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)) + show_patches = parse_patches(args, applied + unapplied + hidden, + len(applied)) else: - show_patches = applied + unapplied + show_patches = applied + unapplied + hidden + + # missing filtering + show_patches = [p for p in show_patches if p not in cmp_patches] # 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] + applied = [p for p in applied if p in show_patches] + unapplied = [p for p in unapplied if p in show_patches] + hidden = [p for p in hidden if p in show_patches] if options.short: - if len(applied) > 5: - applied = applied[-6:] - if len(unapplied) > 5: - unapplied = unapplied[:5] + nr = int(config.get('stgit.shortnr')) + if len(applied) > nr: + applied = applied[-(nr+1):] + n = len(unapplied) + if n > nr: + unapplied = unapplied[:nr] + elif n < nr: + hidden = hidden[:nr-n] - patches = applied + unapplied + patches = applied + unapplied + hidden if options.count: - print len(patches) + out.stdout(len(patches)) return if not patches: return + if options.showbranch: + branch_str = '@' + crt_series.get_name() + else: + branch_str = '' + if options.graphical: if options.missing: raise CmdException, '--graphical not supported with --missing' @@ -135,13 +208,16 @@ 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(applied[-1], '> ', '0>', max_len, options) + 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) for p in unapplied: - __print_patch(p, '- ', '0 ', max_len, options) + __print_patch(p, branch_str, '- ', '0 ', max_len, options) + + for p in hidden: + __print_patch(p, branch_str, '! ', '! ', max_len, options)