Mercurial > hg
changeset 35077:cd4cd7b94ff1
bundlerepo: rename "bundlefilespos" variable and attribute
Strictly speaking, this variable tracks offsets within the
changegroup, not the bundle.
While we're here, mark a class attribute as private because
it is.
.. api::
Rename bundlerepo.bundlerepository.bundlefilespos to
_cgfilespos.
Differential Revision: https://phab.mercurial-scm.org/D1384
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Mon, 13 Nov 2017 19:12:56 -0800 |
| parents | 90609be10891 |
| children | a052022639cc |
| files | mercurial/bundlerepo.py |
| diffstat | 1 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bundlerepo.py Mon Nov 13 19:12:17 2017 -0800 +++ b/mercurial/bundlerepo.py Mon Nov 13 19:12:56 2017 -0800 @@ -247,14 +247,14 @@ self.invalidate() self.dirty = True - bundlefilespos = {} def _getfilestarts(cgunpacker): + filespos = {} for chunkdata in iter(cgunpacker.filelogheader, {}): fname = chunkdata['filename'] - bundlefilespos[fname] = bundle.tell() + filespos[fname] = cgunpacker.tell() for chunk in iter(lambda: cgunpacker.deltachunk(None), {}): pass - return bundlefilespos + return filespos class bundlerepository(localrepo.localrepository): """A repository instance that is a union of a local repo and a bundle. @@ -312,8 +312,8 @@ raise error.Abort(_('bundle type %s cannot be read') % type(bundle)) - # dict with the mapping 'filename' -> position in the bundle - self.bundlefilespos = {} + # dict with the mapping 'filename' -> position in the changegroup. + self._cgfilespos = {} self.firstnewrev = self.changelog.repotiprev + 1 phases.retractboundary(self, None, phases.draft, @@ -403,12 +403,12 @@ return self._url def file(self, f): - if not self.bundlefilespos: + if not self._cgfilespos: self._cgunpacker.seek(self.filestart) - self.bundlefilespos = _getfilestarts(self._cgunpacker) + self._cgfilespos = _getfilestarts(self._cgunpacker) - if f in self.bundlefilespos: - self._cgunpacker.seek(self.bundlefilespos[f]) + if f in self._cgfilespos: + self._cgunpacker.seek(self._cgfilespos[f]) linkmapper = self.unfiltered().changelog.rev return bundlefilelog(self.svfs, f, self._cgunpacker, linkmapper) else: