This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10414

bundle: support multiple destinations
ClosedPublic

Authored by marmoute on Apr 14 2021, 7:38 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG946db89607c8: bundle: support multiple destinations

Summary

hg outgoing and hg push now support multiple destination. We do the same
for hg bundle. Various other commands needs this kind of behavior and it
would be create to factor this code out for their usage. However this is an
adventure for another time.

They are some minor change to the tests (in addition to the new test for the
feature):

one because I updated a message to plurals,
another one because the error changed, and I actually find it clearer.

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

marmoute created this revision.Apr 14 2021, 7:38 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 14 2021, 7:38 PM

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

marmoute added a child revision: D10415: identify: use `get_unique_pull_path`.Apr 14 2021, 7:38 PM

marmoute updated this revision to Diff 26917.Apr 15 2021, 3:37 AM

pulkit added a subscriber: pulkit.Apr 15 2021, 11:13 AM

pulkit added inline comments.

hgext/patchbomb.py
386	should be `if dest` instead.

marmoute updated this revision to Diff 26968.Apr 16 2021, 4:52 AM

pulkit accepted this revision.Apr 17 2021, 4:50 PM

This revision is now accepted and ready to land.Apr 17 2021, 4:50 PM

marmoute added a commit: rHG946db89607c8: bundle: support multiple destinations.Apr 17 2021, 6:11 PM

Closed by commit rHG946db89607c8: bundle: support multiple destinations (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/patchbomb.py (5 lines)
M			mercurial/commands.py (69 lines)
M			tests/test-bundle-r.t (9 lines)
M			tests/test-exchange-multi-source.t (15 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26870		Apr 14 2021, 7:38 PM	★	★
Diff 2	26917		Apr 15 2021, 3:37 AM	★	★
Diff 3	26968		Apr 16 2021, 4:52 AM	★	★
Diff 4	26980	rHG946db89607c8802873c5a4457d07a937c316ee41	Apr 14 2021, 11:02 AM	★	★

Status	Author	Revision
Closed	marmoute	D10455 urlutil: provide some information about "bad url" when processing `pushurl`
Closed	marmoute	D10454 revset: document the `outgoing` behavior if the path resolve to multiple urls
Closed	marmoute	D10453 multi-urls: document the feature
Closed	marmoute	D10452 multi-urls: add a boolean suboption that unlock path specification as list
Closed	marmoute	D10451 urlutil: move url "fixing" at the time of `ui.paths` initialization
Closed	marmoute	D10450 path: teach the `hg path` command to display boolean sub-option
Closed	marmoute	D10449 parselist: move the function from config to stringutil
Closed	marmoute	D10448 bookmark: use `list_paths` to access path definition
Closed	marmoute	D10447 urlutil: make `paths` class old list of `path`
Closed	marmoute	D10446 urlutil: extract `chain_path` in a function
Closed	marmoute	D10445 urlutil: add a `copy` method to `path
Closed	marmoute	D10444 template: add a `paths` field to all entry in peerurls
Closed	marmoute	D10443 template: make an explicit closure for formatting entry in peerurls
Closed	marmoute	D10442 template: use `list_paths` in `peerurls`
Closed	marmoute	D10441 paths: use `list_paths` in `hg paths`
Closed	marmoute	D10440 urlutil: introduce a new `list_paths` function
Closed	marmoute	D10439 urlutil: deprecate `getpath`
Closed	marmoute	D10438 urlutil: inline the relevant part of `getpath` in `get_push_paths`
Closed	marmoute	D10437 url_util: introduce a `try_path` function
Abandoned	marmoute	D10436 perfphasesremote: use `get_unique_push_path` if available
Closed	marmoute	D10435 revset: drop an outdated comment
Closed	marmoute	D10432 ui: deprecated `ui.expandpath`
Closed	marmoute	D10431 urlutil: remove usage of `ui.expandpath` in `get_clone_path`
Closed	marmoute	D10430 urlutil: remove usage of `ui.expandpath` in `get_unique_pull_path`
Closed	marmoute	D10429 urlutil: remove usage of `ui.expandpath` in `get_pull_paths`
Closed	marmoute	D10428 debugbackupbundle: use `get_unique_pull_path`
Closed	marmoute	D10427 debugssl: use `get_unique_pull_path`
Closed	marmoute	D10426 debugdiscovery: use `get_unique_pull_path`
Closed	marmoute	D10425 profiling: use `util.expandpath` instead of `ui.expandpath` for output
Closed	marmoute	D10424 dispatch: use the new API to resolve --repository
Closed	marmoute	D10423 perf-discovery: use `get_unique_pull_path`
Closed	marmoute	D10422 revset: use `get_unique_pull_path` for `remote(…)`
Closed	marmoute	D10421 remotefilelog: use `get_unique_pull_path` in `getflogheads`
Closed	marmoute	D10420 summary: use the new APIs
Closed	marmoute	D10419 share: use `get_clone_path`
Closed	marmoute	D10418 init: use `get_clone_path` when suitable
Closed	marmoute	D10417 clone: use `get_clone_path`
Closed	marmoute	D10416 incoming: kill the `repo._subtoppath =` hack
Closed	marmoute	D10415 identify: use `get_unique_pull_path`
Closed	marmoute	D10414 bundle: support multiple destinations
Closed	marmoute	D10413 lfs: use the new APIs
Closed	marmoute	D10412 fastannotate: use `get_unique_pull_path`
Closed	marmoute	D10411 remotefilelog: use the right expandpath in to expand `~`
Closed	marmoute	D10410 transplant: use `get_unique_pull_path`
Closed	marmoute	D10456 infinitepush: use `get_unique_pull_path`
Closed	marmoute	D10409 relink: use `get_unique_pull_path`
Closed	marmoute	D10408 histedit: use `get_unique_push_path`
Closed	marmoute	D10407 urlutil: add a new `get_unique_push_path`
Closed	marmoute	D10406 fetch: use `get_unique_pull_path` to retrieve the path
Closed	marmoute	D10405 patchbomb: use `get_unique_pull_path`
Closed	marmoute	D10404 narrow: use `get_unique_pull_path`
Closed	marmoute	D10403 urlutil: add a new `get_unique_pull_path`
Closed	marmoute	D10402 mq: use the new `get_clone_path` to get the remote url
Closed	marmoute	D10401 urlutil: add a `get_clone_path` function
Closed	marmoute	D10393 outgoing: use `get_push_paths` in the revset too
Closed	marmoute	D10392 incoming: use `urlutil.get_pull_paths`
Closed	marmoute	D10391 outgoing: accept multiple destinations
Closed	marmoute	D10390 outgoing: pass subrepo path using function argument instead of abssource hack
Closed	marmoute	D10434 subrepo: introduce a `repo_rel_or_abs_source` function

Diff 26980

hgext/patchbomb.py

	"""			"""
	ui = repo.ui			ui = repo.ui
	tmpdir = pycompat.mkdtemp(prefix=b'hg-email-bundle-')			tmpdir = pycompat.mkdtemp(prefix=b'hg-email-bundle-')
	tmpfn = os.path.join(tmpdir, b'bundle')			tmpfn = os.path.join(tmpdir, b'bundle')
	btype = ui.config(b'patchbomb', b'bundletype')			btype = ui.config(b'patchbomb', b'bundletype')
	if btype:			if btype:
	opts['type'] = btype			opts['type'] = btype
	try:			try:
	commands.bundle(ui, repo, tmpfn, dest, **opts)			dests = []
				if dest:
				pulkitUnsubmitted Not Done should be `if dest` instead. pulkit: should be `if dest` instead.
				dests = [dest]
				commands.bundle(ui, repo, tmpfn, dests, *opts)
	return util.readfile(tmpfn)			return util.readfile(tmpfn)
	finally:			finally:
	try:			try:
	os.unlink(tmpfn)			os.unlink(tmpfn)
	except OSError:			except OSError:
	pass			pass
	os.rmdir(tmpdir)			os.rmdir(tmpdir)

mercurial/commands.py

This file is larger than 256 KB, so syntax highlighting is disabled by default.

	b't',			b't',
	b'type',			b'type',
	b'bzip2',			b'bzip2',
	_(b'bundle compression type to use'),			_(b'bundle compression type to use'),
	_(b'TYPE'),			_(b'TYPE'),
	),			),
	]			]
	+ remoteopts,			+ remoteopts,
	_(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]'),			_(b'[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...'),
	helpcategory=command.CATEGORY_IMPORT_EXPORT,			helpcategory=command.CATEGORY_IMPORT_EXPORT,
	)			)
	def bundle(ui, repo, fname, dest=None, **opts):			def bundle(ui, repo, fname, dests, *opts):
	"""create a bundle file			"""create a bundle file

	Generate a bundle file containing data to be transferred to another			Generate a bundle file containing data to be transferred to another
	repository.			repository.

	To create a bundle containing all changesets, use -a/--all			To create a bundle containing all changesets, use -a/--all
	(or --base null). Otherwise, hg assumes the destination will have			(or --base null). Otherwise, hg assumes the destination will have
	all the nodes you specify with --base parameters. Otherwise, hg			all the nodes you specify with --base parameters. Otherwise, hg
	will assume the repository has all the nodes in destination, or			will assume the repository has all the nodes in destination, or
	default-push/default if no destination is specified, where destination			default-push/default if no destination is specified, where destination
	is the repository you provide through DEST option.			is the repositories you provide through DEST option.

	You can change bundle format with the -t/--type option. See			You can change bundle format with the -t/--type option. See
	:hg:`help bundlespec` for documentation on this format. By default,			:hg:`help bundlespec` for documentation on this format. By default,
	the most appropriate format is used and compression defaults to			the most appropriate format is used and compression defaults to
	bzip2.			bzip2.

	The bundle file can then be transferred using conventional means			The bundle file can then be transferred using conventional means
	and applied to another repository with the unbundle or pull			and applied to another repository with the unbundle or pull
	# Packed bundles are a pseudo bundle format for now.			# Packed bundles are a pseudo bundle format for now.
	if cgversion == b's1':			if cgversion == b's1':
	raise error.InputError(			raise error.InputError(
	_(b'packed bundles cannot be produced by "hg bundle"'),			_(b'packed bundles cannot be produced by "hg bundle"'),
	hint=_(b"use 'hg debugcreatestreamclonebundle'"),			hint=_(b"use 'hg debugcreatestreamclonebundle'"),
	)			)

	if opts.get(b'all'):			if opts.get(b'all'):
	if dest:			if dests:
	raise error.InputError(			raise error.InputError(
	_(b"--all is incompatible with specifying a destination")			_(b"--all is incompatible with specifying destinations")
	)			)
	if opts.get(b'base'):			if opts.get(b'base'):
	ui.warn(_(b"ignoring --base because --all was specified\n"))			ui.warn(_(b"ignoring --base because --all was specified\n"))
	base = [nullrev]			base = [nullrev]
	else:			else:
	base = scmutil.revrange(repo, opts.get(b'base'))			base = scmutil.revrange(repo, opts.get(b'base'))
	if cgversion not in changegroup.supportedoutgoingversions(repo):			if cgversion not in changegroup.supportedoutgoingversions(repo):
	raise error.Abort(			raise error.Abort(
	_(b"repository does not support bundle version %s") % cgversion			_(b"repository does not support bundle version %s") % cgversion
	)			)

	if base:			if base:
	if dest:			if dests:
	raise error.InputError(			raise error.InputError(
	_(b"--base is incompatible with specifying a destination")			_(b"--base is incompatible with specifying destinations")
	)			)
	common = [repo[rev].node() for rev in base]			common = [repo[rev].node() for rev in base]
	heads = [repo[r].node() for r in revs] if revs else None			heads = [repo[r].node() for r in revs] if revs else None
	outgoing = discovery.outgoing(repo, common, heads)			outgoing = discovery.outgoing(repo, common, heads)
				missing = outgoing.missing
				excluded = outgoing.excluded
	else:			else:
	dest = ui.expandpath(dest or b'default-push', dest or b'default')			missing = set()
	dest, branches = urlutil.parseurl(dest, opts.get(b'branch'))			excluded = set()
	other = hg.peer(repo, opts, dest)			for path in urlutil.get_push_paths(repo, ui, dests):
	revs = [repo[r].hex() for r in revs]			other = hg.peer(repo, opts, path.rawloc)
	revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)			if revs is not None:
	heads = revs and pycompat.maplist(repo.lookup, revs) or revs			hex_revs = [repo[r].hex() for r in revs]
				else:
				hex_revs = None
				branches = (path.branch, [])
				head_revs, checkout = hg.addbranchrevs(
				repo, repo, branches, hex_revs
				)
				heads = (
				head_revs
				and pycompat.maplist(repo.lookup, head_revs)
				or head_revs
				)
	outgoing = discovery.findcommonoutgoing(			outgoing = discovery.findcommonoutgoing(
	repo,			repo,
	other,			other,
	onlyheads=heads,			onlyheads=heads,
	force=opts.get(b'force'),			force=opts.get(b'force'),
	portable=True,			portable=True,
	)			)
				missing.update(outgoing.missing)
				excluded.update(outgoing.excluded)

	if not outgoing.missing:			if not missing:
	scmutil.nochangesfound(ui, repo, not base and outgoing.excluded)			scmutil.nochangesfound(ui, repo, not base and excluded)
	return 1			return 1

				if heads:
				outgoing = discovery.outgoing(
				repo, missingroots=missing, ancestorsof=heads
				)
				else:
				outgoing = discovery.outgoing(repo, missingroots=missing)
				outgoing.excluded = sorted(excluded)

	if cgversion == b'01': # bundle1			if cgversion == b'01': # bundle1
	bversion = b'HG10' + bundlespec.wirecompression			bversion = b'HG10' + bundlespec.wirecompression
	bcompression = None			bcompression = None
	elif cgversion in (b'02', b'03'):			elif cgversion in (b'02', b'03'):
	bversion = b'HG20'			bversion = b'HG20'
	bcompression = bundlespec.wirecompression			bcompression = bundlespec.wirecompression
	else:			else:
	raise error.ProgrammingError(			raise error.ProgrammingError(

tests/test-bundle-r.t

	checked 9 changesets with 7 changes to 4 files			checked 9 changesets with 7 changes to 4 files
	$ hg rollback			$ hg rollback
	repository tip rolled back to revision 4 (undo pull)			repository tip rolled back to revision 4 (undo pull)
	$ cd ..			$ cd ..

	should fail			should fail

	$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3			$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg test-3
	abort: --base is incompatible with specifying a destination			abort: --base is incompatible with specifying destinations
	[10]			[10]
	$ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3			$ hg -R test bundle -a -r tip test-bundle-branch1.hg test-3
	abort: --all is incompatible with specifying a destination			abort: --all is incompatible with specifying destinations
	[10]			[10]
	$ hg -R test bundle -r tip test-bundle-branch1.hg			$ hg -R test bundle -r tip test-bundle-branch1.hg
	abort: repository default-push not found			config error: default repository not configured!
	[255]			(see 'hg help config.paths')
				[30]

	$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg			$ hg -R test bundle --base 2 -r tip test-bundle-branch1.hg
	2 changesets found			2 changesets found
	$ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg			$ hg -R test bundle --base 2 -r 7 test-bundle-branch2.hg
	4 changesets found			4 changesets found
	$ hg -R test bundle --base 2 test-bundle-all.hg			$ hg -R test bundle --base 2 test-bundle-all.hg
	6 changesets found			6 changesets found
	$ hg -R test bundle --base 2 --all test-bundle-all-2.hg			$ hg -R test bundle --base 2 --all test-bundle-all-2.hg

tests/test-exchange-multi-source.t

	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: D			\| summary: D
	\|			\|
	o changeset: 2:f838bfaca5c7			o changeset: 2:f838bfaca5c7
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: C			summary: C

				$ hg bundle -R test-repo-bare bundle.hg ./branch-E-push ./branch-G-push ./branch-H-push
				searching for changes
				searching for changes
				searching for changes
				6 changesets found
	$ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push			$ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push
	pushing to ./branch-E-push			pushing to ./branch-E-push
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 3 changesets with 3 changes to 3 files (+2 heads)			added 3 changesets with 3 changes to 3 files (+2 heads)
	pushing to ./branch-G-push			pushing to ./branch-G-push
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: H			\| summary: H
	\|			\|
	o changeset: 2:f838bfaca5c7			o changeset: 2:f838bfaca5c7
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: C			summary: C

				$ hg bundle -R test-repo-bare bundle.hg ./branch-E-push ./branch-G-push ./branch-H-push --rev default
				searching for changes
				searching for changes
				searching for changes
				2 changesets found
	$ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default			$ hg push --force -R test-repo-bare ./branch-E-push ./branch-G-push ./branch-H-push --rev default
	pushing to ./branch-E-push			pushing to ./branch-E-push
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 1 changesets with 1 changes to 1 files (+1 heads)			added 1 changesets with 1 changes to 1 files (+1 heads)
	pushing to ./branch-G-push			pushing to ./branch-G-push
	\| date: Thu Jan 01 00:00:00 1970 +0000			\| date: Thu Jan 01 00:00:00 1970 +0000
	\| summary: H			\| summary: H
	\|			\|
	o changeset: 2:f838bfaca5c7			o changeset: 2:f838bfaca5c7
	user: test			user: test
	date: Thu Jan 01 00:00:00 1970 +0000			date: Thu Jan 01 00:00:00 1970 +0000
	summary: C			summary: C

				$ hg bundle -R test-repo-bare bundle.hg ./branch-G-push ./branch-H-push ./branch-E-push --rev default
				searching for changes
				searching for changes
				searching for changes
				2 changesets found
	$ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default			$ hg push --force -R test-repo-bare ./branch-G-push ./branch-H-push ./branch-E-push --rev default
	pushing to ./branch-G-push			pushing to ./branch-G-push
	searching for changes			searching for changes
	adding changesets			adding changesets
	adding manifests			adding manifests
	adding file changes			adding file changes
	added 2 changesets with 2 changes to 2 files (+1 heads)			added 2 changesets with 2 changes to 2 files (+1 heads)
	pushing to ./branch-H-push			pushing to ./branch-H-push