| Restricted Project |
D1823 refactored the server side flat manifest to tree manifest
conversion code path. This commit builds on that and introduces support for the
same on the client side.
Ran all the tests. https://phab.mercurial-scm.org/D1826 tests the new
functionality.
| Lint Skipped |
| Unit Tests Skipped |
| n = orig(self, tr, link, p1, p2, added, removed) | n = orig(self, tr, link, p1, p2, added, removed) | ||||
| mfl = self._manifestlog | mfl = self._manifestlog | ||||
| if (util.safehasattr(mfl._revlog.opener, 'treemanifestserver') and | if (util.safehasattr(mfl._revlog.opener, 'treemanifestserver') and | ||||
| mfl._revlog.opener.treemanifestserver): | mfl._revlog.opener.treemanifestserver): | ||||
| # Since we're adding the root flat manifest, let's add the corresponding | # Since we're adding the root flat manifest, let's add the corresponding | ||||
| # root tree manifest. | # root tree manifest. | ||||
| tmfl = mfl.treemanifestlog | tmfl = mfl.treemanifestlog | ||||
| _converttotree(tr, mfl, tmfl, mfl[n], link) | _converttotree(tr, mfl, tmfl, mfl[n], link, True) | ||||
| return n | return n | ||||
| def _writeclientmanifest(newtree, tr, tmfl, node, p1node, p2node): | def _writeclientmanifest(newtree, tr, tmfl, node, p1node, p2node): | ||||
| if not util.safehasattr(tr, 'treedatapack'): | if not util.safehasattr(tr, 'treedatapack'): | ||||
| opener = tmfl._opener | opener = tmfl._opener | ||||
| ui = tmfl.ui | ui = tmfl.ui | ||||
| packpath = shallowutil.getlocalpackpath(opener.vfs.base, 'manifests') | packpath = shallowutil.getlocalpackpath(opener.vfs.base, 'manifests') | ||||
| def _backfilltree(tr, repo, mfl, tmfl, revs): | def _backfilltree(tr, repo, mfl, tmfl, revs): | ||||
| ui = repo.ui | ui = repo.ui | ||||
| converting = _("converting flat manifest to tree manifest") | converting = _("converting flat manifest to tree manifest") | ||||
| count = 0 | count = 0 | ||||
| for rev in revs: | for rev in revs: | ||||
| ui.progress(converting, count, total=len(revs)) | ui.progress(converting, count, total=len(revs)) | ||||
| count = count + 1 | count = count + 1 | ||||
| _converttotree(tr, mfl, tmfl, repo[rev].manifestctx(), rev) | _converttotree(tr, mfl, tmfl, repo[rev].manifestctx(), rev, True) | ||||
| ui.progress(converting, None) | ui.progress(converting, None) | ||||
| def _converttotree(tr, mfl, tmfl, mfctx, rev): | def _converttotree(tr, mfl, tmfl, mfctx, rev=None, isserver=False): | ||||
| p1node = mfctx.parents[0] | p1node, p2node = mfctx.parents | ||||
| newflat = mfctx.read() | newflat = mfctx.read() | ||||
| if p1node != nullid: | if p1node != nullid: | ||||
| parentflat = mfl[p1node].read() | parentflat = mfl[p1node].read() | ||||
| parenttree = tmfl[p1node].read() | parenttree = tmfl[p1node].read() | ||||
| else: | else: | ||||
| parentflat = manifest.manifestdict() | parentflat = manifest.manifestdict() | ||||
| if isserver: | |||||
| parenttree = manifest.treemanifest() | parenttree = manifest.treemanifest() | ||||
| else: | |||||
| parenttree = cstore.treemanifest(tmfl.datastore) | |||||
| newtree, added, removed = _getnewtree(newflat, parenttree, parentflat) | newtree, added, removed = _getnewtree(newflat, parenttree, parentflat) | ||||
| if isserver: | |||||
| _addtotreerevlog(newtree, tr, tmfl, rev, mfctx, added, removed) | _addtotreerevlog(newtree, tr, tmfl, rev, mfctx, added, removed) | ||||
| else: | |||||
| _writeclientmanifest(newtree, tr, tmfl, mfctx.node(), p1node, p2node) | |||||
| def _getnewtree(newflat, parenttree, parentflat): | def _getnewtree(newflat, parenttree, parentflat): | ||||
| diff = parentflat.diff(newflat) | diff = parentflat.diff(newflat) | ||||
| newtree = parenttree.copy() | newtree = parenttree.copy() | ||||
| added = [] | added = [] | ||||
| removed = [] | removed = [] | ||||
| for filename, (old, new) in diff.iteritems(): | for filename, (old, new) in diff.iteritems(): | ||||