Mercurial > hg-stable
changeset 34103:a39dce4a76b8
cmdutil: remove redundant commitfunc parameter in amend (API)
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
Differential Revision: https://phab.mercurial-scm.org/D635
| author | Saurabh Singh <singhsrb@fb.com> |
|---|---|
| date | Fri, 01 Sep 2017 12:34:36 -0700 |
| parents | e8a7c1a0565a |
| children | 5361771f9714 |
| files | hgext/keyword.py mercurial/cmdutil.py mercurial/commands.py tests/test-obsolete.t |
| diffstat | 4 files changed, 6 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/keyword.py Fri Sep 01 12:34:36 2017 -0700 +++ b/hgext/keyword.py Fri Sep 01 12:34:36 2017 -0700 @@ -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
--- a/mercurial/cmdutil.py Fri Sep 01 12:34:36 2017 -0700 +++ b/mercurial/cmdutil.py Fri Sep 01 12:34:36 2017 -0700 @@ -3026,8 +3026,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
--- a/mercurial/commands.py Fri Sep 01 12:34:36 2017 -0700 +++ b/mercurial/commands.py Fri Sep 01 12:34:36 2017 -0700 @@ -1550,15 +1550,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
--- a/tests/test-obsolete.t Fri Sep 01 12:34:36 2017 -0700 +++ b/tests/test-obsolete.t Fri Sep 01 12:34:36 2017 -0700 @@ -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