Patchwork D1384: bundlerepo: rename "bundlefilespos" variable and attribute

login
register
mail settings
Submitter phabricator
Date Nov. 14, 2017, 4:59 a.m.
Message ID <differential-rev-PHID-DREV-ehexhm7apej7nqgj4cmh-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/25543/
State Superseded
Headers show

Comments

phabricator - Nov. 14, 2017, 4:59 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D1384

AFFECTED FILES
  mercurial/bundlerepo.py

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/bundlerepo.py b/mercurial/bundlerepo.py
--- a/mercurial/bundlerepo.py
+++ b/mercurial/bundlerepo.py
@@ -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: