This is an archive of the discontinued Mercurial Phabricator instance.

Differential D635

cmdutil: remove redundant commitfunc parameter in amend (API)
ClosedPublic

Authored by singhsrb on Sep 5 2017, 8:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa39dce4a76b8: cmdutil: remove redundant commitfunc parameter in amend (API)
Summary

Since the redundant commit during the amend has been been removed, there is no
need for commit callback function in amend now. Therefore, this commit removes
the unused parameter "commmitfunc" which was being used for this purpose.

Test Plan

Ensured that all the tests pass

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.

Revision Contents
Changeset List

PathPackages
Mhgext/keyword.py (6 lines)
Mmercurial/cmdutil.py (3 lines)
Mmercurial/commands.py (10 lines)
Mtests/test-obsolete.t (4 lines)

Diff 1677

hgext/keyword.py

kwt.match = util.never kwt.match = util.never
try: try:
for chunk in orig(web, req, tmpl): for chunk in orig(web, req, tmpl):
yield chunk yield chunk
finally: finally:
if kwt: if kwt:
kwt.match = origmatch kwt.match = origmatch
def kw_amend(orig, ui, repo, commitfunc, old, extra, pats, opts): def kw_amend(orig, ui, repo, old, extra, pats, opts):
'''Wraps cmdutil.amend expanding keywords after amend.''' '''Wraps cmdutil.amend expanding keywords after amend.'''
kwt = getattr(repo, '_keywordkwt', None) kwt = getattr(repo, '_keywordkwt', None)
if kwt is None: if kwt is None:
return orig(ui, repo, commitfunc, old, extra, pats, opts) return orig(ui, repo, old, extra, pats, opts)
with repo.wlock(): with repo.wlock():
kwt.postcommit = True kwt.postcommit = True
newid = orig(ui, repo, commitfunc, old, extra, pats, opts) newid = orig(ui, repo, old, extra, pats, opts)
if newid != old.node(): if newid != old.node():
ctx = repo[newid] ctx = repo[newid]
kwt.restrict = True kwt.restrict = True
kwt.overwrite(ctx, ctx.files(), False, True) kwt.overwrite(ctx, ctx.files(), False, True)
kwt.restrict = False kwt.restrict = False
return newid return newid
def kw_copy(orig, ui, repo, pats, opts, rename=False): def kw_copy(orig, ui, repo, pats, opts, rename=False):

mercurial/cmdutil.py

b = ctx2.filectx(f) b = ctx2.filectx(f)
return (not a.cmp(b) return (not a.cmp(b)
and a.flags() == b.flags()) 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()
# TODO: remove the commitfunc parameter because it is no longer used def amend(ui, repo, old, extra, pats, opts):
def amend(ui, repo, commitfunc, old, extra, pats, 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

# 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)
# commitfunc is used only for temporary amend commit by cmdutil.amend node = cmdutil.amend(ui, repo, old, extra, pats, opts)
def commitfunc(ui, repo, message, match, opts):
return repo.commit(message,
opts.get('user') or old.user(),
opts.get('date') or old.date(),
match,
extra=extra)
node = cmdutil.amend(ui, repo, commitfunc, old, extra, pats, opts)
if node == old.node(): if node == old.node():
ui.status(_("nothing changed\n")) ui.status(_("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('secret'): if opts.get('secret'):
overrides[('phases', 'new-commit')] = 'secret' overrides[('phases', 'new-commit')] = 'secret'

tests/test-obsolete.t

> from __future__ import absolute_import > from __future__ import absolute_import
> from mercurial.i18n import _ > from mercurial.i18n import _
> from mercurial import cmdutil, registrar > from mercurial import cmdutil, registrar
> >
> cmdtable = {} > cmdtable = {}
> command = registrar.command(cmdtable) > command = registrar.command(cmdtable)
> @command(b"amendtransient",[], _('hg amendtransient [rev]')) > @command(b"amendtransient",[], _('hg amendtransient [rev]'))
> def amend(ui, repo, *pats, **opts): > def amend(ui, repo, *pats, **opts):
> def commitfunc(ui, repo, message, match, opts):
> return repo.commit(message, repo['.'].user(), repo['.'].date(), match)
> opts['message'] = 'Test' > opts['message'] = 'Test'
> opts['logfile'] = None > opts['logfile'] = None
> cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts) > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts)
> ui.write('%s\n' % repo.changelog.headrevs()) > ui.write('%s\n' % 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
$ cd repo-issue-nativerevs-pending-changes $ cd repo-issue-nativerevs-pending-changes