| ryanmce |
| Restricted Project |
The tree datastores have moved from the svfs to the manifestlog. Let's update
fastmanifest to use them from there.
Ran the tests
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | fastmanifest/implementation.py (24 lines) | |||
| M | tests/test-fastmanifest.py (3 lines) |
| """ | """ | ||||
| Hybrid manifest that behaves like a lazy manifest. | Hybrid manifest that behaves like a lazy manifest. | ||||
| Initialized with one of the three: | Initialized with one of the three: | ||||
| - flat an existing flat manifest | - flat an existing flat manifest | ||||
| - fast an existing fast manifest | - fast an existing fast manifest | ||||
| - loadflat a function to load a flat manifest from disk | - loadflat a function to load a flat manifest from disk | ||||
| """ | """ | ||||
| def __init__(self, ui, opener, | def __init__(self, ui, opener, manifestlog, | ||||
| flat=None, fast=None, loadflat=None, tree=None, node=None): | flat=None, fast=None, loadflat=None, tree=None, node=None): | ||||
| self.__flatmanifest = flat | self.__flatmanifest = flat | ||||
| self.loadflat = loadflat | self.loadflat = loadflat | ||||
| if supportsctree and ui.configbool("fastmanifest", "usetree", False): | if supportsctree and ui.configbool("fastmanifest", "usetree", False): | ||||
| self.__treemanifest = tree | self.__treemanifest = tree | ||||
| else: | else: | ||||
| self.__treemanifest = False | self.__treemanifest = False | ||||
| if ui.configbool("fastmanifest", "usecache", True): | if ui.configbool("fastmanifest", "usecache", True): | ||||
| self.__cachedmanifest = fast | self.__cachedmanifest = fast | ||||
| else: | else: | ||||
| self.__cachedmanifest = False | self.__cachedmanifest = False | ||||
| assert (self.__flatmanifest is not None or | assert (self.__flatmanifest is not None or | ||||
| self.__cachedmanifest not in (None, False) or | self.__cachedmanifest not in (None, False) or | ||||
| self.__treemanifest not in (None, False) or | self.__treemanifest not in (None, False) or | ||||
| self.loadflat is not None) | self.loadflat is not None) | ||||
| self.ui = ui | self.ui = ui | ||||
| self.opener = opener | self.opener = opener | ||||
| self.manifestlog = manifestlog | |||||
| self.node = node | self.node = node | ||||
| self.basemanifest = None | self.basemanifest = None | ||||
| self.cachekey = revlog.hex(self.node) if self.node is not None else None | self.cachekey = revlog.hex(self.node) if self.node is not None else None | ||||
| self.fastcache = fastmanifestcache.getinstance(opener, self.ui) | self.fastcache = fastmanifestcache.getinstance(opener, self.ui) | ||||
| self.treecache = treemanifestcache.getinstance(opener, self.ui) | self.treecache = treemanifestcache.getinstance(opener, self.ui) | ||||
| self.debugfastmanifest = self.ui.configbool("fastmanifest", | self.debugfastmanifest = self.ui.configbool("fastmanifest", | ||||
| return None | return None | ||||
| assert supportsctree | assert supportsctree | ||||
| if self.__treemanifest is None: | if self.__treemanifest is None: | ||||
| if self.node is None: | if self.node is None: | ||||
| return None | return None | ||||
| if self.node in self.treecache: | if self.node in self.treecache: | ||||
| self.__treemanifest = self.treecache[self.node] | self.__treemanifest = self.treecache[self.node] | ||||
| elif self.node == revlog.nullid: | elif self.node == revlog.nullid: | ||||
| store = self.opener.manifestdatastore | store = self.manifestlog.datastore | ||||
| self.__treemanifest = cstore.treemanifest(store) | self.__treemanifest = cstore.treemanifest(store) | ||||
| else: | else: | ||||
| if util.safehasattr(self.opener, 'manifestdatastore'): | store = self.manifestlog.datastore | ||||
| store = self.opener.manifestdatastore | |||||
| else: | |||||
| store = self.opener.vfs.manifestdatastore | |||||
| try: | try: | ||||
| store.get('', self.node) | store.get('', self.node) | ||||
| self.__treemanifest = cstore.treemanifest(store, | self.__treemanifest = cstore.treemanifest(store, | ||||
| self.node) | self.node) | ||||
| except KeyError: | except KeyError: | ||||
| # Record that it doesn't exist, so we don't keep checking | # Record that it doesn't exist, so we don't keep checking | ||||
| # the store. | # the store. | ||||
| self.__treemanifest = False | self.__treemanifest = False | ||||
| if isinstance(m, cstore.treemanifest): | if isinstance(m, cstore.treemanifest): | ||||
| return fastdelta(m, m.find, base, changes) | return fastdelta(m, m.find, base, changes) | ||||
| return m.fastdelta(base, changes) | return m.fastdelta(base, changes) | ||||
| def _converttohybridmanifest(self, m): | def _converttohybridmanifest(self, m): | ||||
| if isinstance(m, hybridmanifest): | if isinstance(m, hybridmanifest): | ||||
| return m | return m | ||||
| elif isinstance(m, fastmanifestdict): | elif isinstance(m, fastmanifestdict): | ||||
| return hybridmanifest(self.ui, self.opener, fast=m) | return hybridmanifest(self.ui, self.opener, self.manifestlog, | ||||
| fast=m) | |||||
| elif isinstance(m, manifest.manifestdict): | elif isinstance(m, manifest.manifestdict): | ||||
| return hybridmanifest(self.ui, self.opener, flat=m) | return hybridmanifest(self.ui, self.opener, self.manifestlog, | ||||
| flat=m) | |||||
| elif supportsctree and isinstance(m, cstore.treemanifest): | elif supportsctree and isinstance(m, cstore.treemanifest): | ||||
| return hybridmanifest(self.ui, self.opener, tree=m) | return hybridmanifest(self.ui, self.opener, self.manifestlog, | ||||
| tree=m) | |||||
| else: | else: | ||||
| raise ValueError("unknown manifest type {0}".format(type(m))) | raise ValueError("unknown manifest type {0}".format(type(m))) | ||||
| def copy(self): | def copy(self): | ||||
| copy = self._manifest('copy').copy() | copy = self._manifest('copy').copy() | ||||
| hybridmf = self._converttohybridmanifest(copy) | hybridmf = self._converttohybridmanifest(copy) | ||||
| hybridmf.basemanifest = self.basemanifest or self | hybridmf.basemanifest = self.basemanifest or self | ||||
| return hybridmf | return hybridmf | ||||
| # access the node/p1/linkrev data without having to parse the | # access the node/p1/linkrev data without having to parse the | ||||
| # whole manifest. | # whole manifest. | ||||
| data = self._revlog.revision(self._node) | data = self._revlog.revision(self._node) | ||||
| arraytext = bytearray(data) | arraytext = bytearray(data) | ||||
| self._revlog._fulltextcache[self._node] = arraytext | self._revlog._fulltextcache[self._node] = arraytext | ||||
| return manifest.manifestdict(data) | return manifest.manifestdict(data) | ||||
| self._hybridmanifest = hybridmanifest( | self._hybridmanifest = hybridmanifest( | ||||
| self._ui, self._opener, loadflat=loadflat, node=self._node) | self._ui, self._opener, self._manifestlog, | ||||
| loadflat=loadflat, node=self._node) | |||||
| return self._hybridmanifest | return self._hybridmanifest | ||||
| def readdelta(self, shallow=False): | def readdelta(self, shallow=False): | ||||
| rl = self._revlog | rl = self._revlog | ||||
| if rl._usemanifestv2: | if rl._usemanifestv2: | ||||
| # Need to perform a slow delta | # Need to perform a slow delta | ||||
| r0 = revlog.deltaparent(revlog.rev(self._node)) | r0 = revlog.deltaparent(revlog.rev(self._node)) | ||||
| m0 = manifest.manifestctx(self._manifestlog, rl.node(r0)).read() | m0 = manifest.manifestctx(self._manifestlog, rl.node(r0)).read() | ||||
| return node | return node | ||||
| def ctxwrite(self, orig, mfctx, transaction, link, p1, p2, added, removed): | def ctxwrite(self, orig, mfctx, transaction, link, p1, p2, added, removed): | ||||
| node = orig(mfctx, transaction, link, p1, p2, added, removed) | node = orig(mfctx, transaction, link, p1, p2, added, removed) | ||||
| treeenabled = self.ui.configbool("fastmanifest", "usetree", False) | treeenabled = self.ui.configbool("fastmanifest", "usetree", False) | ||||
| if supportsctree and treeenabled: | if supportsctree and treeenabled: | ||||
| mfl = mfctx._manifestlog | mfl = mfctx._manifestlog | ||||
| datastore = mfctx._revlog().opener.manifestdatastore | datastore = mfl.datastore | ||||
| opener = mfctx._revlog().opener | opener = mfctx._revlog().opener | ||||
| m = mfctx._manifestdict | m = mfctx._manifestdict | ||||
| # hybridmanifest requires you provide either a value or loadflat. | # hybridmanifest requires you provide either a value or loadflat. | ||||
| # Let's give it a dummy value, since we know we'll only be calling | # Let's give it a dummy value, since we know we'll only be calling | ||||
| # _treemanifest() | # _treemanifest() | ||||
| def loadflat(): | def loadflat(): | ||||
| def test_wrap(self): | def test_wrap(self): | ||||
| """If a new magic method is added to manifestdict, we want to make sure | """If a new magic method is added to manifestdict, we want to make sure | ||||
| that hybridmanifest implement it, this test validates that all magic | that hybridmanifest implement it, this test validates that all magic | ||||
| methods of manifestdict are implemented by hybridmanifest to avoid | methods of manifestdict are implemented by hybridmanifest to avoid | ||||
| breakage in prod | breakage in prod | ||||
| """ | """ | ||||
| vfs = vfsmod.vfs(os.getcwd()) | vfs = vfsmod.vfs(os.getcwd()) | ||||
| hd = fastmanifest.implementation.hybridmanifest(ui.ui(), vfs, fast=True) | hd = fastmanifest.implementation.hybridmanifest(ui.ui(), vfs, None, | ||||
| fast=True) | |||||
| ismagic = lambda x: x.startswith("__") and x.endswith("__") | ismagic = lambda x: x.startswith("__") and x.endswith("__") | ||||
| magicmethods = [k | magicmethods = [k | ||||
| for k, v in manifest.manifestdict.__dict__.items() | for k, v in manifest.manifestdict.__dict__.items() | ||||
| if util.safehasattr(v, '__call__') and ismagic(k)] | if util.safehasattr(v, '__call__') and ismagic(k)] | ||||
| for method in magicmethods: | for method in magicmethods: | ||||
| assert util.safehasattr(hd, method),\ | assert util.safehasattr(hd, method),\ | ||||
| "%s missing in hybrid manifest" % method | "%s missing in hybrid manifest" % method | ||||