| indygreg |
| hg-reviewers |
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.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/infinitepush/__init__.py (20 lines) | |||
| M | hgext/infinitepush/bundleparts.py (13 lines) |
| outgoing = discovery.outgoing(bundlerepo, commonheads=bundleroots, | outgoing = discovery.outgoing(bundlerepo, commonheads=bundleroots, | ||||
| missingheads=[unknownhead]) | missingheads=[unknownhead]) | ||||
| cgstream = changegroup.makestream(bundlerepo, outgoing, version, 'pull') | cgstream = changegroup.makestream(bundlerepo, outgoing, version, 'pull') | ||||
| cgstream = util.chunkbuffer(cgstream).read() | cgstream = util.chunkbuffer(cgstream).read() | ||||
| cgpart = bundle2.bundlepart('changegroup', data=cgstream) | cgpart = bundle2.bundlepart('changegroup', data=cgstream) | ||||
| cgpart.addparam('version', version) | cgpart.addparam('version', version) | ||||
| parts.append(cgpart) | 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 | return parts | ||||
| def _getbundleroots(oldrepo, bundlerepo, bundlerevs): | def _getbundleroots(oldrepo, bundlerepo, bundlerevs): | ||||
| cl = bundlerepo.changelog | cl = bundlerepo.changelog | ||||
| bundleroots = [] | bundleroots = [] | ||||
| for rev in bundlerevs: | for rev in bundlerevs: | ||||
| node = cl.node(rev) | node = cl.node(rev) | ||||
| parents = cl.parents(node) | parents = cl.parents(node) | ||||
| scratchpush = pushop.ui.configbool(experimental, configscratchpush) | scratchpush = pushop.ui.configbool(experimental, configscratchpush) | ||||
| if 'changesets' in pushop.stepsdone or not scratchpush: | if 'changesets' in pushop.stepsdone or not scratchpush: | ||||
| return | return | ||||
| if scratchbranchparttype not in bundle2.bundle2caps(pushop.remote): | if scratchbranchparttype not in bundle2.bundle2caps(pushop.remote): | ||||
| return | return | ||||
| pushop.stepsdone.add('changesets') | pushop.stepsdone.add('changesets') | ||||
| pushop.stepsdone.add('treepack') | |||||
| if not pushop.outgoing.missing: | if not pushop.outgoing.missing: | ||||
| pushop.ui.status(_('no changes found\n')) | pushop.ui.status(_('no changes found\n')) | ||||
| pushop.cgresult = 0 | pushop.cgresult = 0 | ||||
| return | return | ||||
| # This parameter tells the server that the following bundle is an | # This parameter tells the server that the following bundle is an | ||||
| # infinitepush. This let's it switch the part processing to our infinitepush | # infinitepush. This let's it switch the part processing to our infinitepush | ||||
| # code path. | # code path. | ||||
| return logger | return logger | ||||
| def processparts(orig, repo, op, unbundler): | def processparts(orig, repo, op, unbundler): | ||||
| if unbundler.params.get('infinitepush') != 'True': | if unbundler.params.get('infinitepush') != 'True': | ||||
| return orig(repo, op, unbundler) | return orig(repo, op, unbundler) | ||||
| handleallparts = repo.ui.configbool('infinitepush', 'storeallparts') | 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) | bundler = bundle2.bundle20(repo.ui) | ||||
| cgparams = None | cgparams = None | ||||
| with bundle2.partiterator(repo, op, unbundler) as parts: | with bundle2.partiterator(repo, op, unbundler) as parts: | ||||
| for part in parts: | for part in parts: | ||||
| bundlepart = None | bundlepart = None | ||||
| if part.type == 'replycaps': | if part.type == 'replycaps': | ||||
| # This configures the current operation to allow reply parts. | # This configures the current operation to allow reply parts. | ||||
| bundle2._processpart(op, part) | bundle2._processpart(op, part) | ||||
| # If we're not dumping all parts into the new bundle, we need to | # If we're not dumping all parts into the new bundle, we need to | ||||
| # alert the future pushkey and phase-heads handler to skip | # alert the future pushkey and phase-heads handler to skip | ||||
| # the part. | # the part. | ||||
| if not handleallparts: | if not handleallparts: | ||||
| op.records.add(scratchbranchparttype + '_skippushkey', True) | op.records.add(scratchbranchparttype + '_skippushkey', True) | ||||
| op.records.add(scratchbranchparttype + '_skipphaseheads', | op.records.add(scratchbranchparttype + '_skipphaseheads', | ||||
| True) | True) | ||||
| else: | else: | ||||
| if handleallparts or part.type in partforwardingwhitelist: | if handleallparts: | ||||
| # Ideally we would not process any parts, and instead just | # Ideally we would not process any parts, and instead just | ||||
| # forward them to the bundle for storage, but since this | # forward them to the bundle for storage, but since this | ||||
| # differs from previous behavior, we need to put it behind a | # differs from previous behavior, we need to put it behind a | ||||
| # config flag for incremental rollout. | # config flag for incremental rollout. | ||||
| bundlepart = bundle2.bundlepart(part.type, data=part.read()) | bundlepart = bundle2.bundlepart(part.type, data=part.read()) | ||||
| for key, value in part.params.iteritems(): | for key, value in part.params.iteritems(): | ||||
| bundlepart.addparam(key, value) | bundlepart.addparam(key, value) | ||||
| # .upper() marks this as a mandatory part: server will abort if there's no | # .upper() marks this as a mandatory part: server will abort if there's no | ||||
| # handler | # handler | ||||
| parts.append(bundle2.bundlepart( | parts.append(bundle2.bundlepart( | ||||
| scratchbranchparttype.upper(), | scratchbranchparttype.upper(), | ||||
| advisoryparams=params.iteritems(), | advisoryparams=params.iteritems(), | ||||
| data=cg)) | 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 | return parts | ||||
| def _validaterevset(repo, revset, bookmark): | def _validaterevset(repo, revset, bookmark): | ||||
| """Abort if the revs to be pushed aren't valid for a scratch branch.""" | """Abort if the revs to be pushed aren't valid for a scratch branch.""" | ||||
| if not repo.revs(revset): | if not repo.revs(revset): | ||||
| raise error.Abort(_('nothing to push')) | raise error.Abort(_('nothing to push')) | ||||
| if bookmark: | if bookmark: | ||||
| # Allow bundle with many heads only if no bookmark is specified | # Allow bundle with many heads only if no bookmark is specified | ||||