This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5709

diffstat: support filenames with whitespaces on renames
ClosedPublic

Authored by navaneeth.suresh on Jan 26 2019, 3:26 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4a33a6bf2b52: diffstat: support filenames with whitespaces on renames
Summary

This is a follow-up patch to D5628. line.split() cannot get filenames with
whitespaces as mentioned by @yuja. This patch replaces split() method with
slice. Corresponding tests were also added.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

Closed by commit rHG4a33a6bf2b52: diffstat: support filenames with whitespaces on renames (authored by navaneeth.suresh). · Explain WhyJan 26 2019, 4:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 13494

mercurial/patch.py

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'): elif line.startswith('rename from'):
filename = line.split()[-1] filename = line[12:]
elif line.startswith('rename to'): elif line.startswith('rename to'):
filename += ' => %s' % line.split()[-1] filename += ' => %s' % line[10:]
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

rename to b rename to b
$ hg diff --stat $ hg diff --stat
a | 1 - a | 1 -
b | 1 + b | 1 +
2 files changed, 1 insertions(+), 1 deletions(-) 2 files changed, 1 insertions(+), 1 deletions(-)
$ hg diff --stat --git $ hg diff --stat --git
a => b | 0 a => b | 0
1 files changed, 0 insertions(+), 0 deletions(-) 1 files changed, 0 insertions(+), 0 deletions(-)
-- filename may contain whitespaces
$ echo > c
$ hg ci -Am 'add c'
adding c
$ hg mv c 'new c'
$ hg diff --git
diff --git a/c b/new c
rename from c
rename to new c
$ hg diff --stat
c | 1 -
new c | 1 +
2 files changed, 1 insertions(+), 1 deletions(-)
$ hg diff --stat --git
c => new c | 0
1 files changed, 0 insertions(+), 0 deletions(-)