This is an archive of the discontinued Mercurial Phabricator instance.

Differential D639

amend: use context manager for config override
ClosedPublic

Authored by martinvonz on Sep 6 2017, 1:57 PM.

Details

Reviewers
singhsrb
Group Reviewers
hg-reviewers
Commits
rHG5dc6ac6555e6: amend: use context manager for config override
Summary

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

martinvonz created this revision.Sep 6 2017, 1:57 PM
singhsrb accepted this revision.Sep 6 2017, 3:34 PM
singhsrb added a subscriber: singhsrb.

Thanks for helping out with cleaning this method!

Closed by commit rHG5dc6ac6555e6: amend: use context manager for config override (authored by martinvonz). · Explain WhySep 7 2017, 10:54 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cmdutil.py (16 lines)

Diff 1661

mercurial/cmdutil.py

encoding, encoding,
error, error,
formatter, formatter,
graphmod, graphmod,
match as matchmod, match as matchmod,
obsolete, obsolete,
patch, patch,
pathutil, pathutil,
phases,
pycompat, pycompat,
registrar, registrar,
revlog, revlog,
revset, revset,
scmutil, scmutil,
smartset, smartset,
templatekw, templatekw,
templater, templater,
and date == old.date() and date == old.date()
and pureextra == old.extra()): and pureextra == old.extra()):
# nothing changed. continuing here would create a new node # nothing changed. continuing here would create a new node
# anyway because of the amend_source noise. # anyway because of the amend_source noise.
# #
# This not what we expect from amend. # This not what we expect from amend.
return old.node() return old.node()
ph = repo.ui.config('phases', 'new-commit', phases.draft)
try:
if opts.get('secret'): if opts.get('secret'):
commitphase = 'secret' commitphase = 'secret'
else: else:
commitphase = old.phase() commitphase = old.phase()
repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend') overrides = {('phases', 'new-commit'): commitphase}
with ui.configoverride(overrides, 'amend'):
newid = repo.commitctx(new) newid = repo.commitctx(new)
finally:
repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
# 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,)}
if node: if node:
mapping[node] = () mapping[node] = ()
scmutil.cleanupnodes(repo, mapping, 'amend') scmutil.cleanupnodes(repo, mapping, 'amend')