Mercurial > hg
annotate tests/test-merge-tools @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 660c8dd44060 |
children | 1cb6836946be |
rev | line source |
---|---|
7731 | 1 #!/bin/sh |
2 | |
3 # test merge-tools configuration - mostly exercising filemerge.py | |
4 | |
5 unset HGMERGE # make sure HGMERGE doesn't interfere with the test | |
6 | |
7 hg init | |
8 | |
9 echo "# revision 0" | |
10 echo "revision 0" > f | |
11 echo "space" >> f | |
12 hg commit -Am "revision 0" -d "1000000 0" | |
13 | |
14 echo "# revision 1" | |
15 echo "revision 1" > f | |
16 echo "space" >> f | |
17 hg commit -Am "revision 1" -d "1000000 0" | |
18 | |
19 hg update 0 > /dev/null | |
20 echo "# revision 2" | |
21 echo "revision 2" > f | |
22 echo "space" >> f | |
23 hg commit -Am "revision 2" -d "1000000 0" | |
24 | |
25 hg update 0 > /dev/null | |
26 echo "# revision 3 - simple to merge" | |
27 echo "revision 3" >> f | |
28 hg commit -Am "revision 3" -d "1000000 0" | |
29 | |
30 | |
31 echo "[merge-tools]" > .hg/hgrc | |
32 echo | |
33 | |
34 beforemerge() { | |
35 cat .hg/hgrc | |
36 echo "# hg update -C 1" | |
37 hg update -C 1 > /dev/null | |
38 } | |
39 | |
40 aftermerge() { | |
41 echo "# cat f" | |
42 cat f | |
43 echo "# hg stat" | |
44 hg stat | |
45 rm -f f.orig | |
46 echo | |
47 } | |
48 | |
49 domerge() { | |
50 beforemerge | |
51 echo "# hg merge $*" | |
52 hg merge $* | |
53 aftermerge | |
54 } | |
55 | |
56 echo | |
57 echo Tool selection | |
58 echo | |
59 | |
60 echo "# default is internal merge:" | |
7785
660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
Mads Kiilerich <mads@kiilerich.com>
parents:
7769
diff
changeset
|
61 beforemerge |
660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
Mads Kiilerich <mads@kiilerich.com>
parents:
7769
diff
changeset
|
62 echo "# hg merge -r 2" |
660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
Mads Kiilerich <mads@kiilerich.com>
parents:
7769
diff
changeset
|
63 PATH=$BINDIR hg merge -r 2 |
660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
Mads Kiilerich <mads@kiilerich.com>
parents:
7769
diff
changeset
|
64 aftermerge |
7731 | 65 |
66 echo "# simplest hgrc using false for merge:" | |
67 echo "false.whatever=" >> .hg/hgrc | |
68 domerge -r 2 | |
69 | |
70 echo "# true with higher .priority gets precedence:" | |
71 echo "true.priority=1" >> .hg/hgrc | |
72 domerge -r 2 | |
73 | |
74 echo "# unless lowered on command line:" | |
75 domerge -r 2 --config merge-tools.true.priority=-7 | |
76 | |
77 echo "# or false set higher on command line:" | |
78 domerge -r 2 --config merge-tools.false.priority=117 | |
79 | |
80 echo "# or true.executable not found in PATH:" | |
81 domerge -r 2 --config merge-tools.true.executable=nonexistingmergetool | |
82 | |
83 echo "# or true.executable with bogus path:" | |
84 domerge -r 2 --config merge-tools.true.executable=/bin/nonexistingmergetool | |
85 | |
86 echo "# but true.executable set to cat found in PATH works:" | |
87 echo "true.executable=cat" >> .hg/hgrc | |
88 domerge -r 2 | |
89 | |
90 echo "# and true.executable set to cat with path works:" | |
91 domerge -r 2 --config merge-tools.true.executable=/bin/cat | |
92 | |
93 | |
94 echo | |
95 echo Tool selection and merge-patterns | |
96 echo | |
97 | |
7769
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7731
diff
changeset
|
98 echo "# merge-patterns specifies new tool false:" |
8c06d4bf2c23
test-merge-tools: Don't use tac
Mads Kiilerich <mads@kiilerich.com>
parents:
7731
diff
changeset
|
99 domerge -r 2 --config merge-patterns.f=false |
7731 | 100 |
101 echo "# merge-patterns specifies executable not found in PATH and gets warning:" | |
102 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=nonexistingmergetool | |
103 | |
104 echo "# merge-patterns specifies executable with bogus path and gets warning:" | |
105 domerge -r 2 --config merge-patterns.f=true --config merge-tools.true.executable=/bin/nonexistingmergetool | |
106 | |
107 | |
108 echo | |
109 echo Premerge | |
110 echo | |
111 | |
112 echo "# Default is silent simplemerge:" | |
113 domerge -r 3 | |
114 | |
115 echo "# .premerge=True is same:" | |
116 domerge -r 3 --config merge-tools.true.premerge=True | |
117 | |
118 echo "# .premerge=False executes merge-tool:" | |
119 domerge -r 3 --config merge-tools.true.premerge=False | |
120 | |
121 | |
122 echo | |
123 echo Tool execution | |
124 echo | |
125 | |
126 echo '# set tools.args explicit to include $base $local $other $output:' # default '$local $base $other' | |
127 beforemerge | |
128 hg merge -r 2 --config merge-tools.true.executable=head --config merge-tools.true.args='$base $local $other $output' \ | |
129 | sed 's,==> .* <==,==> ... <==,g' | |
130 aftermerge | |
131 | |
132 echo '# Merge with "echo mergeresult > $local":' | |
133 beforemerge | |
134 hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $local' | |
135 aftermerge | |
136 | |
137 echo '# - and $local is the file f:' | |
138 beforemerge | |
139 hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > f' | |
140 aftermerge | |
141 | |
142 echo '# Merge with "echo mergeresult > $output" - the variable is a bit magic:' | |
143 beforemerge | |
144 hg merge -r 2 --config merge-tools.true.executable=echo --config merge-tools.true.args='mergeresult > $output' | |
145 aftermerge | |
146 | |
147 | |
148 echo | |
149 echo Merge post-processing | |
150 echo | |
151 | |
152 echo "# cat is a bad merge-tool and doesn't change:" | |
153 domerge -r 2 --config merge-tools.true.checkchanged=1 |