This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10413

lfs: use the new APIs
ClosedPublic

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

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3f29765e0d95: lfs: use the new APIs
Summary

The part of the lfs store that requires a destination cannot operate on multiple destination (yet). So we move them to the dedicated APIs.

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
mharbison72 added a subscriber: mharbison72.Apr 14 2021, 9:47 PM
mharbison72 added inline comments.
hgext/largefiles/storefactory.py
43–44

Probably should update the comment too, now that the named function is gone.

marmoute added inline comments.Apr 15 2021, 3:28 AM
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

PathPackages
Mhgext/largefiles/storefactory.py (24 lines)

Diff 26979

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