diff hgext/lfs/blobstore.py @ 37564:31a4ea773369

lfs: infer the blob store URL from an explicit push dest or default-push

Unlike pull, the blobs are uploaded within the exchange.push() window, so simply
wrap it and swap in a properly configured remote store.  The '_subtoppath' field
shouldn't be available during this window, but give the passed path priority for
clarity.

At one point I hit an AttributeError in one of the convert tests when trying to
save the original remote blobstore when the swap was run unconditionally.  I
wrapped it in a util.safehasattr(), but then today I wasn't able to reproduce
it.  But now the whole thing is tucked under the requirement guard because
without the requirement, there are no blobs in the repo, even if the extension
is loaded.

--- a/hgext/lfs/blobstore.py	Sun Apr 08 01:23:39 2018 -0400
+++ b/hgext/lfs/blobstore.py	Sun Apr 08 14:22:12 2018 -0400
@@ -529,7 +529,7 @@
         raise error.Abort(_('detected corrupt lfs object: %s') % oid,
                           hint=_('run hg verify'))
 
-def remote(repo):
+def remote(repo, remote=None):
     """remotestore factory. return a store in _storemap depending on config
 
     If ``lfs.url`` is specified, use that remote endpoint.  Otherwise, try to
@@ -541,7 +541,9 @@
     """
     url = util.url(repo.ui.config('lfs', 'url') or '')
     if url.scheme is None:
-        if util.safehasattr(repo, '_subtoppath'):
+        if remote:
+            defaulturl = util.url(remote)
+        elif util.safehasattr(repo, '_subtoppath'):
             # The pull command sets this during the optional update phase, which
             # tells exactly where the pull originated, whether 'paths.default'
             # or explicit.