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.

Download Raw Diff

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

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 9 2018, 6:45 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 9 2018, 6:45 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

pulkit added a child revision: D2101: infinitepush: remove wrapping around bundle2._addpartsfromopts().Feb 9 2018, 6:46 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

			Path	Packages
M			hgext/infinitepush/__init__.py (5 lines)

Status	Author	Revision
Closed	pulkit	D2958 infinitepush: introduce server option to route every push to bundlestore
Closed	pulkit	D2957 infinitepush: don't wrap bundle2.processparts while calling `hg unbundle`
Closed	pulkit	D2956 inifnitepush: use utils.{stringutil\|procutil}.* instead of util.*
Closed	pulkit	D2955 infinitpush: delete the non-forward-move flag for hg push
Closed	pulkit	D2954 infinitepush: drop the wrapping of update command on client side
Closed	pulkit	D2953 infinitepush: delete infinitepushcommands.py and related tests
Closed	pulkit	D2952 infinitepush: delete infinitepush.fillmetadatabranchpattern config option
Closed	pulkit	D2108 infinitepush: drop the `--to` flag to push and use `-B` instead
Closed	pulkit	D2107 infinitepush: drop the `--create` flag to push command
Closed	pulkit	D2106 infinitepush: drop logic related to treemanifest extension
Closed	pulkit	D2105 infinitepush: drop hack related to --to, --create flags of remotenames-ext
Closed	pulkit	D2104 infinitepush: drop error handling while pushing to svn server
Closed	pulkit	D2103 infinitepush: drop `--list-remote`, `--remote-path` flags to bookmark cmd
Closed	pulkit	D2102 infinitepush: drop the scratchbookmarksparttype bundle2 part
Closed	pulkit	D2101 infinitepush: remove wrapping around bundle2._addpartsfromopts()
Closed	pulkit	D2100 infinitepush: delete the bundle2 part ordering related to pushrebase
Closed	pulkit	D2099 infinitepush: delete the hack to load the extension after remotenames
Closed	pulkit	D2098 infinitepush: drop the logic related to inhibit extension
Closed	pulkit	D2097 infinitepush: remove backupcommands.py
Closed	pulkit	D2096 infinitepush: move the extension to core from fb-hgext

Diff 5361

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()

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5361		Feb 9 2018, 6:45 AM	★	★
Diff 2	7415	rHG2fdc827f76ec4cc8c26d454d1240cdc03fe4d31e	Feb 8 2018, 6:42 AM	★	★