This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9218

commit: leverage cmdutil.check_incompatible_arguments()
ClosedPublic

Authored by martinvonz on Oct 16 2020, 2:01 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG450e17e59603: commit: leverage cmdutil.check_incompatible_arguments()

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Oct 16 2020, 2:01 AM
pulkit accepted this revision.Oct 16 2020, 3:26 AM
This revision is now accepted and ready to land.Oct 16 2020, 3:26 AM
pulkit added inline comments.Oct 16 2020, 3:30 AM
mercurial/commands.py
2018

Hm, s/b'amend'/[b'amend']?

martinvonz added inline comments.Oct 16 2020, 11:12 AM
mercurial/commands.py
2018

Good catch! Fixed.

(Let's use a statically typed language for our next VCS, okay? :))

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (3 lines)

Diff 23328

mercurial/commands.py

ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts ui, repo, commit, None, False, cmdutil.recordfilter, *pats, **opts
) )
# ret can be 0 (no changes to record) or the value returned by # ret can be 0 (no changes to record) or the value returned by
# commit(), 1 if nothing changed or None on success. # commit(), 1 if nothing changed or None on success.
return 1 if ret == 0 else ret return 1 if ret == 0 else ret
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get(b'subrepos'): if opts.get(b'subrepos'):
if opts.get(b'amend'): cmdutil.check_incompatible_arguments(opts, b'subrepos', [b'amend'])
pulkitUnsubmitted
Not Done

Hm, s/b'amend'/[b'amend']?

pulkit: Hm, `s/b'amend'/[b'amend']`?
martinvonzAuthorUnsubmitted
Done

Good catch! Fixed.

(Let's use a statically typed language for our next VCS, okay? :))

martinvonz: Good catch! Fixed. (Let's use a statically typed language for our next VCS, okay? :))
raise error.Abort(_(b'cannot amend with --subrepos'))
# Let --subrepos on the command line override config setting. # Let --subrepos on the command line override config setting.
ui.setconfig(b'ui', b'commitsubrepos', True, b'commit') ui.setconfig(b'ui', b'commitsubrepos', True, b'commit')
cmdutil.checkunfinished(repo, commit=True) cmdutil.checkunfinished(repo, commit=True)
branch = repo[None].branch() branch = repo[None].branch()
bheads = repo.branchheads(branch) bheads = repo.branchheads(branch)