[Request] [+ ] D10861: commit: keep opts dict str-keyed a bit longer
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Thu Jun 10 23:22:24 UTC 2021
martinvonz created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.
REPOSITORY
rHG Mercurial
BRANCH
default
REVISION DETAIL
https://phab.mercurial-scm.org/D10861
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -2077,9 +2077,8 @@
# commit(), 1 if nothing changed or None on success.
return 1 if ret == 0 else ret
- opts = pycompat.byteskwargs(opts)
- if opts.get(b'subrepos'):
- cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
+ 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')
@@ -2090,7 +2089,7 @@
tip = repo.changelog.tip()
extra = {}
- if opts.get(b'close_branch') or opts.get(b'force_close_branch'):
+ if opts.get('close_branch') or opts.get('force_close_branch'):
extra[b'close'] = b'1'
if repo[b'.'].closesbranch():
@@ -2104,21 +2103,21 @@
elif (
branch == repo[b'.'].branch()
and repo[b'.'].node() not in bheads
- and not opts.get(b'force_close_branch')
+ and not opts.get('force_close_branch')
):
hint = _(
b'use --force-close-branch to close branch from a non-head'
b' changeset'
)
raise error.InputError(_(b'can only close branch heads'), hint=hint)
- elif opts.get(b'amend'):
+ elif opts.get('amend'):
if (
repo[b'.'].p1().branch() != branch
and repo[b'.'].p2().branch() != branch
):
raise error.InputError(_(b'can only close branch heads'))
- if opts.get(b'amend'):
+ if opts.get('amend'):
if ui.configbool(b'ui', b'commitsubrepos'):
raise error.InputError(
_(b'cannot amend with ui.commitsubrepos enabled')
@@ -2136,6 +2135,7 @@
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
cmdutil.checkunfinished(repo)
+ opts = pycompat.byteskwargs(opts)
node = cmdutil.amend(ui, repo, old, extra, pats, opts)
if node == old.node():
ui.status(_(b"nothing changed\n"))
@@ -2165,6 +2165,7 @@
extra=extra,
)
+ opts = pycompat.byteskwargs(opts)
node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
if not node:
To: martinvonz, #hg-reviewers
Cc: mercurial-patches, mercurial-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mercurial-scm.org/pipermail/mercurial-patches/attachments/20210610/60dbf448/attachment.html>
More information about the Mercurial-patches
mailing list