diff --git a/mercurial/hgweb/webutil.py b/mercurial/hgweb/webutil.py --- a/mercurial/hgweb/webutil.py +++ b/mercurial/hgweb/webutil.py @@ -545,7 +545,8 @@ def compare(tmpl, context, leftlines, ri def diffstatgen(ctx, basectx): '''Generator function that provides the diffstat data.''' - stats = patch.diffstatdata(util.iterlines(ctx.diff(basectx))) + stats = patch.diffstatdata( + util.iterlines(ctx.diff(basectx, noprefix=False))) maxname, maxtotal, addtotal, removetotal, binary = patch.diffstatsum(stats) while True: yield stats, maxname, maxtotal, addtotal, removetotal, binary diff --git a/tests/test-hgweb-diffs.t b/tests/test-hgweb-diffs.t --- a/tests/test-hgweb-diffs.t +++ b/tests/test-hgweb-diffs.t @@ -306,6 +306,23 @@ diff removed file +set up hgweb with git diffs + noprefix + + $ killdaemons.py + $ hg serve --config 'diff.git=1' --config 'diff.noprefix=1' -p $HGPORT -d \ + > --pid-file=hg.pid -A access.log -E errors.log + $ cat hg.pid >> $DAEMON_PIDS + +patch header and diffstat + + $ get-with-headers.py localhost:$HGPORT 'rev/0' \ + > | egrep 'files changed|---|\+\+\+' + 2 files changed, 2 insertions(+), 0 deletions(-) + --- /dev/null + +++ a + --- /dev/null + +++ b + set up hgweb with git diffs $ killdaemons.py