##// END OF EJS Templates
lfs: infer the blob store URL from an explicit pull source...
Matt Harbison -
r37581:be1cc65b default
parent child Browse files
Show More
@@ -541,9 +541,15 b' def remote(repo):'
541 """
541 """
542 url = util.url(repo.ui.config('lfs', 'url') or '')
542 url = util.url(repo.ui.config('lfs', 'url') or '')
543 if url.scheme is None:
543 if url.scheme is None:
544 # TODO: investigate 'paths.remote:lfsurl' style path customization,
544 if util.safehasattr(repo, '_subtoppath'):
545 # and fall back to inferring from 'paths.remote' if unspecified.
545 # The pull command sets this during the optional update phase, which
546 defaulturl = util.url(repo.ui.config('paths', 'default') or b'')
546 # tells exactly where the pull originated, whether 'paths.default'
547 # or explicit.
548 defaulturl = util.url(repo._subtoppath)
549 else:
550 # TODO: investigate 'paths.remote:lfsurl' style path customization,
551 # and fall back to inferring from 'paths.remote' if unspecified.
552 defaulturl = util.url(repo.ui.config('paths', 'default') or b'')
547
553
548 # TODO: support local paths as well.
554 # TODO: support local paths as well.
549 # TODO: consider the ssh -> https transformation that git applies
555 # TODO: consider the ssh -> https transformation that git applies
@@ -253,7 +253,26 b' lfs content, and the extension enabled.'
253 $TESTTMP/server/.hg/requires:lfs
253 $TESTTMP/server/.hg/requires:lfs
254
254
255 $ hg init $TESTTMP/client6_pull
255 $ hg init $TESTTMP/client6_pull
256 $ hg -R $TESTTMP/client6_pull pull -q http://localhost:$HGPORT
256 $ hg -R $TESTTMP/client6_pull pull -u -v http://localhost:$HGPORT
257 pulling from http://localhost:$HGPORT/
258 requesting all changes
259 adding changesets
260 adding manifests
261 adding file changes
262 added 6 changesets with 5 changes to 5 files (+1 heads)
263 calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs
264 new changesets d437e1d24fbd:d3b84d50eacb
265 resolving manifests
266 lfs: assuming remote store: http://localhost:$HGPORT/.git/info/lfs
267 lfs: downloading a82f1c5cea0d40e3bb3a849686bb4e6ae47ca27e614de55c1ed0325698ef68de (25 bytes)
268 lfs: processed: a82f1c5cea0d40e3bb3a849686bb4e6ae47ca27e614de55c1ed0325698ef68de
269 getting lfs2.txt
270 lfs: found a82f1c5cea0d40e3bb3a849686bb4e6ae47ca27e614de55c1ed0325698ef68de in the local lfs store
271 getting nonlfs2.txt
272 getting nonlfs3.txt
273 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
274 updated to "d3b84d50eacb: lfs file with lfs client"
275 1 other heads for branch "default"
257 $ grep 'lfs' $TESTTMP/client6_pull/.hg/requires $SERVER_REQUIRES
276 $ grep 'lfs' $TESTTMP/client6_pull/.hg/requires $SERVER_REQUIRES
258 $TESTTMP/client6_pull/.hg/requires:lfs
277 $TESTTMP/client6_pull/.hg/requires:lfs
259 $TESTTMP/server/.hg/requires:lfs
278 $TESTTMP/server/.hg/requires:lfs
General Comments 0
You need to be logged in to leave comments. Login now