This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7961

lfs: add a method to the local blobstore to convert OIDs to file paths
ClosedPublic

Authored by mharbison72 on Jan 21 2020, 1:37 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHG06de4a673f48: lfs: add a method to the local blobstore to convert OIDs to file paths
Summary

This is less ugly than passing an open callback to the httpsendfile
constuctor.

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

mharbison72 created this revision.Jan 21 2020, 1:37 PM
marmoute accepted this revision.Feb 5 2020, 6:15 PM
marmoute added a subscriber: marmoute.

looks like a clear win.

mharbison72 added a commit: rHG06de4a673f48: lfs: add a method to the local blobstore to convert OIDs to file paths.Feb 6 2020, 5:20 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG06de4a673f48: lfs: add a method to the local blobstore to convert OIDs to file paths (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/blobstore.py (15 lines)

Diff 19972

hgext/lfs/blobstore.py

else: else:
usercache = lfutil._usercachedir(repo.ui, b'lfs') usercache = lfutil._usercachedir(repo.ui, b'lfs')
self.cachevfs = lfsvfs(usercache) self.cachevfs = lfsvfs(usercache)
self.ui = repo.ui self.ui = repo.ui
def open(self, oid): def open(self, oid):
"""Open a read-only file descriptor to the named blob, in either the """Open a read-only file descriptor to the named blob, in either the
usercache or the local store.""" usercache or the local store."""
return open(self.path(oid), b'rb')
def path(self, oid):
"""Build the path for the given blob ``oid``.
If the blob exists locally, the path may point to either the usercache
or the local store. If it doesn't, it will point to the local store.
This is meant for situations where existing code that isn't LFS aware
needs to open a blob. Generally, prefer the ``open`` method on this
class.
"""
# The usercache is the most likely place to hold the file. Commit will # The usercache is the most likely place to hold the file. Commit will
# write to both it and the local store, as will anything that downloads # write to both it and the local store, as will anything that downloads
# the blobs. However, things like clone without an update won't # the blobs. However, things like clone without an update won't
# populate the local store. For an init + push of a local clone, # populate the local store. For an init + push of a local clone,
# the usercache is the only place it _could_ be. If not present, the # the usercache is the only place it _could_ be. If not present, the
# missing file msg here will indicate the local repo, not the usercache. # missing file msg here will indicate the local repo, not the usercache.
if self.cachevfs.exists(oid): if self.cachevfs.exists(oid):
return self.cachevfs(oid, b'rb') return self.cachevfs.join(oid)
return self.vfs(oid, b'rb') return self.vfs.join(oid)
def download(self, oid, src, content_length): def download(self, oid, src, content_length):
"""Read the blob from the remote source in chunks, verify the content, """Read the blob from the remote source in chunks, verify the content,
and write to this local blobstore.""" and write to this local blobstore."""
sha256 = hashlib.sha256() sha256 = hashlib.sha256()
size = 0 size = 0
with self.vfs(oid, b'wb', atomictemp=True) as fp: with self.vfs(oid, b'wb', atomictemp=True) as fp: