This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10407

urlutil: add a new `get_unique_push_path`
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG368294967c95: urlutil: add a new `get_unique_push_path`

Summary

This function is dedicated to call that needs a single destination. Currently
most caller actually need that since few actually support multiple destinations
(the most importants hg push and hg outgoing do). So having a clear API
point for that will be important when the time comes to have a single [paths]
alias resolving to multiple urls.

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:37 PM

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

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

marmoute added a child revision: D10408: histedit: use `get_unique_push_path`.Apr 14 2021, 7:37 PM

This needs a better commit message and description.

This revision now requires changes to proceed.Apr 15 2021, 7:49 AM

In D10407#158466, @pulkit wrote:

This needs a better commit message and description.

woops, looks like I forgot that one while writing description.

marmoute retitled this revision from get_unique_push_path to urlutil: add a new `get_unique_push_path`.Apr 15 2021, 10:37 AM

marmoute edited the summary of this revision. (Show Details)

marmoute updated this revision to Diff 26942.

This should be fixed

pulkit accepted this revision.Apr 15 2021, 11:07 AM

pulkit added inline comments.

mercurial/utils/urlutil.py
489	`AssertionError` does not look friendly here. Can you follow up with `error.Abort()` or something else here?

This revision is now accepted and ready to land.Apr 15 2021, 11:07 AM

marmoute added inline comments.Apr 16 2021, 5:15 AM

mercurial/utils/urlutil.py
489	This is made into a proper error late down the stack. When this get in an actual risk of being multiple value.

marmoute added a commit: rHG368294967c95: urlutil: add a new `get_unique_push_path`.Apr 17 2021, 6:11 PM

Closed by commit rHG368294967c95: urlutil: add a new `get_unique_push_path` (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/utils/urlutil.py (19 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26863		Apr 14 2021, 7:37 PM	★	★
Diff 2	26942		Apr 15 2021, 10:37 AM	★	★
Diff 3	26972	rHG368294967c9532721c9b448fbe419bdb832e9d88	Apr 14 2021, 5:57 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 26972

mercurial/utils/urlutil.py

	"""yields all the `(path, branch)` selected as pull source by `sources`"""			"""yields all the `(path, branch)` selected as pull source by `sources`"""
	if not sources:			if not sources:
	sources = [b'default']			sources = [b'default']
	for source in sources:			for source in sources:
	url = ui.expandpath(source)			url = ui.expandpath(source)
	yield parseurl(url, default_branches)			yield parseurl(url, default_branches)


				def get_unique_push_path(action, repo, ui, dest=None):
				"""return a unique `path` or abort if multiple are found

				This is useful for command and action that does not support multiple
				destination (yet).

				Note that for now, we cannot get multiple destination so this function is "trivial".

				The `action` parameter will be used for the error message.
				"""
				if dest is None:
				dests = []
				else:
				dests = [dest]
				dests = list(get_push_paths(repo, ui, dests))
				assert len(dests) == 1
				pulkitUnsubmitted Not Done `AssertionError` does not look friendly here. Can you follow up with `error.Abort()` or something else here? pulkit: `AssertionError` does not look friendly here. Can you follow up with `error.Abort()` or…
				marmouteAuthorUnsubmitted Done This is made into a proper error late down the stack. When this get in an actual risk of being multiple value. marmoute: This is made into a proper error late down the stack. When this get in an actual risk of being…
				return dests[0]


	def get_unique_pull_path(action, repo, ui, source=None, default_branches=()):			def get_unique_pull_path(action, repo, ui, source=None, default_branches=()):
	"""return a unique `(path, branch)` or abort if multiple are found			"""return a unique `(path, branch)` or abort if multiple are found

	This is useful for command and action that does not support multiple			This is useful for command and action that does not support multiple
	destination (yet).			destination (yet).

	Note that for now, we cannot get multiple destination so this function is "trivial".			Note that for now, we cannot get multiple destination so this function is "trivial".