changeset 1071:3009e6eaea4c

bundle2: drop custom compat

We'll rely on the core implementation to use bundle2.

--- a/hgext/evolve.py	Wed Aug 27 10:22:50 2014 +0200
+++ b/hgext/evolve.py	Wed Aug 27 10:53:09 2014 +0200
@@ -2275,97 +2275,6 @@
             yield d
             d = self.read(4096)
 
-bundle2partsgenerators = getattr(exchange, 'bundle2partsgenerators', None)
-
-
-if bundle2partsgenerators is not None:
-
-    def _pushb2phases(pushop, bundler):
-        """adds phases update to the main bundle2 push"""
-        outgoing = pushop.outgoing
-        unfi = pushop.repo.unfiltered()
-        remotephases = pushop.remote.listkeys('phases')
-        publishing = remotephases.get('publishing', False)
-        ana = phases.analyzeremotephases(pushop.repo,
-                                         outgoing.commonheads,
-                                         remotephases)
-        pheads, droots = ana
-        revset = 'heads((%ln::%ln))'
-        if not publishing:
-            revset += ' and public()'
-        # Get the list of all revs draft on remote by public here.
-        # XXX Beware that revset break if droots is not strictly
-        # XXX root we may want to ensure it is but it is costly
-        fallback = list(unfi.set(revset, droots, outgoing.commonheads))
-        if not outgoing.missing:
-            future = fallback
-        else:
-            # adds changeset we are going to push as draft
-            #
-            # should not be necessary for pushblishing server, but because of
-            # an issue fixed in xxxxx we have to do it anyway.
-            fdroots = list(unfi.set('roots(%ln  + %ln::)', outgoing.missing, droots))
-            fdroots = [f.node() for f in fdroots]
-            future = list(unfi.set(revset, fdroots, outgoing.missingheads))
-
-        b2caps = bundle2.bundle2caps(pushop.remote)
-        if 'b2x:pushkey' not in b2caps:
-            return
-        pushop.stepsdone.add('phases')
-        part2node = []
-        enc = pushkey.encode
-        for newremotehead in future:
-            part = bundler.newpart('b2x:pushkey')
-            part.addparam('namespace', enc('phases'))
-            part.addparam('key', enc(newremotehead.hex()))
-            part.addparam('old', enc(str(phases.draft)))
-            part.addparam('new', enc(str(phases.public)))
-            part2node.append((part.id, newremotehead))
-        def handlereply(op):
-            for partid, pnode in part2node:
-                partrep = op.records.getreplies(partid)
-                results = partrep['pushkey']
-                assert len(results) <= 1
-                msg = None
-                if not results:
-                    msg = _('server ignored update of %s to public!\n') % pnode
-                elif not int(results[0]['return']):
-                    msg = _('updating %s to public failed!\n') % pnode
-                if msg is not None:
-                    pushop.ui.warn(msg)
-        return handlereply
-
-    def _pushb2obsmarker(pushop, bundler):
-        """adds obsmarker to the main bundle2 push"""
-        repo = pushop.repo
-        remote = pushop.remote
-        if ('obsmarkers' not in pushop.stepsdone
-            and (obsolete._enabled and repo.obsstore and
-                 'obsolete' in remote.listkeys('namespaces'))
-            and remote.capable('_evoext_b2x_obsmarkers_0')):
-            #
-            pushop.stepsdone.add('obsmarkers')
-            markers = _obsmarkersdiscovery(pushop)
-            if not markers:
-                obsexcmsg(repo.ui, "no marker to push\n")
-                obsexcmsg(repo.ui, "DONE\n")
-                return
-            obsdata = pushobsmarkerStringIO()
-            _encodemarkersstream(obsdata, markers)
-            obsdata.seek(0)
-            obsdata.ui = repo.ui
-            obsexcmsg(repo.ui, "pushing %i obsolescence markers (%i bytes)\n"
-                               % (len(markers), len(obsdata.getvalue())),
-                      True)
-            bundler.newpart('EVOLVE:B2X:OBSMARKERV1', data=obsdata)
-            def callback(op):
-                obsexcprg(repo.ui, None)
-                obsexcmsg(repo.ui, "DONE\n")
-            return callback
-    bundle2partsgenerators.append(_pushb2phases)
-    bundle2partsgenerators.append(_pushb2obsmarker)
-
-
 def _obsmarkersdiscovery(pushop):
     """return the list of marker that needs to be pushed to the server