This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3738

graft: use context manager for config override
ClosedPublic

Authored by martinvonz on Jun 14 2018, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG79dcaad9d145: graft: use context manager for config override

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 14 2018, 7:32 PM
Closed by commit rHG79dcaad9d145: graft: use context manager for config override (authored by martinvonz). · Explain WhyJun 15 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (11 lines)

Diff 9067

mercurial/commands.py

message = ctx.description() message = ctx.description()
if opts.get('log'): if opts.get('log'):
message += '\n(grafted from %s)' % ctx.hex() message += '\n(grafted from %s)' % ctx.hex()
statedata['log'] = True statedata['log'] = True
# we don't merge the first commit when continuing # we don't merge the first commit when continuing
if not cont: if not cont:
# perform the graft merge with p1(rev) as 'ancestor' # perform the graft merge with p1(rev) as 'ancestor'
try: overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
# ui.forcemerge is an internal variable, do not document with ui.configoverride(overrides, 'graft'):
repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
'graft')
stats = mergemod.graft(repo, ctx, ctx.p1(),
['local', 'graft'])
finally:
repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
# report any conflicts # report any conflicts
if stats.unresolvedcount > 0: if stats.unresolvedcount > 0:
# write out state for --continue # write out state for --continue
nodes = [repo[rev].hex() for rev in revs[pos:]] nodes = [repo[rev].hex() for rev in revs[pos:]]
statedata['nodes'] = nodes statedata['nodes'] = nodes
stateversion = 1 stateversion = 1
graftstate.save(stateversion, statedata) graftstate.save(stateversion, statedata)
hint = _("use 'hg resolve' and 'hg graft --continue'") hint = _("use 'hg resolve' and 'hg graft --continue'")