This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3974

tests: demonstrate that no requested merge tool is ignored if missing
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6bfd1054d867: tests: demonstrate that no requested merge tool is ignored if missing
Summary

If you explicitly configure a merge tool, it seems wrong that we don't
even warn if we can't find it. This patch adds a test case that
demonstrates that.

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

PathPackages
Mtests/test-merge-tools.t (22 lines)

Diff 10070

tests/test-merge-tools.t

revision 1 revision 1
space space
# hg stat # hg stat
M f M f
? f.orig ? f.orig
# hg resolve --list # hg resolve --list
U f U f
missingbinary is a merge-tool that doesn't exist:
$ echo "missingbinary.executable=doesnotexist" >> .hg/hgrc
$ beforemerge
[merge-tools]
false.whatever=
true.priority=1
true.executable=cat
missingbinary.executable=doesnotexist
# hg update -C 1
$ hg merge -y -r 2 --config ui.merge=missingbinary
merging f
revision 1
space
revision 0
space
revision 2
space
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
#if symlink #if symlink
internal merge cannot handle symlinks and shouldn't try: internal merge cannot handle symlinks and shouldn't try:
$ hg update -q -C 1 $ hg update -q -C 1
$ rm f $ rm f
$ ln -s symlink f $ ln -s symlink f
$ hg commit -qm 'f is symlink' $ hg commit -qm 'f is symlink'
Check that debugpicktool examines which merge tool is chosen for Check that debugpicktool examines which merge tool is chosen for
specified file as expected specified file as expected
$ 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
# hg update -C 1 # hg update -C 1
(default behavior: checking files in the working parent context) (default behavior: checking files in the working parent context)
$ hg manifest $ hg manifest
f f
$ hg debugpickmergetool $ hg debugpickmergetool
f = true f = true