Mercurial > public > mercurial-scm > hg-stable

diff mercurial/changegroup.py @ 30308:bce79dfcf5e4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: get rid of manifest.readshallowfast This removes manifest.readshallowfast and converts it's one user to use manifestlog instead.
author Durham Goode <durham@fb.com>
date Wed, 02 Nov 2016 17:10:47 -0700
parents dc7c4dbc1af9
children 6cdfb7e15a35
line wrap: on
line diff
--- a/mercurial/changegroup.py	Wed Nov 02 17:10:47 2016 -0700
+++ b/mercurial/changegroup.py	Wed Nov 02 17:10:47 2016 -0700
@@ -677,7 +677,8 @@
     def generatemanifests(self, commonrevs, clrevorder, fastpathlinkrev, mfs,
                           fnodes):
         repo = self._repo
-        dirlog = repo.manifest.dirlog
+        mfl = repo.manifestlog
+        dirlog = mfl._revlog.dirlog
         tmfnodes = {'': mfs}
 
         # Callback for the manifest, used to collect linkrevs for filelog
@@ -705,7 +706,7 @@
                 treemanifests to send.
                 """
                 clnode = tmfnodes[dir][x]
-                mdata = dirlog(dir).readshallowfast(x)
+                mdata = mfl.get(dir, x).readfast(shallow=True)
                 for p, n, fl in mdata.iterentries():
                     if fl == 't': # subdirectory manifest
                         subdir = dir + p + '/'