From 2bdb98a282a41f97df8f673d1e0968505dc777d2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 8 May 2025 06:30:14 +0200 Subject: [PATCH] patman: Move -H out of the send command This is the help for the whole of patman, so move it to the start of the control function, rather than being inside 'patman send'. Signed-off-by: Simon Glass --- tools/patman/cmdline.py | 2 +- tools/patman/control.py | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/patman/cmdline.py b/tools/patman/cmdline.py index 912d488ff74..0ae92f88c4b 100644 --- a/tools/patman/cmdline.py +++ b/tools/patman/cmdline.py @@ -215,7 +215,7 @@ def parse_args(argv=None, config_fname=None, parser=None): # If we have a command, it is safe to parse all arguments if args.cmd: args = parser.parse_args(argv) - else: + elif not args.full_help: # No command, so insert it after the known arguments and before the ones # that presumably relate to the 'send' subcommand nargs = len(rest) diff --git a/tools/patman/control.py b/tools/patman/control.py index fbf368cb2fa..902b5092e9c 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -110,6 +110,15 @@ def patchwork_status(branch, count, start, end, dest_branch, force, def do_patman(args): + """Process a patman command + + Args: + args (Namespace): Arguments to process + """ + if args.full_help: + with resources.path('patman', 'README.rst') as readme: + tools.print_full_help(str(readme)) + return 0 if args.cmd == 'send': # Called from git with a patch filename as argument # Printout a list of additional CC recipients for this patch @@ -123,15 +132,12 @@ def do_patman(args): cca = cca.strip() if cca: print(cca) - - elif args.full_help: - with resources.path('patman', 'README.rst') as readme: - tools.print_full_help(str(readme)) else: # If we are not processing tags, no need to warning about bad ones if not args.process_tags: args.ignore_bad_tags = True do_send(args) + return 0 ret_code = 0 try: -- 2.47.2