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 <davidk@xxxxxxxxxxxxxx> --- This is a fix for https://gna.org/bugs/index.php?12718 stgit/commands/series.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) 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) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
