This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5628

diffstat: make --git work properly on renames (issue6025)
ClosedPublic

Authored by navaneeth.suresh on Jan 17 2019, 7:46 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf1b0d9988825: diffstat: make --git work properly on renames (issue6025)
rHGffdac0067a14: diffstat: make --git work properly on renames (issue6025)
Summary

$ hg diff --stat --git shows only the new filename on renames.
I added the old filename also to the output to make it identical
with the output of $ git diff --stat.

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

Closed by commit rHGffdac0067a14: diffstat: make --git work properly on renames (issue6025) (authored by navaneeth.suresh). · Explain WhyJan 25 2019, 3:11 PM
This revision was automatically updated to reflect the committed changes.
navaneeth.suresh added a comment.Jan 25 2019, 9:53 PM

Thanks for queuing this!

yuja added a subscriber: yuja.Jan 26 2019, 12:18 AM

@@ -2808,6 +2808,10 @@

elif (line.startswith('GIT binary patch') or
      line.startswith('Binary file')):
    isbinary = True

+ elif line.startswith('rename from'):
+ filename = line.split()[-1]
+ elif line.startswith('rename to'):
+ filename += ' => %s' % line.split()[-1]

Nice.

One nit: better to not use .split() since a filename may include whitespace.

navaneeth.suresh added a comment.Jan 26 2019, 1:50 AM

One nit: better to not use .split() since a filename may include whitespace.

Nice catch! I will send a follow-up on this.

pulkit added a subscriber: pulkit.Apr 5 2019, 4:47 PM
pulkit added inline comments.
mercurial/patch.py
2811

This is unfortunately not working with hglib. hglib seems to be splitting data on '>' or only reading data after that.

@yuja do you have any idea what can cause that?

navaneeth.suresh added inline comments.Apr 9 2019, 11:55 AM
mercurial/patch.py
2811

@pulkit Can you add a possible test case? I would like to work on this.

By the way, Yuya has replied to this over mail and changes didn't get reflected in phab. Yuya says:

Which hglib function?

I never thought hglib would parse diffstat output. I don't think it's parsable
(i.e. BC-guaranteed) format.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (4 lines)
Mtests/test-diffstat.t (19 lines)

Diff 13463

mercurial/patch.py

inheader = False inheader = False
elif line.startswith('+') and not inheader: elif line.startswith('+') and not inheader:
adds += 1 adds += 1
elif line.startswith('-') and not inheader: elif line.startswith('-') and not inheader:
removes += 1 removes += 1
elif (line.startswith('GIT binary patch') or elif (line.startswith('GIT binary patch') or
line.startswith('Binary file')): line.startswith('Binary file')):
isbinary = True isbinary = True
elif line.startswith('rename from'):
filename = line.split()[-1]
elif line.startswith('rename to'):
filename += ' => %s' % line.split()[-1]
pulkitUnsubmitted
Not Done

This is unfortunately not working with hglib. hglib seems to be splitting data on '>' or only reading data after that.

@yuja do you have any idea what can cause that?

pulkit: This is unfortunately not working with hglib. hglib seems to be splitting data on '>' or only…
navaneeth.sureshAuthorUnsubmitted
Not Done

@pulkit Can you add a possible test case? I would like to work on this.

By the way, Yuya has replied to this over mail and changes didn't get reflected in phab. Yuya says:

Which hglib function?

I never thought hglib would parse diffstat output. I don't think it's parsable
(i.e. BC-guaranteed) format.
navaneeth.suresh: @pulkit Can you add a possible test case? I would like to work on this. By the way, Yuya has…
addresult() addresult()
return results return results
def diffstat(lines, width=80): def diffstat(lines, width=80):
output = [] output = []
stats = diffstatdata(lines) stats = diffstatdata(lines)
maxname, maxtotal, totaladds, totalremoves, hasbinary = diffstatsum(stats) maxname, maxtotal, totaladds, totalremoves, hasbinary = diffstatsum(stats)

tests/test-diffstat.t

line 1 line 1
--- line 2, with dashes --- line 2, with dashes
+++ line 2, switched dashes to plusses +++ line 2, switched dashes to plusses
line 3 line 3
$ hg diff --root . --stat $ hg diff --root . --stat
file | 2 +- file | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-) 1 files changed, 1 insertions(+), 1 deletions(-)
When a file is renamed, --git shouldn't loss the info about old file
$ hg init issue6025
$ cd issue6025
$ echo > a
$ hg ci -Am 'add a'
adding a
$ hg mv a b
$ hg diff --git
diff --git a/a b/b
rename from a
rename to b
$ hg diff --stat
a | 1 -
b | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)
$ hg diff --stat --git
a => b | 0
1 files changed, 0 insertions(+), 0 deletions(-)