Show More
@@ -433,7 +433,7 b' def diffrevs(' | |||||
433 | # ctx1a) |
|
433 | # ctx1a) | |
434 | dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a) |
|
434 | dir1a_files = mod_a | rem_a | ((mod_b | add_b) - add_a) | |
435 | dir1a = snapshot(ui, repo, dir1a_files, ctx1a.node(), tmproot, subrepos)[0] |
|
435 | dir1a = snapshot(ui, repo, dir1a_files, ctx1a.node(), tmproot, subrepos)[0] | |
436 | rev1a = b'@%d' % ctx1a.rev() |
|
436 | rev1a = b'' if ctx1a.rev() is None else b'@%d' % ctx1a.rev() | |
437 | if do3way: |
|
437 | if do3way: | |
438 | # file calculation criteria same as dir1a |
|
438 | # file calculation criteria same as dir1a | |
439 | dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b) |
|
439 | dir1b_files = mod_b | rem_b | ((mod_a | add_a) - add_b) |
@@ -73,6 +73,15 b' Should diff cloned files directly:' | |||||
73 | diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !) |
|
73 | diffing */extdiff.*/a.8a5febb7f867/a a.34eed99112ab/a (glob) (no-windows !) | |
74 | [1] |
|
74 | [1] | |
75 |
|
75 | |||
|
76 | Can show diff from working copy: | |||
|
77 | $ echo c >> a | |||
|
78 | $ hg falabala -r 'wdir()' -r 1 | |||
|
79 | diffing "*\\extdiff.*\\a" "a.34eed99112ab\\a" (glob) (windows !) | |||
|
80 | diffing */extdiff.*/a a.34eed99112ab/a (glob) (no-windows !) | |||
|
81 | [1] | |||
|
82 | $ hg revert a | |||
|
83 | $ rm a.orig | |||
|
84 | ||||
76 | Specifying an empty revision should abort. |
|
85 | Specifying an empty revision should abort. | |
77 |
|
86 | |||
78 | $ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1 |
|
87 | $ hg extdiff -p diff --patch --rev 'ancestor()' --rev 1 |
General Comments 0
You need to be logged in to leave comments.
Login now