This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2100

infinitepush: delete the bundle2 part ordering related to pushrebase
ClosedPublic

Authored by pulkit on Feb 9 2018, 6:45 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG2fdc827f76ec: infinitepush: delete the bundle2 part ordering related to pushrebase
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 9 2018, 6:45 AM
indygreg accepted this revision.Feb 9 2018, 10:05 PM
This revision is now accepted and ready to land.Feb 9 2018, 10:05 PM
Closed by commit rHG2fdc827f76ec: infinitepush: delete the bundle2 part ordering related to pushrebase (authored by pulkit). · Explain WhyMar 30 2018, 3:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/infinitepush/__init__.py (5 lines)

Diff 7415

hgext/infinitepush/__init__.py

) )
configitem('experimental', 'infinitepush-scratchpush', configitem('experimental', 'infinitepush-scratchpush',
default=False, default=False,
) )
configitem('experimental', 'non-forward-move', configitem('experimental', 'non-forward-move',
default=False, default=False,
) )
pushrebaseparttype = 'b2x:rebase'
experimental = 'experimental' experimental = 'experimental'
configbookmark = 'server-bundlestore-bookmark' configbookmark = 'server-bundlestore-bookmark'
configcreate = 'server-bundlestore-create' configcreate = 'server-bundlestore-create'
configscratchpush = 'infinitepush-scratchpush' configscratchpush = 'infinitepush-scratchpush'
confignonforwardmove = 'non-forward-move' confignonforwardmove = 'non-forward-move'
scratchbranchparttype = bundleparts.scratchbranchparttype scratchbranchparttype = bundleparts.scratchbranchparttype
cmdtable = infinitepushcommands.cmdtable cmdtable = infinitepushcommands.cmdtable
extensions.wrapcommand(commands.table, 'pull', _pull) extensions.wrapcommand(commands.table, 'pull', _pull)
extensions.wrapcommand(commands.table, 'update', _update) extensions.wrapcommand(commands.table, 'update', _update)
extensions.wrapfunction(discovery, 'checkheads', _checkheads) extensions.wrapfunction(discovery, 'checkheads', _checkheads)
extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts) extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts)
wireproto.wirepeer.listkeyspatterns = listkeyspatterns wireproto.wirepeer.listkeyspatterns = listkeyspatterns
# Move infinitepush part before pushrebase part
# to avoid generation of both parts.
partorder = exchange.b2partsgenorder partorder = exchange.b2partsgenorder
index = partorder.index('changeset') index = partorder.index('changeset')
if pushrebaseparttype in partorder:
index = min(index, partorder.index(pushrebaseparttype))
partorder.insert( partorder.insert(
index, partorder.pop(partorder.index(scratchbranchparttype))) index, partorder.pop(partorder.index(scratchbranchparttype)))
def _showbookmarks(ui, bookmarks, **opts): def _showbookmarks(ui, bookmarks, **opts):
# Copy-paste from commands.py # Copy-paste from commands.py
fm = ui.formatter('bookmarks', opts) fm = ui.formatter('bookmarks', opts)
for bmark, n in sorted(bookmarks.iteritems()): for bmark, n in sorted(bookmarks.iteritems()):
fm.startitem() fm.startitem()