Patchwork [9,of,9] bundle2-push: drop _pushbundle2extraparts

login
register
mail settings
Submitter Pierre-Yves David
Date July 7, 2014, 11:02 a.m.
Message ID <b88b3a7e5607d461607f.1404730927@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/5125/
State Accepted
Commit 08dcb572a45668599ba82bdaf1940d373660b562
Headers show

Comments

Pierre-Yves David - July 7, 2014, 11:02 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1404308859 -7200
#      Wed Jul 02 15:47:39 2014 +0200
# Node ID b88b3a7e5607d461607f5024dcc8b4353664fa9c
# Parent  7c50830429c7c6f19fdc87d91e156cccdb81a9c8
bundle2-push: drop _pushbundle2extraparts

All core user are now using the new way. We drop the old way.
Matt Mackall - July 17, 2014, 10:51 p.m.
On Mon, 2014-07-07 at 13:02 +0200, pierre-yves.david@ens-lyon.org wrote:
> # HG changeset patch
> # User Pierre-Yves David <pierre-yves.david@fb.com>
> # Date 1404308859 -7200
> #      Wed Jul 02 15:47:39 2014 +0200
> # Node ID b88b3a7e5607d461607f5024dcc8b4353664fa9c
> # Parent  7c50830429c7c6f19fdc87d91e156cccdb81a9c8
> bundle2-push: drop _pushbundle2extraparts

These are queued for default, thanks.

Patch

diff --git a/mercurial/exchange.py b/mercurial/exchange.py
--- a/mercurial/exchange.py
+++ b/mercurial/exchange.py
@@ -237,11 +237,10 @@  def _pushbundle2(pushop):
     evolve in the future."""
     bundler = bundle2.bundle20(pushop.ui, bundle2.bundle2caps(pushop.remote))
     # create reply capability
     capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
     bundler.newpart('b2x:replycaps', data=capsblob)
-    extrainfo = _pushbundle2extraparts(pushop, bundler)
     replyhandlers = []
     for partgen in bundle2partsgenerators:
         ret = partgen(pushop, bundler)
         replyhandlers.append(ret)
     # do not push if nothing to push
@@ -256,25 +255,10 @@  def _pushbundle2(pushop):
         op = bundle2.processbundle(pushop.repo, reply)
     except error.BundleValueError, exc:
         raise util.Abort('missing support for %s' % exc)
     for rephand in replyhandlers:
         rephand(op)
-    _pushbundle2extrareply(pushop, op, extrainfo)
-
-def _pushbundle2extraparts(pushop, bundler):
-    """hook function to let extensions add parts
-
-    Return a dict to let extensions pass data to the reply processing.
-    """
-    return {}
-
-def _pushbundle2extrareply(pushop, op, extrainfo):
-    """hook function to let extensions react to part replies
-
-    The dict from _pushbundle2extrareply is fed to this function.
-    """
-    pass
 
 def _pushchangeset(pushop):
     """Make the actual push of changeset bundle to remote repo"""
     if 'changesets' in pushop.stepsdone:
         return