| Restricted Project |
This commit is essentially a refactor to further break down the
process of converting flat manifest to tree manifest. This enables further code
refactoring and reusability in later commits.
Ran all the tests.
| Lint Skipped |
| Unit Tests Skipped |
| cg = remote.getbundle('pull', common=common, heads=heads) | cg = remote.getbundle('pull', common=common, heads=heads) | ||||
| bundle2.applybundle(repo, cg, tr, 'pull', remote.url()) | bundle2.applybundle(repo, cg, tr, 'pull', remote.url()) | ||||
| @command('backfilltree', [ | @command('backfilltree', [ | ||||
| ('l', 'limit', '10000000', _('')) | ('l', 'limit', '10000000', _('')) | ||||
| ], _('hg backfilltree [OPTIONS]')) | ], _('hg backfilltree [OPTIONS]')) | ||||
| def backfilltree(ui, repo, *args, **opts): | def backfilltree(ui, repo, *args, **opts): | ||||
| with repo.wlock(), repo.lock(), repo.transaction('backfilltree') as tr: | with repo.wlock(), repo.lock(), repo.transaction('backfilltree') as tr: | ||||
| _backfill(tr, repo, int(opts.get('limit'))) | start, end = _getbackfillrange(repo, int(opts.get('limit'))) | ||||
| if start <= end: | |||||
| def _backfill(tr, repo, limit): | |||||
| ui = repo.ui | |||||
| cl = repo.changelog | |||||
| mfl = repo.manifestlog | mfl = repo.manifestlog | ||||
| tmfl = mfl.treemanifestlog | tmfl = mfl.treemanifestlog | ||||
| treerevlog = tmfl._revlog | revs = repo.revs('%s :: %s' % (start, end)) | ||||
| _backfilltree(tr, repo, mfl, tmfl, revs) | |||||
| def _getbackfillrange(repo, limit): | |||||
| treerevlog = repo.manifestlog.treemanifestlog._revlog | |||||
| maxrev = len(treerevlog) - 1 | maxrev = len(treerevlog) - 1 | ||||
| start = treerevlog.linkrev(maxrev) + 1 | start = treerevlog.linkrev(maxrev) + 1 | ||||
| end = min(len(cl), start + limit) | |||||
| converting = _("converting") | numclrevs = len(repo.changelog) | ||||
| end = min(numclrevs, start + limit) - 1 | |||||
| return (start, end) | |||||
| def _backfilltree(tr, repo, mfl, tmfl, revs): | |||||
| ui = repo.ui | |||||
| converting = _("converting flat manifest to tree manifest") | |||||
| count = 0 | |||||
| for rev in revs: | |||||
| ui.progress(converting, count, total=len(revs)) | |||||
| count = count + 1 | |||||
| _converttotree(tr, mfl, tmfl, repo[rev].manifestctx(), rev) | |||||
| ui.progress(converting, 0, total=end - start) | ui.progress(converting, None) | ||||
| for i in xrange(start, end): | |||||
| ctx = repo[i] | def _converttotree(tr, mfl, tmfl, mfctx, rev): | ||||
| newflat = ctx.manifest() | p1node = mfctx.parents[0] | ||||
| p1 = ctx.p1() | newflat = mfctx.read() | ||||
| p2 = ctx.p2() | |||||
| p1node = p1.manifestnode() | |||||
| p2node = p2.manifestnode() | |||||
| if p1node != nullid: | if p1node != nullid: | ||||
| if (p1node not in treerevlog.nodemap or | |||||
| (p2node != nullid and p2node not in treerevlog.nodemap)): | |||||
| ui.warn(_("unable to find parent nodes %s %s\n") % (hex(p1node), | |||||
| hex(p2node))) | |||||
| return | |||||
| parentflat = mfl[p1node].read() | parentflat = mfl[p1node].read() | ||||
| parenttree = tmfl[p1node].read() | parenttree = tmfl[p1node].read() | ||||
| else: | else: | ||||
| parentflat = manifest.manifestdict() | parentflat = manifest.manifestdict() | ||||
| parenttree = manifest.treemanifest() | parenttree = manifest.treemanifest() | ||||
| newtree, added, removed = _getnewtree(newflat, parenttree, parentflat) | |||||
| _addtotreerevlog(newtree, tr, tmfl, rev, mfctx, added, removed) | |||||
| 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(): | ||||
| if new is not None and new[0] is not None: | if new is not None and new[0] is not None: | ||||
| added.append(filename) | added.append(filename) | ||||
| newtree[filename] = new[0] | newtree[filename] = new[0] | ||||
| newtree.setflag(filename, new[1]) | newtree.setflag(filename, new[1]) | ||||
| else: | else: | ||||
| removed.append(filename) | removed.append(filename) | ||||
| del newtree[filename] | del newtree[filename] | ||||
| return (newtree, added, removed) | |||||
| def _addtotreerevlog(newtree, tr, tmfl, rev, mfctx, added, removed): | |||||
| try: | try: | ||||
| p1mf, p2mf = mfctx.parents | |||||
| treerevlog = tmfl._revlog | |||||
| oldaddrevision = treerevlog.addrevision | oldaddrevision = treerevlog.addrevision | ||||
| def addusingnode(*args, **kwargs): | def addusingnode(*args, **kwargs): | ||||
| newkwargs = kwargs.copy() | newkwargs = kwargs.copy() | ||||
| newkwargs['node'] = ctx.manifestnode() | newkwargs['node'] = mfctx.node() | ||||
| return oldaddrevision(*args, **newkwargs) | return oldaddrevision(*args, **newkwargs) | ||||
| treerevlog.addrevision = addusingnode | treerevlog.addrevision = addusingnode | ||||
| def readtree(dir, node): | def readtree(dir, node): | ||||
| return tmfl.get(dir, node).read() | return tmfl.get(dir, node).read() | ||||
| treerevlog.add(newtree, tr, ctx.rev(), p1node, p2node, added, | treerevlog.add( | ||||
| removed, readtree=readtree) | newtree, tr, rev, p1mf, p2mf, added, removed, readtree=readtree) | ||||
| finally: | finally: | ||||
| del treerevlog.__dict__['addrevision'] | del treerevlog.__dict__['addrevision'] | ||||
| ui.progress(converting, i - start, total=end - start) | |||||
| ui.progress(converting, None) | |||||
| def _unpackmanifestscg3(orig, self, repo, *args, **kwargs): | def _unpackmanifestscg3(orig, self, repo, *args, **kwargs): | ||||
| if not treeenabled(repo.ui): | if not treeenabled(repo.ui): | ||||
| return orig(self, repo, *args, **kwargs) | return orig(self, repo, *args, **kwargs) | ||||
| if repo.ui.configbool('treemanifest', 'treeonly'): | if repo.ui.configbool('treemanifest', 'treeonly'): | ||||
| self.manifestheader() | self.manifestheader() | ||||
| for delta in self.deltaiter(): | for delta in self.deltaiter(): | ||||
| pass | pass | ||||