# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1518165123 -19800 # Node ID 7fa00a6f81809f779bce0e08d13504ace40f081c # Parent 14acab54e08b7f72babeb4bcaeda63bd5a1d092f infinitepush: drop logic related to treemanifest extension treemanifest is another facebook's extension which is not in core. Let's drop the logic related to infinitepush extension which is now ported to core. Differential Revision: https://phab.mercurial-scm.org/D2106 diff -r 14acab54e08b -r 7fa00a6f8180 hgext/infinitepush/__init__.py --- a/hgext/infinitepush/__init__.py Fri Feb 09 13:56:09 2018 +0530 +++ b/hgext/infinitepush/__init__.py Fri Feb 09 14:02:03 2018 +0530 @@ -440,16 +440,6 @@ cgpart.addparam('version', version) parts.append(cgpart) - try: - treemod = extensions.find('treemanifest') - except KeyError: - pass - else: - if treemod._cansendtrees(bundlerepo, outgoing.missing): - treepart = treemod.createtreepackpart(bundlerepo, outgoing, - treemod.TREEGROUP_PARTTYPE2) - parts.append(treepart) - return parts def _getbundleroots(oldrepo, bundlerepo, bundlerevs): @@ -858,7 +848,6 @@ return pushop.stepsdone.add('changesets') - pushop.stepsdone.add('treepack') if not pushop.outgoing.missing: pushop.ui.status(_('no changes found\n')) pushop.cgresult = 0 @@ -953,13 +942,6 @@ handleallparts = repo.ui.configbool('infinitepush', 'storeallparts') - partforwardingwhitelist = [] - try: - treemfmod = extensions.find('treemanifest') - partforwardingwhitelist.append(treemfmod.TREEGROUP_PARTTYPE2) - except KeyError: - pass - bundler = bundle2.bundle20(repo.ui) cgparams = None with bundle2.partiterator(repo, op, unbundler) as parts: @@ -987,7 +969,7 @@ op.records.add(scratchbranchparttype + '_skipphaseheads', True) else: - if handleallparts or part.type in partforwardingwhitelist: + if handleallparts: # Ideally we would not process any parts, and instead just # forward them to the bundle for storage, but since this # differs from previous behavior, we need to put it behind a diff -r 14acab54e08b -r 7fa00a6f8180 hgext/infinitepush/bundleparts.py --- a/hgext/infinitepush/bundleparts.py Fri Feb 09 13:56:09 2018 +0530 +++ b/hgext/infinitepush/bundleparts.py Fri Feb 09 14:02:03 2018 +0530 @@ -68,19 +68,6 @@ advisoryparams=params.iteritems(), data=cg)) - try: - treemod = extensions.find('treemanifest') - mfnodes = [] - for node in outgoing.missing: - mfnodes.append(('', repo[node].manifestnode())) - - # Only include the tree parts if they all exist - if not repo.manifestlog.datastore.getmissing(mfnodes): - parts.append(treemod.createtreepackpart( - repo, outgoing, treemod.TREEGROUP_PARTTYPE2)) - except KeyError: - pass - return parts def _validaterevset(repo, revset, bookmark):