304 # no new manifest will be created and the manifest group will |
304 # no new manifest will be created and the manifest group will |
305 # be empty during the pull |
305 # be empty during the pull |
306 self.manifestheader() |
306 self.manifestheader() |
307 repo.manifest.addgroup(self, revmap, trp) |
307 repo.manifest.addgroup(self, revmap, trp) |
308 repo.ui.progress(_('manifests'), None) |
308 repo.ui.progress(_('manifests'), None) |
|
309 self.callback = None |
309 |
310 |
310 def apply(self, repo, srctype, url, emptyok=False, |
311 def apply(self, repo, srctype, url, emptyok=False, |
311 targetphase=phases.draft, expectedtotal=None): |
312 targetphase=phases.draft, expectedtotal=None): |
312 """Add the changegroup returned by source.read() to this repo. |
313 """Add the changegroup returned by source.read() to this repo. |
313 srctype is a string like 'push', 'pull', or 'unbundle'. url is |
314 srctype is a string like 'push', 'pull', or 'unbundle'. url is |
391 for f, n in mfest.iteritems(): |
392 for f, n in mfest.iteritems(): |
392 needfiles.setdefault(f, set()).add(n) |
393 needfiles.setdefault(f, set()).add(n) |
393 |
394 |
394 # process the files |
395 # process the files |
395 repo.ui.status(_("adding file changes\n")) |
396 repo.ui.status(_("adding file changes\n")) |
396 self.callback = None |
|
397 pr = prog(_('files'), efiles) |
397 pr = prog(_('files'), efiles) |
398 newrevs, newfiles = _addchangegroupfiles( |
398 newrevs, newfiles = _addchangegroupfiles( |
399 repo, self, revmap, trp, pr, needfiles) |
399 repo, self, revmap, trp, pr, needfiles) |
400 revisions += newrevs |
400 revisions += newrevs |
401 files += newfiles |
401 files += newfiles |