[PATCH] diff.noprefix no longer breaks {diffstat} (issue4755)

Augie Fackler raf at durin42.com
Sat Jan 14 01:33:09 EST 2017


> On Jan 14, 2017, at 1:28 AM, Yuya Nishihara <yuya at tcha.org> wrote:
> 
>>> diff -r 493935e0327a -r c0030823eee2 mercurial/templatekw.py
>>> --- a/mercurial/templatekw.py Tue Jan 10 06:59:31 2017 +0800
>>> +++ b/mercurial/templatekw.py Thu Jan 12 21:06:55 2017 +0900
>>> @@ -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)
> 
> Matthieu, the patch content appears to be totally corrupted because of your
> mailer. Can you resend it by using patchbomb or pushgate?

I managed to get it to apply with only minor surgery. No resend required.


More information about the Mercurial-devel mailing list