From: Simon Glass <simon.glass@canonical.com> The series, upstream and patchwork subcommands each have a list command, but use inconsistent names ('ls' for series, 'list' for the others). Add aliases so both 'ls' and 'list' work everywhere. Since argparse stores the alias name rather than the primary name, handle both in the dispatch. Signed-off-by: Simon Glass <simon.glass@canonical.com> --- tools/patman/cmdline.py | 9 +++++---- tools/patman/control.py | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/patman/cmdline.py b/tools/patman/cmdline.py index 57c56b099e1..3fef37e738d 100644 --- a/tools/patman/cmdline.py +++ b/tools/patman/cmdline.py @@ -27,10 +27,11 @@ ALIASES = { 'patchwork': ['pw'], 'upstream': ['us'], - # Series aliases + # Subcommand aliases 'archive': ['ar'], 'autolink': ['au'], 'gather': ['g'], + 'ls': ['list'], 'open': ['o'], 'progress': ['p', 'pr', 'prog'], 'rm-version': ['rmv'], @@ -169,7 +170,7 @@ def add_patchwork_subparser(subparsers): uset.add_argument( 'remote', nargs='?', help='Remote to associate with this project') - patchwork_subparsers.add_parser('list') + patchwork_subparsers.add_parser('ls', aliases=['list']) return patchwork @@ -279,7 +280,7 @@ def add_series_subparser(subparsers): series_subparsers.add_parser('get-link') series_subparsers.add_parser('inc') - ls = series_subparsers.add_parser('ls') + ls = series_subparsers.add_parser('ls', aliases=['list']) _add_archived(ls) mar = series_subparsers.add_parser('mark') @@ -429,7 +430,7 @@ def add_upstream_subparser(subparsers): udel.add_argument( 'remote_name', help="Git remote name used for this upstream, e.g. 'us'") - upstream_subparsers.add_parser('list') + upstream_subparsers.add_parser('ls', aliases=['list']) udef = upstream_subparsers.add_parser('default') udef.add_argument('-u', '--unset', action='store_true', help='Unset the default upstream') diff --git a/tools/patman/control.py b/tools/patman/control.py index 7f162b4aadb..352c76bd14e 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -263,7 +263,7 @@ def upstream(args, test_db=None): print(result if result else 'unset') elif args.subcmd == 'delete': cser.upstream_delete(args.remote_name) - elif args.subcmd == 'list': + elif args.subcmd == 'ls': cser.upstream_list() else: raise ValueError(f"Unknown upstream subcommand '{args.subcmd}'") @@ -314,7 +314,7 @@ def patchwork(args, test_db=None, pwork=None): if ups: msg += f" remote '{ups}'" print(msg) - elif args.subcmd == 'list': + elif args.subcmd == 'ls': cser.project_list() else: raise ValueError(f"Unknown patchwork subcommand '{args.subcmd}'") -- 2.43.0