This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3975

mergetool: warn if ui.merge points to nonexistent tool
ClosedPublic

Authored by martinvonz on Jul 24 2018, 2:37 AM.

Details

Reviewers
lothiraldan
Group Reviewers
hg-reviewers
Commits
rHG0e58c5b20745: mergetool: warn if ui.merge points to nonexistent tool
Summary

This adds a warning when ui.merge is configured but points to an
executable that doesn't exist. It gets printed once per fail, but that
seems to be how our other warnings about merge tools are reported.

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.Jul 24 2018, 2:37 AM
lothiraldan accepted this revision.Jul 24 2018, 4:30 AM
martinvonz added a comment.Aug 1 2018, 3:00 PM

Just a reminder that this is ready to be queued now that the freeze is over (I understand that it wasn't queued during the freeze).

yuja added a subscriber: yuja.Aug 8 2018, 8:04 AM

Queued, thanks.

$ hg merge -y -r 2 --config ui.merge=missingbinary

+ couldn't find merge tool missingbinary (for pattern f)

Nit: "for pattern f" seems misleading since ui.merge is not defined per
filename pattern.

Closed by commit rHG0e58c5b20745: mergetool: warn if ui.merge points to nonexistent tool (authored by martinvonz). · Explain WhyAug 8 2018, 8:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filemerge.py (7 lines)
Mtests/test-merge-tools.t (2 lines)

Diff 10072

mercurial/filemerge.py

disabled.add(t) disabled.add(t)
names = tools.keys() names = tools.keys()
tools = sorted([(-p, tool) for tool, p in tools.items() tools = sorted([(-p, tool) for tool, p in tools.items()
if tool not in disabled]) if tool not in disabled])
uimerge = ui.config("ui", "merge") uimerge = ui.config("ui", "merge")
if uimerge: if uimerge:
# external tools defined in uimerge won't be able to handle # external tools defined in uimerge won't be able to handle
# change/delete conflicts # change/delete conflicts
if check(uimerge, path, symlink, binary, changedelete):
if uimerge not in names and not changedelete: if uimerge not in names and not changedelete:
return (uimerge, uimerge) return (uimerge, uimerge)
tools.insert(0, (None, uimerge)) # highest priority tools.insert(0, (None, uimerge)) # highest priority
tools.append((None, "hgmerge")) # the old default, if found tools.append((None, "hgmerge")) # the old default, if found
for p, t in tools: for p, t in tools:
if check(t, None, symlink, binary, changedelete): if check(t, None, symlink, binary, changedelete):
toolpath = _findtool(ui, t) toolpath = _findtool(ui, t)
return (t, _quotetoolpath(toolpath)) return (t, _quotetoolpath(toolpath))
# internal merge or prompt as last resort # internal merge or prompt as last resort
if symlink or binary or changedelete: if symlink or binary or changedelete:

tests/test-merge-tools.t

$ beforemerge $ beforemerge
[merge-tools] [merge-tools]
false.whatever= false.whatever=
true.priority=1 true.priority=1
true.executable=cat true.executable=cat
missingbinary.executable=doesnotexist missingbinary.executable=doesnotexist
# hg update -C 1 # hg update -C 1
$ hg merge -y -r 2 --config ui.merge=missingbinary $ hg merge -y -r 2 --config ui.merge=missingbinary
couldn't find merge tool missingbinary (for pattern f)
merging f merging f
couldn't find merge tool missingbinary (for pattern f)
revision 1 revision 1
space space
revision 0 revision 0
space space
revision 2 revision 2
space space
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)