140 $ hg falabala -c 6 --per-file |
144 $ hg falabala -c 6 --per-file |
141 diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !) |
145 diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !) |
142 diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !) |
146 diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !) |
143 diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) |
147 diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) |
144 diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) |
148 diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) |
|
149 [1] |
|
150 |
|
151 Test --per-file option for gui tool: |
|
152 |
|
153 $ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug |
|
154 diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !) |
|
155 diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !) |
|
156 diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) |
|
157 diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) |
|
158 making snapshot of 2 files from rev 46c0e4daeb72 |
|
159 a |
|
160 b |
|
161 making snapshot of 2 files from rev 81906f2b98ac |
|
162 a |
|
163 b |
|
164 running '* diffing * *' in * (backgrounded) (glob) |
|
165 running '* diffing * *' in * (backgrounded) (glob) |
|
166 cleaning up temp directory |
|
167 [1] |
|
168 |
|
169 Test --per-file option for gui tool again: |
|
170 |
|
171 $ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug |
|
172 diffing "*\\extdiff.*\\a.46c0e4daeb72\\a" "a.81906f2b98ac\\a" (glob) (windows !) |
|
173 diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) (no-windows !) |
|
174 diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) |
|
175 diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) |
|
176 making snapshot of 2 files from rev 46c0e4daeb72 |
|
177 a |
|
178 b |
|
179 making snapshot of 2 files from rev 81906f2b98ac |
|
180 a |
|
181 b |
|
182 running '* diffing * *' in * (backgrounded) (glob) |
|
183 running '* diffing * *' in * (backgrounded) (glob) |
|
184 cleaning up temp directory |
145 [1] |
185 [1] |
146 |
186 |
147 Test --per-file and --confirm options: |
187 Test --per-file and --confirm options: |
148 |
188 |
149 $ hg --config ui.interactive=True falabala -c 6 --per-file --confirm <<EOF |
189 $ hg --config ui.interactive=True falabala -c 6 --per-file --confirm <<EOF |