This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7635

amend: use cmdutil.check_at_most_one_arg()
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG774cee0e95c6: amend: use cmdutil.check_at_most_one_arg()

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
martinvonz retitled this revision from amend: use cmdutil.check_unique_argument() to amend: use cmdutil.check_at_most_one_arg().Dec 16 2019, 6:18 PM
martinvonz updated this revision to Diff 18761.
pulkit accepted this revision.Dec 17 2019, 2:10 AM
This revision is now accepted and ready to land.Dec 17 2019, 2:10 AM
martinvonz added a commit: rHG774cee0e95c6: amend: use cmdutil.check_at_most_one_arg().Dec 17 2019, 2:57 AM
Closed by commit rHG774cee0e95c6: amend: use cmdutil.check_at_most_one_arg() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (7 lines)
Mtests/test-amend.t (2 lines)

Diff 18789

mercurial/cmdutil.py

raise error.Abort(_(b'uncommitted changes'), hint=hint) raise error.Abort(_(b'uncommitted changes'), hint=hint)
ctx = repo[None] ctx = repo[None]
for s in sorted(ctx.substate): for s in sorted(ctx.substate):
ctx.sub(s).bailifchanged(hint=hint) ctx.sub(s).bailifchanged(hint=hint)
def logmessage(ui, opts): def logmessage(ui, opts):
""" get the log message according to -m and -l option """ """ get the log message according to -m and -l option """
check_at_most_one_arg(opts, b'message', b'logfile')
message = opts.get(b'message') message = opts.get(b'message')
logfile = opts.get(b'logfile') logfile = opts.get(b'logfile')
if message and logfile:
raise error.Abort(
_(b'options --message and --logfile are mutually exclusive')
)
if not message and logfile: if not message and logfile:
try: try:
if isstdiofilename(logfile): if isstdiofilename(logfile):
message = ui.fin.read() message = ui.fin.read()
else: else:
message = b'\n'.join(util.readfile(logfile).splitlines()) message = b'\n'.join(util.readfile(logfile).splitlines())
except IOError as inst: except IOError as inst:
raise error.Abort( raise error.Abort(

tests/test-amend.t

298f085230c3 EDITED: NEWMESSAGE 298f085230c3 EDITED: NEWMESSAGE
$ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG $ HGEDITOR="sh $TESTTMP/prefix.sh" hg amend -e -m MSG
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (obsstore-off !) saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/298f085230c3-d81a6ad3-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n' $ hg log -r . -T '{node|short} {desc}\n'
974f07f28537 EDITED: MSG 974f07f28537 EDITED: MSG
$ echo FOO > $TESTTMP/msg $ echo FOO > $TESTTMP/msg
$ hg amend -l $TESTTMP/msg -m BAR $ hg amend -l $TESTTMP/msg -m BAR
abort: options --message and --logfile are mutually exclusive abort: cannot specify both --message and --logfile
[255] [255]
$ hg amend -l $TESTTMP/msg $ hg amend -l $TESTTMP/msg
saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (obsstore-off !) saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/974f07f28537-edb6470a-amend.hg (obsstore-off !)
$ hg log -r . -T '{node|short} {desc}\n' $ hg log -r . -T '{node|short} {desc}\n'
507be9bdac71 FOO 507be9bdac71 FOO
Interactive mode Interactive mode