D599: cmdutil: remove redundant commitfunc parameter in amend (API)
singhsrb (Saurabh Singh)
phabricator at mercurial-scm.org
Thu Aug 31 22:02:24 EDT 2017
singhsrb created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D599
AFFECTED FILES
hgext/keyword.py
mercurial/cmdutil.py
mercurial/commands.py
tests/test-obsolete.t
CHANGE DETAILS
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -1213,11 +1213,9 @@
> command = registrar.command(cmdtable)
> @command(b"amendtransient",[], _('hg amendtransient [rev]'))
> 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['logfile'] = None
- > cmdutil.amend(ui, repo, commitfunc, repo['.'], {}, pats, opts)
+ > cmdutil.amend(ui, repo, repo['.'], {}, pats, opts)
> ui.write('%s\n' % repo.changelog.headrevs())
> EOF
$ cat >> $HGRCPATH << EOF
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1547,15 +1547,7 @@
if not obsolete.isenabled(repo, obsolete.createmarkersopt):
cmdutil.checkunfinished(repo)
- # commitfunc is used only for temporary amend commit by cmdutil.amend
- 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)
+ node = cmdutil.amend(ui, repo, old, extra, pats, opts)
if node == old.node():
ui.status(_("nothing changed\n"))
return 1
diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -3025,8 +3025,7 @@
else:
return f not in ctx2.manifest()
-# TODO: remove the commitfunc parameter because it is no longer used
-def amend(ui, repo, commitfunc, old, extra, pats, opts):
+def amend(ui, repo, old, extra, pats, opts):
# avoid cycle context -> subrepo -> cmdutil
from . import context
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -614,14 +614,14 @@
if kwt:
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.'''
kwt = getattr(repo, '_keywordkwt', 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():
kwt.postcommit = True
- newid = orig(ui, repo, commitfunc, old, extra, pats, opts)
+ newid = orig(ui, repo, old, extra, pats, opts)
if newid != old.node():
ctx = repo[newid]
kwt.restrict = True
To: singhsrb, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list