changeset 37191:2fdc827f76ec

infinitepush: delete the bundle2 part ordering related to pushrebase pushrebase is another Facebook extension which does not live in core yet. So let's remove the logic which make sures infinitepush part is moved before the pushrebase one. Differential Revision: https://phab.mercurial-scm.org/D2100
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 08 Feb 2018 17:12:53 +0530
parents ecdd8c3044de
children e702ca152b33
files hgext/infinitepush/__init__.py
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/infinitepush/__init__.py	Thu Feb 08 17:09:24 2018 +0530
+++ b/hgext/infinitepush/__init__.py	Thu Feb 08 17:12:53 2018 +0530
@@ -190,7 +190,6 @@
     default=False,
 )
 
-pushrebaseparttype = 'b2x:rebase'
 experimental = 'experimental'
 configbookmark = 'server-bundlestore-bookmark'
 configcreate = 'server-bundlestore-create'
@@ -365,12 +364,8 @@
 
     wireproto.wirepeer.listkeyspatterns = listkeyspatterns
 
-    # Move infinitepush part before pushrebase part
-    # to avoid generation of both parts.
     partorder = exchange.b2partsgenorder
     index = partorder.index('changeset')
-    if pushrebaseparttype in partorder:
-        index = min(index, partorder.index(pushrebaseparttype))
     partorder.insert(
         index, partorder.pop(partorder.index(scratchbranchparttype)))