diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -158,7 +158,7 @@ class bundlerevlog(revlog.revlog): # Revlog subclasses may override 'revision' method to modify format of # content retrieved from revlog. To use bundlerevlog with such class one # needs to override 'baserevision' and make more specific call here. - return revlog.revlog.revision(self, nodeorrev) + return revlog.revlog.revision(self, nodeorrev, raw=True) def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): raise NotImplementedError @@ -186,7 +186,7 @@ class bundlechangelog(bundlerevlog, chan oldfilter = self.filteredrevs try: self.filteredrevs = () - return changelog.changelog.revision(self, nodeorrev) + return changelog.changelog.revision(self, nodeorrev, raw=True) finally: self.filteredrevs = oldfilter @@ -210,7 +210,7 @@ class bundlemanifest(bundlerevlog, manif if node in self.fulltextcache: result = '%s' % self.fulltextcache[node] else: - result = manifest.manifestrevlog.revision(self, nodeorrev) + result = manifest.manifestrevlog.revision(self, nodeorrev, raw=True) return result def dirlog(self, d): @@ -228,7 +228,7 @@ class bundlefilelog(bundlerevlog, filelo linkmapper) def baserevision(self, nodeorrev): - return filelog.filelog.revision(self, nodeorrev) + return filelog.filelog.revision(self, nodeorrev, raw=True) class bundlepeer(localrepo.localpeer): def canpush(self): diff --git a/tests/test-flagprocessor.t b/tests/test-flagprocessor.t --- a/tests/test-flagprocessor.t +++ b/tests/test-flagprocessor.t @@ -188,11 +188,10 @@ 4 changesets found $ hg --config extensions.strip= strip -r 2 --no-backup --force -q $ hg -R bundle.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' - Traceback (most recent call last): - mercurial.mpatch.mpatchError: invalid patch + abort: integrity check failed on data/base64.i:2! $ hg bundle -R bundle.hg --base 1 bundle-again.hg -q 2>&1 | egrep -v '^(\*\*| )' Traceback (most recent call last): - TypeError: Incorrect padding + mercurial.mpatch.mpatchError: invalid patch $ hg -R bundle-again.hg log --stat -T '{rev} {desc}\n' base64 2>&1 | egrep -v '^(\*\*| )' abort: repository bundle-again.hg not found!