Details
Details
- Reviewers
- None
- Group Reviewers
hg-reviewers - Commits
- rHG79dcaad9d145: graft: use context manager for config override
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
hg-reviewers |
Lint Skipped |
Unit Tests Skipped |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/commands.py (11 lines) |
Commit | Parents | Author | Summary | Date |
---|---|---|---|---|
Martin von Zweigbergk | Jun 14 2018, 6:45 PM |
Status | Author | Revision | |
---|---|---|---|
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz | ||
Closed | martinvonz |
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'") |