This is an archive of the discontinued Mercurial Phabricator instance.

hgext/largefiles/storefactory.py
43–44	I was a bit confused about the comment initially, but I now understand is probably about the fact `ui.expandpath(b'default')` would return `b'default'` if no default path is defined. However the comment does not match the code I replaced. Since I already document the "issue" in `urlutil` (later in the series) I'll mostly drop this comment.

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

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

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

marmoute added a commit: rHG3f29765e0d95: lfs: use the new APIs.Apr 17 2021, 6:11 PM

Closed by commit rHG3f29765e0d95: lfs: use the new APIs (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/largefiles/storefactory.py (24 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26869		Apr 14 2021, 7:38 PM	★	★
Diff 2	26916		Apr 15 2021, 3:37 AM	★	★
Diff 3	26979	rHG3f29765e0d9520135c9712ff48eff061c545cd6e	Apr 14 2021, 8:35 AM	★	★

Commit	Parents	Author	Summary	Date
d7aae525fca0	a1a302c20b78	Pierre-Yves David		Apr 14 2021, 8:35 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 26916

hgext/largefiles/storefactory.py

	)			)

	from . import (			from . import (
	lfutil,			lfutil,
	localstore,			localstore,
	wirestore,			wirestore,
	)			)


	# During clone this function is passed the src's ui object			# During clone this function is passed the src's ui object
	# but it needs the dest's ui object so it can read out of			# but it needs the dest's ui object so it can read out of
	# the config file. Use repo.ui instead.			# the config file. Use repo.ui instead.
	def openstore(repo=None, remote=None, put=False, ui=None):			def openstore(repo=None, remote=None, put=False, ui=None):
	if ui is None:			if ui is None:
	ui = repo.ui			ui = repo.ui

	if not remote:			if not remote:
	lfpullsource = getattr(repo, 'lfpullsource', None)			lfpullsource = getattr(repo, 'lfpullsource', None)
	if lfpullsource:			if put:
	path = ui.expandpath(lfpullsource)			path = urlutil.get_unique_push_path(
	elif put:			b'lfpullsource', repo, ui, lfpullsource
	path = ui.expandpath(b'default-push', b'default')			)
	else:			else:
	path = ui.expandpath(b'default')			path, _branches = urlutil.get_unique_pull_path(
				b'lfpullsource', repo, ui, lfpullsource
				)

	# ui.expandpath() leaves 'default-push' and 'default' alone if			# XXX we should not explicitly pass b'default', as this will result in
				mharbison72Unsubmitted Not Done Probably should update the comment too, now that the named function is gone. mharbison72: Probably should update the comment too, now that the named function is gone.
				marmouteAuthorUnsubmitted Done I was a bit confused about the comment initially, but I now understand is probably about the fact `ui.expandpath(b'default')` would return `b'default'` if no default path is defined. However the comment does not match the code I replaced. Since I already document the "issue" in `urlutil` (later in the series) I'll mostly drop this comment. marmoute: I was a bit confused about the comment initially, but I now understand is probably about the…
	# they cannot be expanded: fallback to the empty string,			# b'default' being returned if no `paths.default` was defined. We
	# meaning the current directory.			# should explicitely handle the lack of value instead.
	if repo is None:			if repo is None:
	path = ui.expandpath(b'default')			path, _branches = urlutil.get_unique_pull_path(
	path, _branches = urlutil.parseurl(path)			b'lfs', repo, ui, b'default'
				)
	remote = hg.peer(repo or ui, {}, path)			remote = hg.peer(repo or ui, {}, path)
	elif path == b'default-push' or path == b'default':			elif path == b'default-push' or path == b'default':
	remote = repo			remote = repo
	else:			else:
	path, _branches = urlutil.parseurl(path)			path, _branches = urlutil.parseurl(path)
	remote = hg.peer(repo or ui, {}, path)			remote = hg.peer(repo or ui, {}, path)

	# The path could be a scheme so use Mercurial's normal functionality			# The path could be a scheme so use Mercurial's normal functionality

This is an archive of the discontinued Mercurial Phabricator instance.

lfs: use the new APIsClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 26916

hgext/largefiles/storefactory.py

lfs: use the new APIs
ClosedPublic

Revision Contents
Changeset List