56 $ echo b >> a |
56 $ echo b >> a |
57 $ hg ci -d '1 0' -mtest2 |
57 $ hg ci -d '1 0' -mtest2 |
58 |
58 |
59 Should diff cloned files directly: |
59 Should diff cloned files directly: |
60 |
60 |
|
61 #if windows |
|
62 $ hg falabala -r 0:1 |
|
63 diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) |
|
64 [1] |
|
65 #else |
61 $ hg falabala -r 0:1 |
66 $ hg falabala -r 0:1 |
62 diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
67 diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
63 [1] |
68 [1] |
|
69 #endif |
64 |
70 |
65 Test diff during merge: |
71 Test diff during merge: |
66 |
72 |
67 $ hg update -C 0 |
73 $ hg update -C 0 |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
74 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
75 (branch merge, don't forget to commit) |
81 (branch merge, don't forget to commit) |
76 |
82 |
77 Should diff cloned file against wc file: |
83 Should diff cloned file against wc file: |
78 |
84 |
|
85 #if windows |
|
86 $ hg falabala |
|
87 diffing "*\\extdiff.*\\a.2a13a4d2da36\\a" "*\\a\\a" (glob) |
|
88 [1] |
|
89 #else |
79 $ hg falabala |
90 $ hg falabala |
80 diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob) |
91 diffing */extdiff.*/a.2a13a4d2da36/a */a/a (glob) |
81 [1] |
92 [1] |
|
93 #endif |
82 |
94 |
83 |
95 |
84 Test --change option: |
96 Test --change option: |
85 |
97 |
86 $ hg ci -d '2 0' -mtest3 |
98 $ hg ci -d '2 0' -mtest3 |
|
99 #if windows |
|
100 $ hg falabala -c 1 |
|
101 diffing "*\\extdiff.*\\a.8a5febb7f867\\a" "a.34eed99112ab\\a" (glob) |
|
102 [1] |
|
103 #else |
87 $ hg falabala -c 1 |
104 $ hg falabala -c 1 |
88 diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
105 diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) |
89 [1] |
106 [1] |
|
107 #endif |
90 |
108 |
91 Check diff are made from the first parent: |
109 Check diff are made from the first parent: |
92 |
110 |
|
111 #if windows |
|
112 $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" |
|
113 diffing "*\\extdiff.*\\a.2a13a4d2da36\\a" "a.46c0e4daeb72\\a" (glob) |
|
114 diff-like tools yield a non-zero exit code |
|
115 #else |
93 $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" |
116 $ hg falabala -c 3 || echo "diff-like tools yield a non-zero exit code" |
94 diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) |
117 diffing */extdiff.*/a.2a13a4d2da36/a a.46c0e4daeb72/a (glob) |
95 diff-like tools yield a non-zero exit code |
118 diff-like tools yield a non-zero exit code |
|
119 #endif |
96 |
120 |
97 issue4463: usage of command line configuration without additional quoting |
121 issue4463: usage of command line configuration without additional quoting |
98 |
122 |
99 $ cat <<EOF >> $HGRCPATH |
123 $ cat <<EOF >> $HGRCPATH |
100 > [extdiff] |
124 > [extdiff] |
105 > EOF |
129 > EOF |
106 $ hg update -q -C 0 |
130 $ hg update -q -C 0 |
107 $ echo a >> a |
131 $ echo a >> a |
108 #if windows |
132 #if windows |
109 $ hg --debug 4463a | grep '^running' |
133 $ hg --debug 4463a | grep '^running' |
110 running 'echo a-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
134 running 'echo a-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) |
111 $ hg --debug 4463b | grep '^running' |
135 $ hg --debug 4463b | grep '^running' |
112 running 'echo b-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
136 running 'echo b-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) |
113 $ hg --debug echo | grep '^running' |
137 $ hg --debug echo | grep '^running' |
114 running '*echo* *\\a *\\a' in */extdiff.* (glob) |
138 running '*echo* "*\\a" "*\\a"' in */extdiff.* (glob) |
115 #else |
139 #else |
116 $ hg --debug 4463a | grep '^running' |
140 $ hg --debug 4463a | grep '^running' |
117 running 'echo a-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
141 running 'echo a-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
118 $ hg --debug 4463b | grep '^running' |
142 $ hg --debug 4463b | grep '^running' |
119 running 'echo b-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
143 running 'echo b-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
136 > [merge-tools] |
160 > [merge-tools] |
137 > 4463b3.diffargs = b3-naked 'single quoted' "double quoted" |
161 > 4463b3.diffargs = b3-naked 'single quoted' "double quoted" |
138 > EOF |
162 > EOF |
139 #if windows |
163 #if windows |
140 $ hg --debug 4463b2 | grep '^running' |
164 $ hg --debug 4463b2 | grep '^running' |
141 running 'echo b2-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
165 running 'echo b2-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) |
142 $ hg --debug 4463b3 | grep '^running' |
166 $ hg --debug 4463b3 | grep '^running' |
143 running 'echo b3-naked \'single quoted\' "double quoted" *\\a *\\a' in */extdiff.* (glob) |
167 running 'echo b3-naked \'single quoted\' "double quoted" "*\\a" "*\\a"' in */extdiff.* (glob) |
144 $ hg --debug 4463b4 | grep '^running' |
168 $ hg --debug 4463b4 | grep '^running' |
145 running 'echo *\\a *\\a' in */extdiff.* (glob) |
169 running 'echo "*\\a" "*\\a"' in */extdiff.* (glob) |
146 $ hg --debug 4463b4 --option b4-naked --option 'being quoted' | grep '^running' |
170 $ hg --debug 4463b4 --option b4-naked --option 'being quoted' | grep '^running' |
147 running 'echo b4-naked "being quoted" *\\a *\\a' in */extdiff.* (glob) |
171 running 'echo b4-naked "being quoted" "*\\a" "*\\a"' in */extdiff.* (glob) |
148 $ hg --debug extdiff -p echo --option echo-naked --option 'being quoted' | grep '^running' |
172 $ hg --debug extdiff -p echo --option echo-naked --option 'being quoted' | grep '^running' |
149 running 'echo echo-naked "being quoted" *\\a *\\a' in */extdiff.* (glob) |
173 running 'echo echo-naked "being quoted" "*\\a" "*\\a"' in */extdiff.* (glob) |
150 #else |
174 #else |
151 $ hg --debug 4463b2 | grep '^running' |
175 $ hg --debug 4463b2 | grep '^running' |
152 running 'echo b2-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
176 running 'echo b2-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
153 $ hg --debug 4463b3 | grep '^running' |
177 $ hg --debug 4463b3 | grep '^running' |
154 running 'echo b3-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |
178 running 'echo b3-naked \'single quoted\' "double quoted" */a $TESTTMP/a/a' in */extdiff.* (glob) |