Show More
@@ -2682,7 +2682,7 b' def trydiff(repo, revs, ctx1, ctx2, modi' | |||
|
2682 | 2682 | header.append('similarity index %d%%' % sim) |
|
2683 | 2683 | header.append('%s from %s' % (copyop, path1)) |
|
2684 | 2684 | header.append('%s to %s' % (copyop, path2)) |
|
2685 |
elif revs |
|
|
2685 | elif revs: | |
|
2686 | 2686 | header.append(diffline(path1, revs)) |
|
2687 | 2687 | |
|
2688 | 2688 | # fctx.is | diffopts | what to | is fctx.data() |
@@ -512,6 +512,7 b' specific template keywords work well' | |||
|
512 | 512 | HG: dels= |
|
513 | 513 | HG: files=changed |
|
514 | 514 | HG: |
|
515 | HG: diff -r d2313f97106f changed | |
|
515 | 516 | HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000 |
|
516 | 517 | HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000 |
|
517 | 518 | HG: @@ -1,1 +1,2 @@ |
@@ -573,6 +574,7 b' specific template keywords work well' | |||
|
573 | 574 | HG: dels=removed |
|
574 | 575 | HG: files=added removed |
|
575 | 576 | HG: |
|
577 | HG: diff -r d2313f97106f added | |
|
576 | 578 | HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
577 | 579 | HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000 |
|
578 | 580 | HG: @@ -0,0 +1,1 @@ |
@@ -583,6 +585,7 b' specific template keywords work well' | |||
|
583 | 585 | HG: dels=removed |
|
584 | 586 | HG: files=added removed |
|
585 | 587 | HG: |
|
588 | HG: diff -r d2313f97106f removed | |
|
586 | 589 | HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000 |
|
587 | 590 | HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
588 | 591 | HG: @@ -1,1 +0,0 @@ |
@@ -13,6 +13,7 b'' | |||
|
13 | 13 | $ hg ci -m 'change foo' |
|
14 | 14 | |
|
15 | 15 | $ hg --quiet diff -r 0 -r 1 |
|
16 | diff -r a99fb63adac3 -r 9b8568d3af2f foo | |
|
16 | 17 | --- a/foo Thu Jan 01 00:00:00 1970 +0000 |
|
17 | 18 | +++ b/foo Thu Jan 01 00:00:00 1970 +0000 |
|
18 | 19 | @@ -1,1 +1,1 @@ |
@@ -289,3 +289,6 b' Make sure `diff --stat -q --config diff.' | |||
|
289 | 289 | A new c |
|
290 | 290 | R c |
|
291 | 291 | $ hg diff --stat -q |
|
292 | c | 1 - | |
|
293 | new c | 1 + | |
|
294 | 2 files changed, 1 insertions(+), 1 deletions(-) |
General Comments 0
You need to be logged in to leave comments.
Login now