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

login
register
mail settings
Submitter phabricator
Date Feb. 9, 2018, 11:45 a.m.
Message ID <differential-rev-PHID-DREV-z2xe2q526mogsajsqaym-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27502/
State New
Headers show

Comments

phabricator - Feb. 9, 2018, 11:45 a.m.
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  hgext/infinitepush/__init__.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
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)))