From: David Kågedal Date: Mon, 8 Dec 2008 20:24:44 +0000 (+0100) Subject: Use separate column for zero in output of stg series -e X-Git-Tag: v0.15-rc1~84 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/2775a653b86683bf3531e9352b85309eea7432c1?ds=inline Use separate column for zero in output of stg series -e This will make the output more regular and easier to parse. It no longer overwrites the +/-/! status flag with a zero for empty patches, and instead puts the zero before it. Signed-off-by: David Kågedal Signed-off-by: Karl Hasselström --- diff --git a/stgit/commands/series.py b/stgit/commands/series.py index 95196d3..b93abc4 100644 --- a/stgit/commands/series.py +++ b/stgit/commands/series.py @@ -79,13 +79,16 @@ def __get_author(stack, patch): cd = stack.patches.get(patch).commit.data return cd.author.name -def __print_patch(stack, 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 stack.patches.get(patch).is_empty(): - prefix = empty_prefix + elif options.empty: + if stack.patches.get(patch).is_empty(): + prefix = '0' + prefix + else: + prefix = ' ' + prefix patch_str = branch_str + patch @@ -180,12 +183,12 @@ def func(parser, options, args): if applied: for p in applied[:-1]: - __print_patch(stack, p, branch_str, '+ ', '0 ', max_len, options) - __print_patch(stack, applied[-1], branch_str, '> ', '0>', max_len, + __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(stack, p, branch_str, '- ', '0 ', max_len, options) + __print_patch(stack, p, branch_str, '- ', max_len, options) for p in hidden: - __print_patch(stack, p, branch_str, '! ', '! ', max_len, options) + __print_patch(stack, p, branch_str, '! ', max_len, options)