diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py index 3eeb0a3eeaedc7d65501a3253e82ee134f40b8f0_bWVyY3VyaWFsL2J1bmRsZXJlcG8ucHk=..90609be10891c07daa847702544db21030dc8cfa_bWVyY3VyaWFsL2J1bmRsZXJlcG8ucHk= 100644 --- a/mercurial/bundlerepo.py +++ b/mercurial/bundlerepo.py @@ -42,7 +42,7 @@ ) class bundlerevlog(revlog.revlog): - def __init__(self, opener, indexfile, bundle, linkmapper): + def __init__(self, opener, indexfile, cgunpacker, linkmapper): # How it works: # To retrieve a revision, we need to know the offset of the revision in # the bundle (an unbundle object). We store this offset in the index @@ -52,7 +52,7 @@ # check revision against repotiprev. opener = vfsmod.readonlyvfs(opener) revlog.revlog.__init__(self, opener, indexfile) - self.bundle = bundle + self.bundle = cgunpacker n = len(self) self.repotiprev = n - 1 self.bundlerevs = set() # used by 'bundle()' revset expression @@ -56,7 +56,7 @@ n = len(self) self.repotiprev = n - 1 self.bundlerevs = set() # used by 'bundle()' revset expression - for deltadata in bundle.deltaiter(): + for deltadata in cgunpacker.deltaiter(): node, p1, p2, cs, deltabase, delta, flags = deltadata size = len(delta) @@ -60,7 +60,7 @@ node, p1, p2, cs, deltabase, delta, flags = deltadata size = len(delta) - start = bundle.tell() - size + start = cgunpacker.tell() - size link = linkmapper(cs) if node in self.nodemap: @@ -165,6 +165,6 @@ raise NotImplementedError class bundlechangelog(bundlerevlog, changelog.changelog): - def __init__(self, opener, bundle): + def __init__(self, opener, cgunpacker): changelog.changelog.__init__(self, opener) linkmapper = lambda x: x @@ -169,6 +169,6 @@ changelog.changelog.__init__(self, opener) linkmapper = lambda x: x - bundlerevlog.__init__(self, opener, self.indexfile, bundle, + bundlerevlog.__init__(self, opener, self.indexfile, cgunpacker, linkmapper) def baserevision(self, nodeorrev): @@ -186,5 +186,6 @@ self.filteredrevs = oldfilter class bundlemanifest(bundlerevlog, manifest.manifestrevlog): - def __init__(self, opener, bundle, linkmapper, dirlogstarts=None, dir=''): + def __init__(self, opener, cgunpacker, linkmapper, dirlogstarts=None, + dir=''): manifest.manifestrevlog.__init__(self, opener, dir=dir) @@ -190,5 +191,5 @@ manifest.manifestrevlog.__init__(self, opener, dir=dir) - bundlerevlog.__init__(self, opener, self.indexfile, bundle, + bundlerevlog.__init__(self, opener, self.indexfile, cgunpacker, linkmapper) if dirlogstarts is None: dirlogstarts = {} @@ -217,5 +218,5 @@ return super(bundlemanifest, self).dirlog(d) class bundlefilelog(bundlerevlog, filelog.filelog): - def __init__(self, opener, path, bundle, linkmapper): + def __init__(self, opener, path, cgunpacker, linkmapper): filelog.filelog.__init__(self, opener, path) @@ -221,5 +222,5 @@ filelog.filelog.__init__(self, opener, path) - bundlerevlog.__init__(self, opener, self.indexfile, bundle, + bundlerevlog.__init__(self, opener, self.indexfile, cgunpacker, linkmapper) def baserevision(self, nodeorrev): @@ -246,5 +247,4 @@ self.invalidate() self.dirty = True -def _getfilestarts(bundle): bundlefilespos = {} @@ -250,4 +250,5 @@ bundlefilespos = {} - for chunkdata in iter(bundle.filelogheader, {}): +def _getfilestarts(cgunpacker): + for chunkdata in iter(cgunpacker.filelogheader, {}): fname = chunkdata['filename'] bundlefilespos[fname] = bundle.tell() @@ -252,6 +253,6 @@ fname = chunkdata['filename'] bundlefilespos[fname] = bundle.tell() - for chunk in iter(lambda: bundle.deltachunk(None), {}): + for chunk in iter(lambda: cgunpacker.deltachunk(None), {}): pass return bundlefilespos