This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9216

backout: leverage cmdutil.check_incompatible_arguments()
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG693da1b928af: backout: leverage cmdutil.check_incompatible_arguments()

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)
Mtests/test-backout.t (2 lines)

Diff 23234

mercurial/commands.py

Returns 0 on success, 1 if nothing to backout or there are unresolved Returns 0 on success, 1 if nothing to backout or there are unresolved
files. files.
''' '''
with repo.wlock(), repo.lock(): with repo.wlock(), repo.lock():
return _dobackout(ui, repo, node, rev, **opts) return _dobackout(ui, repo, node, rev, **opts)
def _dobackout(ui, repo, node=None, rev=None, **opts): def _dobackout(ui, repo, node=None, rev=None, **opts):
cmdutil.check_incompatible_arguments(opts, 'no_commit', ['commit', 'merge'])
opts = pycompat.byteskwargs(opts) opts = pycompat.byteskwargs(opts)
if opts.get(b'commit') and opts.get(b'no_commit'):
raise error.Abort(_(b"cannot use --commit with --no-commit"))
if opts.get(b'merge') and opts.get(b'no_commit'):
raise error.Abort(_(b"cannot use --merge with --no-commit"))
if rev and node: if rev and node:
raise error.Abort(_(b"please specify just one revision")) raise error.Abort(_(b"please specify just one revision"))
if not rev: if not rev:
rev = node rev = node
if not rev: if not rev:

tests/test-backout.t

$ hg backout --no-commit . $ hg backout --no-commit .
removing 3 removing 3
changeset cccc23d9d68f backed out, don't forget to commit. changeset cccc23d9d68f backed out, don't forget to commit.
$ hg revert -aq $ hg revert -aq
--no-commit can't be used with --merge --no-commit can't be used with --merge
$ hg backout --merge --no-commit 2 $ hg backout --merge --no-commit 2
abort: cannot use --merge with --no-commit abort: cannot specify both --no-commit and --merge
[255] [255]