This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12588

filemerge: add configs to disable some or all partial merge tools
ClosedPublic

Authored by martinvonz on Apr 26 2022, 12:13 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7af798e497f5: filemerge: add configs to disable some or all partial merge tools
Summary

When rolling out partial merge tools to users, it's useful to be able
to easily turn one or all of them off if a problem is discovered. This
patch adds support for that. They can of course also be useful for
individual users to be able to temporarily turn off a tool they are
otherwise using.

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.Apr 26 2022, 12:13 PM
Alphare accepted this revision.Mon, May 9, 11:16 AM
This revision is now accepted and ready to land.Mon, May 9, 11:16 AM

Revision Contents
Changeset List

Diff 33374

mercurial/configitems.py

experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'merge', b'merge',
b'strict-capability-check', b'strict-capability-check',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'merge',
b'disable-partial-tools',
default=False,
experimental=True,
)
coreconfigitem(
b'partial-merge-tools', b'partial-merge-tools',
b'.*', b'.*',
default=None, default=None,
generic=True, generic=True,
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'partial-merge-tools', b'partial-merge-tools',
b'partial-merge-tools', b'partial-merge-tools',
br'.*\.args', br'.*\.args',
default=b"$local $base $other", default=b"$local $base $other",
generic=True, generic=True,
priority=-1, priority=-1,
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'partial-merge-tools',
br'.*\.disable',
default=False,
generic=True,
priority=-1,
experimental=True,
)
coreconfigitem(
b'merge-tools', b'merge-tools',
b'.*', b'.*',
default=None, default=None,
generic=True, generic=True,
) )
coreconfigitem( coreconfigitem(
b'merge-tools', b'merge-tools',
br'.*\.args$', br'.*\.args$',

mercurial/filemerge.py

finally: finally:
if not r and backup is not None: if not r and backup is not None:
backup.remove() backup.remove()
def _run_partial_resolution_tools(repo, local, other, base): def _run_partial_resolution_tools(repo, local, other, base):
"""Runs partial-resolution tools on the three inputs and updates them.""" """Runs partial-resolution tools on the three inputs and updates them."""
ui = repo.ui ui = repo.ui
if ui.configbool(b'merge', b'disable-partial-tools'):
return
# Tuples of (order, name, executable path, args) # Tuples of (order, name, executable path, args)
tools = [] tools = []
seen = set() seen = set()
section = b"partial-merge-tools" section = b"partial-merge-tools"
for k, v in ui.configitems(section): for k, v in ui.configitems(section):
name = k.split(b'.')[0] name = k.split(b'.')[0]
if name in seen: if name in seen:
continue continue
patterns = ui.configlist(section, b'%s.patterns' % name, []) patterns = ui.configlist(section, b'%s.patterns' % name, [])
is_match = True is_match = True
if patterns: if patterns:
m = match.match(repo.root, b'', patterns) m = match.match(repo.root, b'', patterns)
is_match = m(local.fctx.path()) is_match = m(local.fctx.path())
if is_match: if is_match:
if ui.configbool(section, b'%s.disable' % name):
continue
order = ui.configint(section, b'%s.order' % name, 0) order = ui.configint(section, b'%s.order' % name, 0)
executable = ui.config(section, b'%s.executable' % name, name) executable = ui.config(section, b'%s.executable' % name, name)
args = ui.config(section, b'%s.args' % name) args = ui.config(section, b'%s.args' % name)
tools.append((order, name, executable, args)) tools.append((order, name, executable, args))
if not tools: if not tools:
return return
# Sort in configured order (first in tuple) # Sort in configured order (first in tuple)

tests/test-merge-partial-tool.t

$ cat file $ cat file
a a
b b
c c
d d
e e
Can disable all partial merge tools (the `head` tool would have resolved this
conflict it had been enabled)
$ hg up -C 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 3 -t :merge3 --config merge.disable-partial-tools=yes
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat file
a
b
c
d
e
<<<<<<< working copy: d57edaa6e21a - test: a b c d e f3
f3
||||||| common ancestor: 8ae8bb9cc43a - test: a b c d e f
f
=======
f2
>>>>>>> merge rev: 8c217da987be - test: a b c d e f2
Can disable one partial merge tool (the `head` tool would have resolved this
conflict it had been enabled)
$ hg up -C 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 3 -t :merge3 --config partial-merge-tools.head.disable=yes
merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
$ cat file
b
c
d
e
<<<<<<< working copy: d57edaa6e21a - test: a b c d e f3
f3
||||||| common ancestor: 8ae8bb9cc43a - test: a b c d e f
f
=======
f2
>>>>>>> merge rev: 8c217da987be - test: a b c d e f2
Only tools whose patterns match are run. We make `head` not match here, so Only tools whose patterns match are run. We make `head` not match here, so
only `tail` should run only `tail` should run
$ hg up -C 4 $ hg up -C 4
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 3 -t :merge3 --config partial-merge-tools.head.patterns=other $ hg merge 3 -t :merge3 --config partial-merge-tools.head.patterns=other
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')