This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6007

diff: make sure we output stat info even when --git is not passed (issue4037)
ClosedPublic

Authored by pulkit on Feb 22 2019, 6:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG251332dbf33d: diff: make sure we output stat even when --git is not passed (issue4037) (BC)
Summary

Before this patch, hg diff --stat will give an empty output. It will not show
the stat information. I debugged and found that the underlying code does not
return the diff header and due to that, other code paths fails to parse that as
a diff.

I looked into why we don't return diff headers in quiet mode and found the
behavior is from 8f8bb77d560e70bcc95577e4dfa877df18d876ab which does not have
any mention about why it is done. We also show the diff headers in git, so I
think it's fine showing diff header in normal diff in quiet mode.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 22 2019, 6:29 PM
yuja added a subscriber: yuja.Feb 24 2019, 8:36 PM
I looked into why we don't return diff headers in quiet mode and found the
behavior is from https://phab.mercurial-scm.org/rHG8f8bb77d560e70bcc95577e4dfa877df18d876ab which does not have
any mention about why it is done. We also show the diff headers in git, so I
think it's fine showing diff header in normal diff in quiet mode.

Agreed. Flagged as BC and queued, thanks.

Closed by commit rHG251332dbf33d: diff: make sure we output stat even when --git is not passed (issue4037) (BC) (authored by pulkit). · Explain WhyFeb 24 2019, 8:37 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14227

mercurial/patch.py

header.append('old mode %s' % mode1) header.append('old mode %s' % mode1)
header.append('new mode %s' % mode2) header.append('new mode %s' % mode2)
if copyop is not None: if copyop is not None:
if opts.showsimilarity: if opts.showsimilarity:
sim = similar.score(ctx1[path1], ctx2[path2]) * 100 sim = similar.score(ctx1[path1], ctx2[path2]) * 100
header.append('similarity index %d%%' % sim) header.append('similarity index %d%%' % sim)
header.append('%s from %s' % (copyop, path1)) header.append('%s from %s' % (copyop, path1))
header.append('%s to %s' % (copyop, path2)) header.append('%s to %s' % (copyop, path2))
elif revs and not repo.ui.quiet: elif revs:
header.append(diffline(path1, revs)) header.append(diffline(path1, revs))
# fctx.is | diffopts | what to | is fctx.data() # fctx.is | diffopts | what to | is fctx.data()
# binary() | text nobinary git index | output? | outputted? # binary() | text nobinary git index | output? | outputted?
# ------------------------------------|---------------------------- # ------------------------------------|----------------------------
# yes | no no no * | summary | no # yes | no no no * | summary | no
# yes | no no yes * | base85 | yes # yes | no no yes * | base85 | yes
# yes | no yes no * | summary | no # yes | no yes no * | summary | no

tests/test-commit.t

R removed R removed
$ HGEDITOR=cat hg commit -q -e -m "foo bar" changed $ HGEDITOR=cat hg commit -q -e -m "foo bar" changed
foo bar foo bar
HG: mods=changed HG: mods=changed
HG: adds= HG: adds=
HG: dels= HG: dels=
HG: files=changed HG: files=changed
HG: HG:
HG: diff -r d2313f97106f changed
HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000 HG: --- a/changed Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/changed Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,1 +1,2 @@ HG: @@ -1,1 +1,2 @@
HG: changed HG: changed
HG: +changed HG: +changed
HG: HG:
HG: mods=changed HG: mods=changed
HG: adds= HG: adds=
HG: files=added removed HG: files=added removed
HG: HG:
HG: HG:
HG: mods= HG: mods=
HG: adds=added HG: adds=added
HG: dels=removed HG: dels=removed
HG: files=added removed HG: files=added removed
HG: HG:
HG: diff -r d2313f97106f added
HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: --- /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000 HG: +++ b/added Thu Jan 01 00:00:00 1970 +0000
HG: @@ -0,0 +1,1 @@ HG: @@ -0,0 +1,1 @@
HG: +added HG: +added
HG: HG:
HG: mods= HG: mods=
HG: adds=added HG: adds=added
HG: dels=removed HG: dels=removed
HG: files=added removed HG: files=added removed
HG: HG:
HG: diff -r d2313f97106f removed
HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000 HG: --- a/removed Thu Jan 01 00:00:00 1970 +0000
HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 HG: +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
HG: @@ -1,1 +0,0 @@ HG: @@ -1,1 +0,0 @@
HG: -removed HG: -removed
HG: HG:
HG: mods= HG: mods=
HG: adds=added HG: adds=added
HG: dels=removed HG: dels=removed

tests/test-diff-hashes.t

$ hg init a $ hg init a
$ cd a $ cd a
$ hg diff inexistent1 inexistent2 $ hg diff inexistent1 inexistent2
inexistent1: * (glob) inexistent1: * (glob)
inexistent2: * (glob) inexistent2: * (glob)
$ echo bar > foo $ echo bar > foo
$ hg add foo $ hg add foo
$ hg ci -m 'add foo' $ hg ci -m 'add foo'
$ echo foobar > foo $ echo foobar > foo
$ hg ci -m 'change foo' $ hg ci -m 'change foo'
$ hg --quiet diff -r 0 -r 1 $ hg --quiet diff -r 0 -r 1
diff -r a99fb63adac3 -r 9b8568d3af2f foo
--- a/foo Thu Jan 01 00:00:00 1970 +0000 --- a/foo Thu Jan 01 00:00:00 1970 +0000
+++ b/foo Thu Jan 01 00:00:00 1970 +0000 +++ b/foo Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +1,1 @@ @@ -1,1 +1,1 @@
-bar -bar
+foobar +foobar
$ hg diff -r 0 -r 1 $ hg diff -r 0 -r 1
diff -r a99fb63adac3 -r 9b8568d3af2f foo diff -r a99fb63adac3 -r 9b8568d3af2f foo

tests/test-diffstat.t

1 files changed, 0 insertions(+), 0 deletions(-) 1 files changed, 0 insertions(+), 0 deletions(-)
Make sure `diff --stat -q --config diff.git-0` shows stat (issue4037) Make sure `diff --stat -q --config diff.git-0` shows stat (issue4037)
$ hg status $ hg status
A new c A new c
R c R c
$ hg diff --stat -q $ hg diff --stat -q
c | 1 -
new c | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)

tests/test-mq.t

$ cat .hg/patches/test.patch $ cat .hg/patches/test.patch
foo bar foo bar
working dir diff: working dir diff:
$ hg diff --nodates -q $ hg diff --nodates -q
diff -r dde259bd5934 a
--- a/a --- a/a
+++ b/a +++ b/a
@@ -1,1 +1,2 @@ @@ -1,1 +1,2 @@
a a
+a +a
restore things restore things

tests/test-transplant.t

> y > y
> n > n
> n > n
> m > m
> c > c
> EOF > EOF
0:17ab29e464c6 0:17ab29e464c6
apply changeset? [ynmpcq?]: p apply changeset? [ynmpcq?]: p
diff -r 000000000000 -r 17ab29e464c6 r1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/r1 Thu Jan 01 00:00:00 1970 +0000 +++ b/r1 Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,1 @@ @@ -0,0 +1,1 @@
+r1 +r1
apply changeset? [ynmpcq?]: y apply changeset? [ynmpcq?]: y
1:d11e3596cc1a 1:d11e3596cc1a
apply changeset? [ynmpcq?]: n apply changeset? [ynmpcq?]: n
2:37a1297eb21b 2:37a1297eb21b