--- a/mercurial/bundlerepo.py Fri Aug 05 11:19:22 2016 -0400
+++ b/mercurial/bundlerepo.py Fri Aug 05 13:08:11 2016 -0400
@@ -188,10 +188,16 @@
self.filteredrevs = oldfilter
class bundlemanifest(bundlerevlog, manifest.manifest):
- def __init__(self, opener, bundle, linkmapper):
- manifest.manifest.__init__(self, opener)
+ def __init__(self, opener, bundle, linkmapper, dirlogstarts=None, dir=''):
+ manifest.manifest.__init__(self, opener, dir=dir)
bundlerevlog.__init__(self, opener, self.indexfile, bundle,
linkmapper)
+ if dirlogstarts is None:
+ dirlogstarts = {}
+ if self.bundle.version == "03":
+ dirlogstarts = _getfilestarts(self.bundle)
+ self._dirlogstarts = dirlogstarts
+ self._linkmapper = linkmapper
def baserevision(self, nodeorrev):
node = nodeorrev
@@ -204,6 +210,14 @@
result = manifest.manifest.revision(self, nodeorrev)
return result
+ def dirlog(self, d):
+ if d in self._dirlogstarts:
+ self.bundle.seek(self._dirlogstarts[d])
+ return bundlemanifest(
+ self.opener, self.bundle, self._linkmapper,
+ self._dirlogstarts, dir=d)
+ return super(bundlemanifest, self).dirlog(d)
+
class bundlefilelog(bundlerevlog, filelog.filelog):
def __init__(self, opener, path, bundle, linkmapper):
filelog.filelog.__init__(self, opener, path)
@@ -336,10 +350,6 @@
self.bundle.manifestheader()
linkmapper = self.unfiltered().changelog.rev
m = bundlemanifest(self.svfs, self.bundle, linkmapper)
- # XXX: hack to work with changegroup3, but we still don't handle
- # tree manifests correctly
- if self.bundle.version == "03":
- self.bundle.filelogheader()
self.filestart = self.bundle.tell()
return m