473 return node, p1, p2, deltabase, cs, flags |
473 return node, p1, p2, deltabase, cs, flags |
474 |
474 |
475 def _unpackmanifests(self, repo, revmap, trp, prog, numchanges): |
475 def _unpackmanifests(self, repo, revmap, trp, prog, numchanges): |
476 super(cg3unpacker, self)._unpackmanifests(repo, revmap, trp, prog, |
476 super(cg3unpacker, self)._unpackmanifests(repo, revmap, trp, prog, |
477 numchanges) |
477 numchanges) |
478 while True: |
478 for chunkdata in iter(self.filelogheader, {}): |
479 chunkdata = self.filelogheader() |
|
480 if not chunkdata: |
|
481 break |
|
482 # If we get here, there are directory manifests in the changegroup |
479 # If we get here, there are directory manifests in the changegroup |
483 d = chunkdata["filename"] |
480 d = chunkdata["filename"] |
484 repo.ui.debug("adding %s revisions\n" % d) |
481 repo.ui.debug("adding %s revisions\n" % d) |
485 dirlog = repo.manifest.dirlog(d) |
482 dirlog = repo.manifest.dirlog(d) |
486 if not dirlog.addgroup(self, revmap, trp): |
483 if not dirlog.addgroup(self, revmap, trp): |
1010 return changegroupsubset(repo, basenodes, repo.heads(), source) |
1007 return changegroupsubset(repo, basenodes, repo.heads(), source) |
1011 |
1008 |
1012 def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): |
1009 def _addchangegroupfiles(repo, source, revmap, trp, expectedfiles, needfiles): |
1013 revisions = 0 |
1010 revisions = 0 |
1014 files = 0 |
1011 files = 0 |
1015 while True: |
1012 for chunkdata in iter(source.filelogheader, {}): |
1016 chunkdata = source.filelogheader() |
|
1017 if not chunkdata: |
|
1018 break |
|
1019 files += 1 |
1013 files += 1 |
1020 f = chunkdata["filename"] |
1014 f = chunkdata["filename"] |
1021 repo.ui.debug("adding %s revisions\n" % f) |
1015 repo.ui.debug("adding %s revisions\n" % f) |
1022 repo.ui.progress(_('files'), files, unit=_('files'), |
1016 repo.ui.progress(_('files'), files, unit=_('files'), |
1023 total=expectedfiles) |
1017 total=expectedfiles) |