This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1094

cmdutil: pass metadata from amend() to cleanupnodes
ClosedPublic

Authored by pulkit on Oct 15 2017, 10:28 AM.

Details

Reviewers
dlax
durin42
Group Reviewers
hg-reviewers
Commits
rHG5781e0931c16: cmdutil: pass metadata from amend() to cleanupnodes
rHG63712407c620: cmdutil: pass metadata from amend() to cleanupnodes
Summary

commit --amend and amend command in core and extensions rely on
cmdutil.amend() for amending a commit. So the logic to add a note to amend must
reside here. This patch assumes that note will be passed in opts dictionary to
the function and it will be passed to cleanupnodes and then createmarkers to
store the note in the obsmarker metadata.

After this patch, note can be stored on an amend changeset by passing notes as a
part of opts to cmdutil.amend().

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

pulkit created this revision.Oct 15 2017, 10:28 AM
dlax accepted this revision.Oct 16 2017, 4:27 AM
durin42 accepted this revision.Oct 16 2017, 9:36 PM
This revision is now accepted and ready to land.Oct 16 2017, 9:36 PM
Closed by commit rHG63712407c620: cmdutil: pass metadata from amend() to cleanupnodes (authored by pulkit). · Explain WhyOct 16 2017, 9:47 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (5 lines)

Diff 2874

mercurial/cmdutil.py

commitphase = old.phase() commitphase = old.phase()
overrides = {('phases', 'new-commit'): commitphase} overrides = {('phases', 'new-commit'): commitphase}
with ui.configoverride(overrides, 'amend'): with ui.configoverride(overrides, 'amend'):
newid = repo.commitctx(new) newid = repo.commitctx(new)
# Reroute the working copy parent to the new changeset # Reroute the working copy parent to the new changeset
repo.setparents(newid, nullid) repo.setparents(newid, nullid)
mapping = {old.node(): (newid,)} mapping = {old.node(): (newid,)}
scmutil.cleanupnodes(repo, mapping, 'amend') obsmetadata = None
if opts.get('note'):
obsmetadata = {'note': opts['note']}
scmutil.cleanupnodes(repo, mapping, 'amend', metadata=obsmetadata)
# Fixing the dirstate because localrepo.commitctx does not update # Fixing the dirstate because localrepo.commitctx does not update
# it. This is rather convenient because we did not need to update # it. This is rather convenient because we did not need to update
# the dirstate for all the files in the new commit which commitctx # the dirstate for all the files in the new commit which commitctx
# could have done if it updated the dirstate. Now, we can # could have done if it updated the dirstate. Now, we can
# selectively update the dirstate only for the amended files. # selectively update the dirstate only for the amended files.
dirstate = repo.dirstate dirstate = repo.dirstate