##// END OF EJS Templates
diff: make sure we output stat even when --git is not passed (issue4037) (BC)...
Pulkit Goyal -
r41950:251332db default
parent child Browse files
Show More
@@ -2682,7 +2682,7 b' def trydiff(repo, revs, ctx1, ctx2, modi'
2682 header.append('similarity index %d%%' % sim)
2682 header.append('similarity index %d%%' % sim)
2683 header.append('%s from %s' % (copyop, path1))
2683 header.append('%s from %s' % (copyop, path1))
2684 header.append('%s to %s' % (copyop, path2))
2684 header.append('%s to %s' % (copyop, path2))
2685 elif revs and not repo.ui.quiet:
2685 elif revs:
2686 header.append(diffline(path1, revs))
2686 header.append(diffline(path1, revs))
2687
2687
2688 # fctx.is | diffopts | what to | is fctx.data()
2688 # fctx.is | diffopts | what to | is fctx.data()
@@ -512,6 +512,7 b' specific template keywords work well'
512 HG: dels=
512 HG: dels=
513 HG: files=changed
513 HG: files=changed
514 HG:
514 HG:
515 HG: diff -r d2313f97106f changed
515 HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000
516 HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000
516 HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000
517 HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000
517 HG: @@ -1,1 +1,2 @@
518 HG: @@ -1,1 +1,2 @@
@@ -573,6 +574,7 b' specific template keywords work well'
573 HG: dels=removed
574 HG: dels=removed
574 HG: files=added removed
575 HG: files=added removed
575 HG:
576 HG:
577 HG: diff -r d2313f97106f added
576 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
578 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
577 HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000
579 HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000
578 HG: @@ -0,0 +1,1 @@
580 HG: @@ -0,0 +1,1 @@
@@ -583,6 +585,7 b' specific template keywords work well'
583 HG: dels=removed
585 HG: dels=removed
584 HG: files=added removed
586 HG: files=added removed
585 HG:
587 HG:
588 HG: diff -r d2313f97106f removed
586 HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000
589 HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000
587 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
590 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
588 HG: @@ -1,1 +0,0 @@
591 HG: @@ -1,1 +0,0 @@
@@ -13,6 +13,7 b''
13 $ hg ci -m 'change foo'
13 $ hg ci -m 'change foo'
14
14
15 $ hg --quiet diff -r 0 -r 1
15 $ hg --quiet diff -r 0 -r 1
16 diff -r a99fb63adac3 -r 9b8568d3af2f foo
16 --- a/foo Thu Jan 01 00:00:00 1970 +0000
17 --- a/foo Thu Jan 01 00:00:00 1970 +0000
17 +++ b/foo Thu Jan 01 00:00:00 1970 +0000
18 +++ b/foo Thu Jan 01 00:00:00 1970 +0000
18 @@ -1,1 +1,1 @@
19 @@ -1,1 +1,1 @@
@@ -289,3 +289,6 b' Make sure `diff --stat -q --config diff.'
289 A new c
289 A new c
290 R c
290 R c
291 $ hg diff --stat -q
291 $ hg diff --stat -q
292 c | 1 -
293 new c | 1 +
294 2 files changed, 1 insertions(+), 1 deletions(-)
@@ -305,6 +305,7 b' patch:'
305 working dir diff:
305 working dir diff:
306
306
307 $ hg diff --nodates -q
307 $ hg diff --nodates -q
308 diff -r dde259bd5934 a
308 --- a/a
309 --- a/a
309 +++ b/a
310 +++ b/a
310 @@ -1,1 +1,2 @@
311 @@ -1,1 +1,2 @@
@@ -599,6 +599,7 b' test interactive transplant'
599 > EOF
599 > EOF
600 0:17ab29e464c6
600 0:17ab29e464c6
601 apply changeset? [ynmpcq?]: p
601 apply changeset? [ynmpcq?]: p
602 diff -r 000000000000 -r 17ab29e464c6 r1
602 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
603 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
603 +++ b/r1 Thu Jan 01 00:00:00 1970 +0000
604 +++ b/r1 Thu Jan 01 00:00:00 1970 +0000
604 @@ -0,0 +1,1 @@
605 @@ -0,0 +1,1 @@
General Comments 0
You need to be logged in to leave comments. Login now