This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10402

mq: use the new `get_clone_path` to get the remote url
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGae4c0f279282: mq: use the new `get_clone_path` to get the remote url

Summary

We stop using ui.expandpath to use a function with a more defined semantic. This will help us to make it an option to point [paths] entry to multiple destination.

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: D10403: urlutil: add a new `get_unique_pull_path`.Apr 14 2021, 7:37 PM

pulkit accepted this revision.Apr 15 2021, 7:47 AM

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

marmoute added a commit: rHGae4c0f279282: mq: use the new `get_clone_path` to get the remote url.Apr 15 2021, 9:45 AM

Closed by commit rHGae4c0f279282: mq: use the new `get_clone_path` to get the remote url (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/mq.py (5 lines)

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 26937

hgext/mq.py

	url = repo.url()			url = repo.url()
	if url.endswith(b'/'):			if url.endswith(b'/'):
	url = url[:-1]			url = url[:-1]
	return url + b'/.hg/patches'			return url + b'/.hg/patches'

	# main repo (destination and sources)			# main repo (destination and sources)
	if dest is None:			if dest is None:
	dest = hg.defaultdest(source)			dest = hg.defaultdest(source)
	sr = hg.peer(ui, opts, ui.expandpath(source))			__, source_path, __ = urlutil.get_clone_path(ui, source)
				sr = hg.peer(ui, opts, source_path)

	# patches repo (source only)			# patches repo (source only)
	if opts.get(b'patches'):			if opts.get(b'patches'):
	patchespath = ui.expandpath(opts.get(b'patches'))			__, patchespath, __ = urlutil.get_clone_path(ui, opts.get(b'patches'))
	else:			else:
	patchespath = patchdir(sr)			patchespath = patchdir(sr)
	try:			try:
	hg.peer(ui, opts, patchespath)			hg.peer(ui, opts, patchespath)
	except error.RepoError:			except error.RepoError:
	raise error.Abort(			raise error.Abort(
	_(b'versioned patch repository not found (see init --mq)')			_(b'versioned patch repository not found (see init --mq)')
	)			)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26858		Apr 14 2021, 7:37 PM	★	★
Diff 2	26937	rHGae4c0f279282cc8838555fef56eaf615df2f6b3b	Apr 14 2021, 4:51 AM	★	★