From a73711ad65e0f5d9ad155713fea2e609cd7fc188 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 22 May 2020 17:55:05 -0400 Subject: Add ability to diff arbitrary mbox files Sometimes we are unable to properly look up previous series -- usually because the cover letter title changes. For those cases, it is now possible to diff two arbitrary mbox files prepared with "b4 am -T". There's also a smattering of other fixes in there because I'm too lazy to properly stage my patches. Signed-off-by: Konstantin Ryabitsev --- b4/command.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'b4/command.py') diff --git a/b4/command.py b/b4/command.py index 80b072a..2964f54 100644 --- a/b4/command.py +++ b/b4/command.py @@ -106,6 +106,8 @@ def cmd(): help='Cherry-pick a subset of patches (e.g. "-P 1-2,4,6-", ' '"-P _" to use just the msgid specified, or ' '"-P *globbing*" to match on commit subject)') + sp_am.add_argument('-g', '--guess-base', dest='guessbase', action='store_true', default=False, + help='Try to guess the base of the series (if not specified)') sp_am.set_defaults(func=cmd_am) # b4 attest @@ -187,6 +189,8 @@ def cmd(): help='Save diff into this file instead of outputting to stdout') sp_diff.add_argument('-c', '--color', dest='color', action='store_true', default=False, help='Force color output even when writing to file') + sp_diff.add_argument('-m', '--compare-am-mboxes', dest='ambox', nargs=2, default=None, + help='Compare two mbx files prepared with "b4 am"') sp_diff.set_defaults(func=cmd_diff) cmdargs = parser.parse_args() -- cgit v1.2.3