This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2105

infinitepush: drop hack related to --to, --create flags of remotenames-ext
ClosedPublic

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

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG14acab54e08b: infinitepush: drop hack related to --to, --create flags of remotenames-ext

Summary

The remotenames extension has --to, --create. --allow-anon flags which won't be
ported to core. This patch drops the hack which fixes the interaction with
remotenames-ext during push.

In upcoming patches, --to and --create extensions will be removed from
infinitepush also.

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:46 AM

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

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

pulkit added a child revision: D2106: infinitepush: drop logic related to treemanifest extension.Feb 9 2018, 6:46 AM

indygreg accepted this revision.Feb 9 2018, 10:07 PM

This revision is now accepted and ready to land.Feb 9 2018, 10:07 PM

Closed by commit rHG14acab54e08b: infinitepush: drop hack related to --to, --create flags of remotenames-ext (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 (10 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 7420

hgext/infinitepush/init.py


	oldphasemove = None			oldphasemove = None
	overrides = {(experimental, configbookmark): bookmark,			overrides = {(experimental, configbookmark): bookmark,
	(experimental, configcreate): create}			(experimental, configcreate): create}

	with ui.configoverride(overrides, 'infinitepush'):			with ui.configoverride(overrides, 'infinitepush'):
	scratchpush = opts.get('bundle_store')			scratchpush = opts.get('bundle_store')
	if _scratchbranchmatcher(bookmark):			if _scratchbranchmatcher(bookmark):
	# Hack to fix interaction with remotenames. Remotenames push
	# '--to' bookmark to the server but we don't want to push scratch
	# bookmark to the server. Let's delete '--to' and '--create' and
	# also set allow_anon to True (because if --to is not set
	# remotenames will think that we are pushing anonymoush head)
	if 'to' in opts:
	del opts['to']
	if 'create' in opts:
	del opts['create']
	opts['allow_anon'] = True
	scratchpush = True			scratchpush = True
	# bundle2 can be sent back after push (for example, bundle2			# bundle2 can be sent back after push (for example, bundle2
	# containing `pushkey` part to update bookmarks)			# containing `pushkey` part to update bookmarks)
	ui.setconfig(experimental, 'bundle2.pushback', True)			ui.setconfig(experimental, 'bundle2.pushback', True)

	ui.setconfig(experimental, confignonforwardmove,			ui.setconfig(experimental, confignonforwardmove,
	opts.get('non_forward_move'), '--non-forward-move')			opts.get('non_forward_move'), '--non-forward-move')
	if scratchpush:			if scratchpush:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	5366		Feb 9 2018, 6:46 AM	★	★
Diff 2	7420	rHG14acab54e08b7f72babeb4bcaeda63bd5a1d092f	Feb 9 2018, 3:26 AM	★	★