diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -115,7 +115,8 @@ class bundlerevlog(revlog.revlog): elif rev1 <= self.repotiprev and rev2 <= self.repotiprev: return revlog.revlog.revdiff(self, rev1, rev2) - return mdiff.textdiff(self.revision(rev1), self.revision(rev2)) + return mdiff.textdiff(self.revision(rev1, raw=True), + self.revision(rev2, raw=True)) def revision(self, nodeorrev, raw=False): """return an uncompressed revision of a given node or revision diff --git a/tests/test-flagprocessor.t b/tests/test-flagprocessor.t --- a/tests/test-flagprocessor.t +++ b/tests/test-flagprocessor.t @@ -216,5 +216,27 @@ $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )' [1] $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' - Traceback (most recent call last): - TypeError: Incorrect padding + 5 branching + base64 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + 4 base64-4 + base64 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + 3 base64-three + base64 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + 2 base64-two + base64 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + 1 base64-single + base64 | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + + 0 base64-0 + base64 | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +