This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3739

merge: 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
rHG7e34fc78701a: merge: use context manager for config override
Summary

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 rHG7e34fc78701a: merge: 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 (8 lines)

Diff 9068

mercurial/commands.py

nodes = repo.changelog.findmissing(common=[p1], heads=[p2]) nodes = repo.changelog.findmissing(common=[p1], heads=[p2])
displayer = logcmdutil.changesetdisplayer(ui, repo, opts) displayer = logcmdutil.changesetdisplayer(ui, repo, opts)
for node in nodes: for node in nodes:
displayer.show(repo[node]) displayer.show(repo[node])
displayer.close() displayer.close()
return 0 return 0
try:
# ui.forcemerge is an internal variable, do not document # ui.forcemerge is an internal variable, do not document
repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge') overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
with ui.configoverride(overrides, 'merge'):
force = opts.get('force') force = opts.get('force')
labels = ['working copy', 'merge rev'] labels = ['working copy', 'merge rev']
return hg.merge(repo, node, force=force, mergeforce=force, return hg.merge(repo, node, force=force, mergeforce=force,
labels=labels, abort=abort) labels=labels, abort=abort)
finally:
ui.setconfig('ui', 'forcemerge', '', 'merge')
@command('outgoing|out', @command('outgoing|out',
[('f', 'force', None, _('run even when the destination is unrelated')), [('f', 'force', None, _('run even when the destination is unrelated')),
('r', 'rev', [], ('r', 'rev', [],
_('a changeset intended to be included in the destination'), _('REV')), _('a changeset intended to be included in the destination'), _('REV')),
('n', 'newest-first', None, _('show newest record first')), ('n', 'newest-first', None, _('show newest record first')),
('B', 'bookmarks', False, _('compare bookmarks')), ('B', 'bookmarks', False, _('compare bookmarks')),
('b', 'branch', [], _('a specific branch you would like to push'), ('b', 'branch', [], _('a specific branch you would like to push'),