--- a/mercurial/localrepo.py Sat Apr 30 11:03:28 2011 +0200
+++ b/mercurial/localrepo.py Sat Apr 30 19:01:24 2011 +0200
@@ -1712,6 +1712,7 @@
pr = prog()
source.callback = pr
+ source.changelogheader()
if (cl.addgroup(source, csmap, trp) is None
and not emptyok):
raise util.Abort(_("received changelog group is empty"))
@@ -1731,6 +1732,7 @@
# if the result of the merge of 1 and 2 is the same in 3 and 4,
# no new manifest will be created and the manifest group will
# be empty during the pull
+ source.manifestheader()
self.manifest.addgroup(source, revmap, trp)
self.ui.progress(_('manifests'), None)
@@ -1752,9 +1754,10 @@
source.callback = None
while 1:
- f = source.chunk()
- if not f:
+ chunkdata = source.filelogheader()
+ if not chunkdata:
break
+ f = chunkdata["filename"]
self.ui.debug("adding %s revisions\n" % f)
pr()
fl = self.file(f)