This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10862

cmdutil: make amend() take str-keyed opts
ClosedPublic

Authored by martinvonz on Jun 10 2021, 7:21 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfca9c63f160e: cmdutil: make amend() take str-keyed opts
Summary

I couldn't think of a reasonable change to the signature here, so
unfortunately it keeps the existing one.

Diff Detail

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

Event Timeline

martinvonz created this revision.Jun 10 2021, 7:21 PM
pulkit accepted this revision.Jun 14 2021, 4:35 PM
This revision is now accepted and ready to land.Jun 14 2021, 4:35 PM
martinvonz updated this revision to Diff 28604.Jun 18 2021, 5:54 PM
martinvonz added a commit: rHGfca9c63f160e: cmdutil: make amend() take str-keyed opts.Jun 21 2021, 8:16 AM
Closed by commit rHGfca9c63f160e: cmdutil: make amend() take str-keyed opts (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (1 line)
Mmercurial/commands.py (2 lines)
Mtests/test-obsolete.t (5 lines)

Diff 28542

mercurial/cmdutil.py

return not a.cmp(b) and a.flags() == b.flags() return not a.cmp(b) and a.flags() == b.flags()
else: else:
return False return False
else: else:
return f not in ctx2.manifest() return f not in ctx2.manifest()
def amend(ui, repo, old, extra, pats, opts): def amend(ui, repo, old, extra, pats, opts):
opts = pycompat.byteskwargs(opts)
# avoid cycle context -> subrepo -> cmdutil # avoid cycle context -> subrepo -> cmdutil
from . import context from . import context
# amend will reuse the existing user if not specified, but the obsolete # amend will reuse the existing user if not specified, but the obsolete
# marker creation requires that the current user's name is specified. # marker creation requires that the current user's name is specified.
if obsolete.isenabled(repo, obsolete.createmarkersopt): if obsolete.isenabled(repo, obsolete.createmarkersopt):
ui.username() # raise exception if username not set ui.username() # raise exception if username not set

mercurial/commands.py

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
# is in progress. Since we have a checkunfinished command, we are # is in progress. Since we have a checkunfinished command, we are
# temporarily honoring it. # temporarily honoring it.
# #
# Note: eventually this guard will be removed. Please do not expect # Note: eventually this guard will be removed. Please do not expect
# this behavior to remain. # this behavior to remain.
if not obsolete.isenabled(repo, obsolete.createmarkersopt): if not obsolete.isenabled(repo, obsolete.createmarkersopt):
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
opts = pycompat.byteskwargs(opts)
node = cmdutil.amend(ui, repo, old, extra, pats, opts) node = cmdutil.amend(ui, repo, old, extra, pats, opts)
opts = pycompat.byteskwargs(opts)
if node == old.node(): if node == old.node():
ui.status(_(b"nothing changed\n")) ui.status(_(b"nothing changed\n"))
return 1 return 1
else: else:
def commitfunc(ui, repo, message, match, opts): def commitfunc(ui, repo, message, match, opts):
overrides = {} overrides = {}
if opts.get(b'secret'): if opts.get(b'secret'):

tests/test-obsolete.t

> from mercurial.i18n import _ > from mercurial.i18n import _
> from mercurial import cmdutil, pycompat, registrar > from mercurial import cmdutil, pycompat, registrar
> from mercurial.utils import stringutil > from mercurial.utils import stringutil
> >
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command(b"amendtransient",[], _(b'hg amendtransient [rev]')) > @command(b"amendtransient",[], _(b'hg amendtransient [rev]'))
> def amend(ui, repo, *pats, **opts): > def amend(ui, repo, *pats, **opts):
> opts = pycompat.byteskwargs(opts) > opts['message'] = b'Test'
> opts[b'message'] = b'Test' > opts['logfile'] = None
> opts[b'logfile'] = None
> cmdutil.amend(ui, repo, repo[b'.'], {}, pats, opts) > cmdutil.amend(ui, repo, repo[b'.'], {}, pats, opts)
> ui.write(b'%s\n' % stringutil.pprint(repo.changelog.headrevs())) > ui.write(b'%s\n' % stringutil.pprint(repo.changelog.headrevs()))
> EOF > EOF
$ cat >> $HGRCPATH << EOF $ cat >> $HGRCPATH << EOF
> [extensions] > [extensions]
> testextension=$TESTTMP/test_extension.py > testextension=$TESTTMP/test_extension.py
> EOF > EOF
$ hg init repo-issue-nativerevs-pending-changes $ hg init repo-issue-nativerevs-pending-changes