[PATCH 1 of 4] manifest: add treemanifestctx class

Durham Goode durham at fb.com
Tue Aug 30 23:40:41 UTC 2016


# HG changeset patch
# User Durham Goode <durham at fb.com>
# Date 1472518307 25200
#      Mon Aug 29 17:51:47 2016 -0700
# Node ID a6f968072eb72212bf8e16fb74114654aca98330
# Parent  318e2b600b80e4ed3c6f37df46ec7544f60d4c0b
manifest: add treemanifestctx class

Before we start using repo.manifestlog in the rest of the code base, we need to
make sure that it's capable of returning treemanifests. As we add new
functionality to manifestctx, we'll add it to treemanifestctx at the same time.

diff --git a/mercurial/manifest.py b/mercurial/manifest.py
--- a/mercurial/manifest.py
+++ b/mercurial/manifest.py
@@ -944,21 +944,24 @@ class manifestlog(object):
         """Retrieves the manifest instance for the given node. Throws a KeyError
         if not found.
         """
-        if (self._oldmanifest._treeondisk
-            or self._oldmanifest._treeinmem):
-            # TODO: come back and support tree manifests directly
-            return self._oldmanifest.read(node)
+        if node == revlog.nullid:
+            if self._oldmanifest._treeinmem:
+                return treemanifest()
+            else:
+                return manifestdict()
 
-        if node == revlog.nullid:
-            return manifestdict()
         if node in self._mancache:
             cachemf = self._mancache[node]
             # The old manifest may put non-ctx manifests in the cache, so skip
             # those since they don't implement the full api.
-            if isinstance(cachemf, manifestctx):
+            if (isinstance(cachemf, manifestctx) or
+                isinstance(cachemf, treemanifestctx)):
                 return cachemf
 
-        m = manifestctx(self._revlog, node)
+        if self._oldmanifest._treeinmem:
+            m = treemanifestctx(self._revlog, node, dir='')
+        else:
+            m = manifestctx(self._revlog, node)
         self._mancache[node] = m
         return m
 
@@ -984,6 +987,35 @@ class manifestctx(manifestdict):
     def node(self):
         return self._node
 
+class treemanifestctx(treemanifest):
+    def __init__(self, revlog, node, dir=''):
+        revlog = revlog.dirlog(dir)
+        self._revlog = revlog
+        self._dir = dir
+
+        self._node = node
+
+        # TODO: Load p1/p2/linkrev lazily. They need to be lazily loaded so that
+        # we can instantiate treemanifestctx objects for directories we don't
+        # have on disk.
+        #self.p1, self.p2 = revlog.parents(node)
+        #rev = revlog.rev(node)
+        #self.linkrev = revlog.linkrev(rev)
+
+        if revlog._treeondisk:
+            super(treemanifestctx, self).__init__(dir=dir)
+            def gettext():
+                return revlog.revision(node)
+            def readsubtree(dir, subm):
+                return revlog.dirlog(dir).read(subm)
+            self.read(gettext, readsubtree)
+            self.setnode(node)
+        else:
+            data = revlog.revision(node)
+            arraytext = array.array('c', data)
+            revlog.fulltextcache[node] = arraytext
+            super(treemanifestctx, self).__init__(dir=dir, text=data)
+
 class manifest(manifestrevlog):
     def __init__(self, opener, dir='', dirlogcache=None):
         '''The 'dir' and 'dirlogcache' arguments are for internal use by


More information about the Mercurial-devel mailing list