This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7632

graft: reuse cmdutl.resolvecommitoptions()
ClosedPublic

Authored by martinvonz on Dec 13 2019, 2:53 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8376d5d62d36: graft: reuse cmdutl.resolvecommitoptions()

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.Dec 13 2019, 2:53 AM
pulkit accepted this revision.Dec 16 2019, 12:46 AM
pulkit added a subscriber: pulkit.

After this, if both --currentuser and --user are passed, --currentuser takes precedence, which is not the behavior right now. But the new behavior is better and consistent with other commands.

This revision is now accepted and ready to land.Dec 16 2019, 12:46 AM
martinvonz added a commit: rHG8376d5d62d36: graft: reuse cmdutl.resolvecommitoptions().Dec 16 2019, 1:30 AM
Closed by commit rHG8376d5d62d36: graft: reuse cmdutl.resolvecommitoptions() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (9 lines)

Diff 18744

mercurial/commands.py

basectx = None basectx = None
if opts.get(b'base'): if opts.get(b'base'):
basectx = scmutil.revsingle(repo, opts[b'base'], None) basectx = scmutil.revsingle(repo, opts[b'base'], None)
# a dict of data to be stored in state file # a dict of data to be stored in state file
statedata = {} statedata = {}
# list of new nodes created by ongoing graft # list of new nodes created by ongoing graft
statedata[b'newnodes'] = [] statedata[b'newnodes'] = []
if opts.get(b'user') and opts.get(b'currentuser'): cmdutil.resolvecommitoptions(ui, opts)
raise error.Abort(_(b'--user and --currentuser are mutually exclusive'))
if opts.get(b'date') and opts.get(b'currentdate'):
raise error.Abort(_(b'--date and --currentdate are mutually exclusive'))
if not opts.get(b'user') and opts.get(b'currentuser'):
opts[b'user'] = ui.username()
if not opts.get(b'date') and opts.get(b'currentdate'):
opts[b'date'] = b"%d %d" % dateutil.makedate()
editor = cmdutil.getcommiteditor( editor = cmdutil.getcommiteditor(
editform=b'graft', **pycompat.strkwargs(opts) editform=b'graft', **pycompat.strkwargs(opts)
) )
cont = False cont = False
if opts.get(b'no_commit'): if opts.get(b'no_commit'):
if opts.get(b'edit'): if opts.get(b'edit'):