| Restricted Project |
The logic for writing client tree manifests can be reused and thus, it
makes sense to move this out into a separate method.
Ran all the tests.
| Lint Skipped |
| Unit Tests Skipped |
| def copy(self): | def copy(self): | ||||
| memmf = memtreemanifestctx(self._manifestlog, dir=self._dir) | memmf = memtreemanifestctx(self._manifestlog, dir=self._dir) | ||||
| memmf._treemanifest = self._treemanifest.copy() | memmf._treemanifest = self._treemanifest.copy() | ||||
| return memmf | return memmf | ||||
| def read(self): | def read(self): | ||||
| return self._treemanifest | return self._treemanifest | ||||
| def write(self, transaction, link, p1, p2, added, removed): | def write(self, tr, link, p1, p2, added, removed): | ||||
| if not util.safehasattr(transaction, 'treedatapack'): | return _writeclientmanifest( | ||||
| mfl = self._manifestlog | self._treemanifest, tr, self._manifestlog, p1, p2) | ||||
| opener = mfl._opener | |||||
| ui = self._manifestlog.ui | |||||
| packpath = shallowutil.getlocalpackpath( | |||||
| opener.vfs.base, | |||||
| 'manifests') | |||||
| transaction.treedatapack = mutabledatapack( | |||||
| ui, | |||||
| packpath) | |||||
| transaction.treehistpack = mutablehistorypack( | |||||
| ui, | |||||
| packpath) | |||||
| def finalize(tr): | |||||
| tr.treedatapack.close() | |||||
| tr.treehistpack.close() | |||||
| mfl.datastore.markforrefresh() | |||||
| def abort(tr): | |||||
| tr.treedatapack.abort() | |||||
| tr.treehistpack.abort() | |||||
| def writepending(tr): | |||||
| finalize(tr) | |||||
| transaction.treedatapack = mutabledatapack( | |||||
| ui, | |||||
| packpath) | |||||
| transaction.treehistpack = mutablehistorypack( | |||||
| ui, | |||||
| packpath) | |||||
| # re-register to write pending changes so that a series | |||||
| # of writes are correctly flushed to the store. This | |||||
| # happens during amend. | |||||
| tr.addpending('treepack', writepending) | |||||
| transaction.addfinalize('treepack', finalize) | |||||
| transaction.addabort('treepack', abort) | |||||
| transaction.addpending('treepack', writepending) | |||||
| dpack = transaction.treedatapack | |||||
| hpack = transaction.treehistpack | |||||
| newtree = self._treemanifest | |||||
| p1tree = self._manifestlog[p1].read() | |||||
| newtreeiter = newtree.finalize(p1tree) | |||||
| node = None | |||||
| for nname, nnode, ntext, np1text, np1, np2 in newtreeiter: | |||||
| # Not using deltas, since there aren't any other trees in | |||||
| # this pack it could delta against. | |||||
| dpack.add(nname, nnode, revlog.nullid, ntext) | |||||
| hpack.add(nname, nnode, np1, np2, revlog.nullid, '') | |||||
| if nname == "": | |||||
| node = nnode | |||||
| if node is not None: | |||||
| self._manifestlog.addmemtree(node, newtree, p1, p2) | |||||
| return node | |||||
| def serverreposetup(repo): | def serverreposetup(repo): | ||||
| extensions.wrapfunction(manifest.manifestrevlog, 'addgroup', | extensions.wrapfunction(manifest.manifestrevlog, 'addgroup', | ||||
| _addmanifestgroup) | _addmanifestgroup) | ||||
| def _capabilities(orig, repo, proto): | def _capabilities(orig, repo, proto): | ||||
| caps = orig(repo, proto) | caps = orig(repo, proto) | ||||
| caps.append('gettreepack') | caps.append('gettreepack') | ||||
| return treemfl.get(dir, node).read() | return treemfl.get(dir, node).read() | ||||
| treemfrevlog.add(newtree, transaction, link, p1, p2, added, removed, | treemfrevlog.add(newtree, transaction, link, p1, p2, added, removed, | ||||
| readtree=readtree) | readtree=readtree) | ||||
| finally: | finally: | ||||
| del treemfrevlog.__dict__['addrevision'] | del treemfrevlog.__dict__['addrevision'] | ||||
| return n | return n | ||||
| def _writeclientmanifest(newtree, tr, tmfl, p1node, p2node): | |||||
| if not util.safehasattr(tr, 'treedatapack'): | |||||
| opener = tmfl._opener | |||||
| ui = tmfl.ui | |||||
| packpath = shallowutil.getlocalpackpath(opener.vfs.base, 'manifests') | |||||
| tr.treedatapack = mutabledatapack(ui, packpath) | |||||
| tr.treehistpack = mutablehistorypack(ui, packpath) | |||||
| def finalize(tr): | |||||
| tr.treedatapack.close() | |||||
| tr.treehistpack.close() | |||||
| tmfl.datastore.markforrefresh() | |||||
| def abort(tr): | |||||
| tr.treedatapack.abort() | |||||
| tr.treehistpack.abort() | |||||
| def writepending(tr): | |||||
| finalize(tr) | |||||
| tr.treedatapack = mutabledatapack(ui, packpath) | |||||
| tr.treehistpack = mutablehistorypack(ui, packpath) | |||||
| # re-register to write pending changes so that a series | |||||
| # of writes are correctly flushed to the store. This | |||||
| # happens during amend. | |||||
| tr.addpending('treepack', writepending) | |||||
| tr.addfinalize('treepack', finalize) | |||||
| tr.addabort('treepack', abort) | |||||
| tr.addpending('treepack', writepending) | |||||
| dpack = tr.treedatapack | |||||
| hpack = tr.treehistpack | |||||
| p1tree = tmfl[p1node].read() | |||||
| newtreeiter = newtree.finalize(p1tree) | |||||
| node = None | |||||
| for nname, nnode, ntext, np1text, np1, np2 in newtreeiter: | |||||
| # Not using deltas, since there aren't any other trees in | |||||
| # this pack it could delta against. | |||||
| dpack.add(nname, nnode, revlog.nullid, ntext) | |||||
| hpack.add(nname, nnode, np1, np2, revlog.nullid, '') | |||||
| if nname == "": | |||||
| node = nnode | |||||
| if node is not None: | |||||
| tmfl.addmemtree(node, newtree, p1node, p2node) | |||||
| return node | |||||
| @command('debuggentrees', [ | @command('debuggentrees', [ | ||||
| ('s', 'skip-allowed-roots', None, | ('s', 'skip-allowed-roots', None, | ||||
| _('skips the check for only generating on allowed roots')), | _('skips the check for only generating on allowed roots')), | ||||
| ('', 'verify', None, | ('', 'verify', None, | ||||
| _('verify consistency of tree data')), | _('verify consistency of tree data')), | ||||
| ], _('hg debuggentrees FIRSTREV LASTREV')) | ], _('hg debuggentrees FIRSTREV LASTREV')) | ||||
| def debuggentrees(ui, repo, rev1, rev2, *args, **opts): | def debuggentrees(ui, repo, rev1, rev2, *args, **opts): | ||||
| rev1 = repo.revs(rev1).first() | rev1 = repo.revs(rev1).first() | ||||