| dlax | |
| durin42 |
| hg-reviewers |
To reflect what they actually are.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| for chunkdata in iter(bundle.filelogheader, {}): | for chunkdata in iter(bundle.filelogheader, {}): | ||||
| fname = chunkdata['filename'] | fname = chunkdata['filename'] | ||||
| bundlefilespos[fname] = bundle.tell() | bundlefilespos[fname] = bundle.tell() | ||||
| for chunk in iter(lambda: bundle.deltachunk(None), {}): | for chunk in iter(lambda: bundle.deltachunk(None), {}): | ||||
| pass | pass | ||||
| return bundlefilespos | return bundlefilespos | ||||
| class bundlerepository(localrepo.localrepository): | class bundlerepository(localrepo.localrepository): | ||||
| def __init__(self, ui, path, bundlename): | def __init__(self, ui, repopath, bundlepath): | ||||
| self._tempparent = None | self._tempparent = None | ||||
| try: | try: | ||||
| localrepo.localrepository.__init__(self, ui, path) | localrepo.localrepository.__init__(self, ui, repopath) | ||||
| except error.RepoError: | except error.RepoError: | ||||
| self._tempparent = tempfile.mkdtemp() | self._tempparent = tempfile.mkdtemp() | ||||
| localrepo.instance(ui, self._tempparent, 1) | localrepo.instance(ui, self._tempparent, 1) | ||||
| localrepo.localrepository.__init__(self, ui, self._tempparent) | localrepo.localrepository.__init__(self, ui, self._tempparent) | ||||
| self.ui.setconfig('phases', 'publish', False, 'bundlerepo') | self.ui.setconfig('phases', 'publish', False, 'bundlerepo') | ||||
| if path: | if repopath: | ||||
| self._url = 'bundle:' + util.expandpath(path) + '+' + bundlename | self._url = 'bundle:' + util.expandpath(repopath) + '+' + bundlepath | ||||
| else: | else: | ||||
| self._url = 'bundle:' + bundlename | self._url = 'bundle:' + bundlepath | ||||
| self.tempfile = None | self.tempfile = None | ||||
| f = util.posixfile(bundlename, "rb") | f = util.posixfile(bundlepath, "rb") | ||||
| self.bundlefile = self.bundle = exchange.readbundle(ui, f, bundlename) | self.bundlefile = self.bundle = exchange.readbundle(ui, f, bundlepath) | ||||
| if isinstance(self.bundle, bundle2.unbundle20): | if isinstance(self.bundle, bundle2.unbundle20): | ||||
| hadchangegroup = False | hadchangegroup = False | ||||
| for part in self.bundle.iterparts(): | for part in self.bundle.iterparts(): | ||||
| if part.type == 'changegroup': | if part.type == 'changegroup': | ||||
| if hadchangegroup: | if hadchangegroup: | ||||
| raise NotImplementedError("can't process " | raise NotImplementedError("can't process " | ||||
| "multiple changegroups") | "multiple changegroups") | ||||
| hadchangegroup = True | hadchangegroup = True | ||||
| self._handlebundle2part(part) | self._handlebundle2part(part) | ||||
| if not hadchangegroup: | if not hadchangegroup: | ||||
| raise error.Abort(_("No changegroups found")) | raise error.Abort(_("No changegroups found")) | ||||
| elif self.bundle.compressed(): | elif self.bundle.compressed(): | ||||
| f = self._writetempbundle(self.bundle.read, '.hg10un', | f = self._writetempbundle(self.bundle.read, '.hg10un', | ||||
| header='HG10UN') | header='HG10UN') | ||||
| self.bundlefile = self.bundle = exchange.readbundle(ui, f, | self.bundlefile = self.bundle = exchange.readbundle(ui, f, | ||||
| bundlename, | bundlepath, | ||||
| self.vfs) | self.vfs) | ||||
| # dict with the mapping 'filename' -> position in the bundle | # dict with the mapping 'filename' -> position in the bundle | ||||
| self.bundlefilespos = {} | self.bundlefilespos = {} | ||||
| self.firstnewrev = self.changelog.repotiprev + 1 | self.firstnewrev = self.changelog.repotiprev + 1 | ||||
| phases.retractboundary(self, None, phases.draft, | phases.retractboundary(self, None, phases.draft, | ||||
| [ctx.node() for ctx in self[self.firstnewrev:]]) | [ctx.node() for ctx in self[self.firstnewrev:]]) | ||||