This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10411

remotefilelog: use the right expandpath in to expand `~`
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGc1749dd31cdf: remotefilelog: use the right expandpath in to expand `~`

Summary

Given the context where path is most likely a file system path, I suspect that
the initial author confused ui.expandpath and util.expandpath (a proxy for
os.path.expanduser and co)

Diff Detail

Repository

rHG Mercurial

Branch

default

Lint

No Linters Available

Unit

No Unit Test Coverage

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: D10412: fastannotate: use `get_unique_pull_path`.Apr 14 2021, 7:38 PM

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

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

marmoute added a commit: rHGc1749dd31cdf: remotefilelog: use the right expandpath in to expand `~`.Apr 17 2021, 6:11 PM

Closed by commit rHGc1749dd31cdf: remotefilelog: use the right expandpath in to expand `~` (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/remotefilelog/__init__.py (2 lines)

Commit	Parents	Author	Summary	Date
57063248c5bb	c1d1a143931b	Pierre-Yves David		Apr 14 2021, 6: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 26867

hgext/remotefilelog/init.py

	count = 0			count = 0
	progress = ui.makeprogress(			progress = ui.makeprogress(
	_(b"analyzing repositories"), unit=b"repos", total=len(repos)			_(b"analyzing repositories"), unit=b"repos", total=len(repos)
	)			)
	for path in repos:			for path in repos:
	progress.update(count)			progress.update(count)
	count += 1			count += 1
	try:			try:
	path = ui.expandpath(os.path.normpath(path))			path = util.expandpath(os.path.normpath(path))
	except TypeError as e:			except TypeError as e:
	ui.warn(_(b"warning: malformed path: %r:%s\n") % (path, e))			ui.warn(_(b"warning: malformed path: %r:%s\n") % (path, e))
	traceback.print_exc()			traceback.print_exc()
	continue			continue
	try:			try:
	peer = hg.peer(ui, {}, path)			peer = hg.peer(ui, {}, path)
	repo = peer._repo			repo = peer._repo
	except error.RepoError:			except error.RepoError:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26867		Apr 14 2021, 7:38 PM	★	★
Diff 2	26977	rHGc1749dd31cdfee20926465d57d4a5a40a2fb2ebc	Apr 14 2021, 6:57 AM	★	★