Show More
@@ -34,7 +34,8 b' def _findtool(ui, tool):' | |||||
34 | p = util.findexe(p + _toolstr(ui, tool, "regappend")) |
|
34 | p = util.findexe(p + _toolstr(ui, tool, "regappend")) | |
35 | if p: |
|
35 | if p: | |
36 | return p |
|
36 | return p | |
37 |
|
|
37 | exe = _toolstr(ui, tool, "executable", tool) | |
|
38 | return util.findexe(util.expandpath(exe)) | |||
38 |
|
39 | |||
39 | def _picktool(repo, ui, path, binary, symlink): |
|
40 | def _picktool(repo, ui, path, binary, symlink): | |
40 | def check(tool, pat, symlink, binary): |
|
41 | def check(tool, pat, symlink, binary): |
@@ -244,6 +244,30 b' and true.executable set to cat with path' | |||||
244 | # hg stat |
|
244 | # hg stat | |
245 | M f |
|
245 | M f | |
246 |
|
246 | |||
|
247 | environment variables in true.executable are handled: | |||
|
248 | ||||
|
249 | $ cat > $HGTMP/merge.sh <<EOF | |||
|
250 | > #!/bin/sh | |||
|
251 | > echo 'custom merge tool' | |||
|
252 | > EOF | |||
|
253 | $ chmod +x $HGTMP/merge.sh | |||
|
254 | $ domerge -r 2 --config merge-tools.true.executable='$HGTMP/merge.sh' | |||
|
255 | [merge-tools] | |||
|
256 | false.whatever= | |||
|
257 | true.priority=1 | |||
|
258 | true.executable=cat | |||
|
259 | # hg update -C 1 | |||
|
260 | # hg merge -r 2 --config merge-tools.true.executable=$HGTMP/merge.sh | |||
|
261 | merging f | |||
|
262 | custom merge tool | |||
|
263 | 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
264 | (branch merge, don't forget to commit) | |||
|
265 | # cat f | |||
|
266 | revision 1 | |||
|
267 | space | |||
|
268 | # hg stat | |||
|
269 | M f | |||
|
270 | ||||
247 | Tool selection and merge-patterns |
|
271 | Tool selection and merge-patterns | |
248 |
|
272 | |||
249 | merge-patterns specifies new tool false: |
|
273 | merge-patterns specifies new tool false: |
General Comments 0
You need to be logged in to leave comments.
Login now