Patchwork D2100: infinitepush: delete the bundle2 part ordering related to pushrebase

login
register
mail settings
Submitter phabricator
Date March 30, 2018, 7:52 p.m.
Message ID <0fb0954914c457ddd1549ad725d8012f@localhost.localdomain>
Download mbox | patch
Permalink /patch/29992/
State Not Applicable
Headers show

Comments

phabricator - March 30, 2018, 7:52 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG2fdc827f76ec: infinitepush: delete the bundle2 part ordering related to pushrebase (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2100?vs=5361&id=7415

REVISION DETAIL
  https://phab.mercurial-scm.org/D2100

AFFECTED FILES
  hgext/infinitepush/__init__.py

CHANGE DETAILS




To: pulkit, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/hgext/infinitepush/__init__.py b/hgext/infinitepush/__init__.py
--- a/hgext/infinitepush/__init__.py
+++ b/hgext/infinitepush/__init__.py
@@ -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)))