This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1575

amend: make a copy of "extra" to avoid mutating an input
ClosedPublic

Authored by martinvonz on Dec 1 2017, 5:43 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG5cc14407a739: amend: make a copy of "extra" to avoid mutating an input
Summary

I don't know of any problems this has caused, it just seems less
surprising.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Dec 1 2017, 5:43 PM
yuja accepted this revision.Dec 1 2017, 9:46 PM
This revision is now accepted and ready to land.Dec 1 2017, 9:46 PM
Closed by commit rHG5cc14407a739: amend: make a copy of "extra" to avoid mutating an input (authored by martinvonz). · Explain WhyDec 1 2017, 10:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (2 lines)

Diff 4065

mercurial/cmdutil.py

# wctx o - workingctx that contains changes from working copy # wctx o - workingctx that contains changes from working copy
# | to go into amending commit # | to go into amending commit
# | # |
# old o - changeset to amend # old o - changeset to amend
# | # |
# base o - first parent of the changeset to amend # base o - first parent of the changeset to amend
wctx = repo[None] wctx = repo[None]
# Copy to avoid mutating input
extra = extra.copy()
# Update extra dict from amended commit (e.g. to preserve graft # Update extra dict from amended commit (e.g. to preserve graft
# source) # source)
extra.update(old.extra()) extra.update(old.extra())
# Also update it from the from the wctx # Also update it from the from the wctx
extra.update(wctx.extra()) extra.update(wctx.extra())
user = opts.get('user') or old.user() user = opts.get('user') or old.user()