# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1518090173 -19800
# Node ID 2fdc827f76ec4cc8c26d454d1240cdc03fe4d31e
# Parent  ecdd8c3044de85e3dfc3eaeb441959f65503cbd7
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

diff -r ecdd8c3044de -r 2fdc827f76ec hgext/infinitepush/__init__.py
--- 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)))