This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12383

partial-merge: add support for `.args` config (`$local` etc.)
ClosedPublic

Authored by martinvonz on Mar 17 2022, 4:01 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG9dfbea54b680: partial-merge: add support for `.args` config (`$local` etc.)
Summary

It will be useful to be able to define custom command-line arguments
per partial merge tool just like we have for regular merge tools. In
particular, I expect the same binary to handle multiple languages, so
it will be useful to be able to pass some argument indicating the
language, or perhaps simply an argument defining a regex that's used
for finding lines to merge as a sorted set.

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.

Revision Contents
Changeset List

Diff 32691

mercurial/configitems.py

b'partial-merge-tools', b'partial-merge-tools',
br'.*\.order', br'.*\.order',
default=0, default=0,
generic=True, generic=True,
priority=-1, priority=-1,
experimental=True, experimental=True,
) )
coreconfigitem( coreconfigitem(
b'partial-merge-tools',
br'.*\.args',
default=b"$local $base $other",
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
# Tuples of (order, name, executable path) # 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:
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)
tools.append((order, name, executable)) args = ui.config(section, b'%s.args' % name)
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)
tools.sort() tools.sort()
files = [ files = [
(b"local", local.fctx.path(), local.text()), (b"local", local.fctx.path(), local.text()),
(b"base", base.fctx.path(), base.text()), (b"base", base.fctx.path(), base.text()),
(b"other", other.fctx.path(), other.text()), (b"other", other.fctx.path(), other.text()),
] ]
with _maketempfiles(files) as temppaths: with _maketempfiles(files) as temppaths:
localpath, basepath, otherpath = temppaths localpath, basepath, otherpath = temppaths
for order, name, executable in tools: for order, name, executable, args in tools:
cmd = procutil.shellquote(executable) cmd = procutil.shellquote(executable)
# TODO: Allow the user to configure the command line using replace = {
# $local, $base, $other. b'local': localpath,
cmd = b'%s %s %s %s' % (cmd, localpath, basepath, otherpath) b'base': basepath,
b'other': otherpath,
}
args = util.interpolate(
br'\$',
replace,
args,
lambda s: procutil.shellquote(util.localpath(s)),
)
cmd = b'%s %s' % (cmd, args)
r = ui.system(cmd, cwd=repo.root, blockedtag=b'partial-mergetool') r = ui.system(cmd, cwd=repo.root, blockedtag=b'partial-mergetool')
if r: if r:
raise error.StateError( raise error.StateError(
b'partial merge tool %s exited with code %d' % (name, r) b'partial merge tool %s exited with code %d' % (name, r)
) )
local_text = util.readfile(localpath) local_text = util.readfile(localpath)
other_text = util.readfile(otherpath) other_text = util.readfile(otherpath)
if local_text == other_text: if local_text == other_text:

tests/test-merge-partial-tool.t

0 files updated, 1 files merged, 0 files removed, 0 files unresolved 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ cat file $ cat file
a a
b2 b2
c c
d d
e3 e3
Test that arguments get passed as expected.
$ cat >> "$TESTTMP/log-args.sh" <<'EOF'
> #!/bin/sh
> echo "$@" > args.log
> EOF
$ chmod +x "$TESTTMP/log-args.sh"
$ cat >> "$HGRCPATH" <<EOF
> [partial-merge-tools]
> log-args.executable=$TESTTMP/log-args.sh
> EOF
$ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 1
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 args.log
*/hgmerge-*/file~local */hgmerge-*/file~base */hgmerge-*/file~other (glob)
$ hg up -C 2
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 1 --config partial-merge-tools.log-args.args='--other $other $base --foo --local $local --also-other $other'
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 args.log
--other */hgmerge-*/file~other */hgmerge-*/file~base --foo --local */hgmerge-*/file~local --also-other */hgmerge-*/file~other (glob)