Mercurial > hg

changeset 49769:f65656572e25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: move check for incompatible args earlier I think it makes sense to check the command line arguments as early as possible, so we don't have to wait for a repo lock to tell the user that they passed invalid arguments.
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 29 Nov 2022 13:31:01 -0800
parents bcae90c53def
children 9da992241302
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Nov 07 22:30:30 2022 -0500
+++ b/mercurial/commands.py	Tue Nov 29 13:31:01 2022 -0800
@@ -2082,6 +2082,7 @@
 
           hg commit --amend --date now
     """
+    cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
     with repo.wlock(), repo.lock():
         return _docommit(ui, repo, *pats, **opts)
 
@@ -2097,7 +2098,6 @@
         return 1 if ret == 0 else ret
 
     if opts.get('subrepos'):
-        cmdutil.check_incompatible_arguments(opts, 'subrepos', ['amend'])
         # Let --subrepos on the command line override config setting.
         ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')