Show More
@@ -250,7 +250,7 b' class cg1unpacker(object):' | |||||
250 | # no new manifest will be created and the manifest group will |
|
250 | # no new manifest will be created and the manifest group will | |
251 | # be empty during the pull |
|
251 | # be empty during the pull | |
252 | self.manifestheader() |
|
252 | self.manifestheader() | |
253 | repo.manifest.addgroup(self, revmap, trp) |
|
253 | repo.manifestlog._revlog.addgroup(self, revmap, trp) | |
254 | repo.ui.progress(_('manifests'), None) |
|
254 | repo.ui.progress(_('manifests'), None) | |
255 | self.callback = None |
|
255 | self.callback = None | |
256 |
|
256 | |||
@@ -480,7 +480,7 b' class cg3unpacker(cg2unpacker):' | |||||
480 | # If we get here, there are directory manifests in the changegroup |
|
480 | # If we get here, there are directory manifests in the changegroup | |
481 | d = chunkdata["filename"] |
|
481 | d = chunkdata["filename"] | |
482 | repo.ui.debug("adding %s revisions\n" % d) |
|
482 | repo.ui.debug("adding %s revisions\n" % d) | |
483 | dirlog = repo.manifest.dirlog(d) |
|
483 | dirlog = repo.manifestlog._revlog.dirlog(d) | |
484 | if not dirlog.addgroup(self, revmap, trp): |
|
484 | if not dirlog.addgroup(self, revmap, trp): | |
485 | raise error.Abort(_("received dir revlog group is empty")) |
|
485 | raise error.Abort(_("received dir revlog group is empty")) | |
486 |
|
486 | |||
@@ -588,7 +588,7 b' class cg1packer(object):' | |||||
588 | def _packmanifests(self, dir, mfnodes, lookuplinknode): |
|
588 | def _packmanifests(self, dir, mfnodes, lookuplinknode): | |
589 | """Pack flat manifests into a changegroup stream.""" |
|
589 | """Pack flat manifests into a changegroup stream.""" | |
590 | assert not dir |
|
590 | assert not dir | |
591 | for chunk in self.group(mfnodes, self._repo.manifest, |
|
591 | for chunk in self.group(mfnodes, self._repo.manifestlog._revlog, | |
592 | lookuplinknode, units=_('manifests')): |
|
592 | lookuplinknode, units=_('manifests')): | |
593 | yield chunk |
|
593 | yield chunk | |
594 |
|
594 | |||
@@ -852,8 +852,10 b' class cg3packer(cg2packer):' | |||||
852 | def _packmanifests(self, dir, mfnodes, lookuplinknode): |
|
852 | def _packmanifests(self, dir, mfnodes, lookuplinknode): | |
853 | if dir: |
|
853 | if dir: | |
854 | yield self.fileheader(dir) |
|
854 | yield self.fileheader(dir) | |
855 | for chunk in self.group(mfnodes, self._repo.manifest.dirlog(dir), |
|
855 | ||
856 | lookuplinknode, units=_('manifests')): |
|
856 | dirlog = self._repo.manifestlog._revlog.dirlog(dir) | |
|
857 | for chunk in self.group(mfnodes, dirlog, lookuplinknode, | |||
|
858 | units=_('manifests')): | |||
857 | yield chunk |
|
859 | yield chunk | |
858 |
|
860 | |||
859 | def _manifestsdone(self): |
|
861 | def _manifestsdone(self): |
General Comments 0
You need to be logged in to leave comments.
Login now