Skip to content
Snippets Groups Projects
Commit cf1e15f91c90 authored by Matthieu Laneuville's avatar Matthieu Laneuville
Browse files

templatekw: force noprefix=False to insure diffstat consistency (issue4755)

The result of diffstatdata should not depend on having noprefix set or not, as
was reported in issue 4755. Forcing noprefix to false on call makes sure the
parser receives the diff in the correct format and returns the proper result.

Another way to fix this would have been to change the regular expressions in
path.diffstatdata(), but that would have introduced many unecessary special
cases.
parent df5d3734b3df
No related branches found
No related tags found
No related merge requests found
......@@ -299,7 +299,7 @@
"""String. Statistics of changes with the following format:
"modified files: +added/-removed lines"
"""
stats = patch.diffstatdata(util.iterlines(ctx.diff()))
stats = patch.diffstatdata(util.iterlines(ctx.diff(noprefix=False)))
maxname, maxtotal, adds, removes, binary = patch.diffstatsum(stats)
return '%s: +%s/-%s' % (len(stats), adds, removes)
......
......@@ -1517,6 +1517,13 @@
|
o initial [Babar] 2: +8/-0
Adding those config options should not change the output of diffstat. Bugfix #4755.
$ hg log -r . --template '{diffstat}\n'
1: +1/-0
$ hg log -r . --template '{diffstat}\n' --config diff.git=1 \
> --config diff.noprefix=1
1: +1/-0
Importing with some success and some errors:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment