##// END OF EJS Templates
lfs: fix the inferred remote store path when using a --prefix...
Matt Harbison -
r37709:d241e663 default
parent child Browse files
Show More
@@ -561,7 +561,7 b' def remote(repo, remote=None):'
561 if defaulturl.scheme in (b'http', b'https'):
561 if defaulturl.scheme in (b'http', b'https'):
562 if defaulturl.path and defaulturl.path[:-1] != b'/':
562 if defaulturl.path and defaulturl.path[:-1] != b'/':
563 defaulturl.path += b'/'
563 defaulturl.path += b'/'
564 defaulturl.path = defaulturl.path or b'' + b'.git/info/lfs'
564 defaulturl.path = (defaulturl.path or b'') + b'.git/info/lfs'
565
565
566 url = util.url(bytes(defaulturl))
566 url = util.url(bytes(defaulturl))
567 repo.ui.note(_('lfs: assuming remote store: %s\n') % url)
567 repo.ui.note(_('lfs: assuming remote store: %s\n') % url)
@@ -73,8 +73,7 b' Blob URIs are correct when --prefix is u'
73 > -A $TESTTMP/access.log -E $TESTTMP/errors.log
73 > -A $TESTTMP/access.log -E $TESTTMP/errors.log
74 $ cat hg.pid >> $DAEMON_PIDS
74 $ cat hg.pid >> $DAEMON_PIDS
75
75
76 $ hg --config lfs.url=http://localhost:$HGPORT/subdir/mount/point/.git/info/lfs \
76 $ hg clone --debug http://localhost:$HGPORT/subdir/mount/point cloned2
77 > clone --debug http://localhost:$HGPORT/subdir/mount/point cloned2
78 using http://localhost:$HGPORT/subdir/mount/point
77 using http://localhost:$HGPORT/subdir/mount/point
79 sending capabilities command
78 sending capabilities command
80 query 1; heads
79 query 1; heads
@@ -104,6 +103,7 b' Blob URIs are correct when --prefix is u'
104 resolving manifests
103 resolving manifests
105 branchmerge: False, force: False, partial: False
104 branchmerge: False, force: False, partial: False
106 ancestor: 000000000000, local: 000000000000+, remote: 525251863cad
105 ancestor: 000000000000, local: 000000000000+, remote: 525251863cad
106 lfs: assuming remote store: http://localhost:$HGPORT/subdir/mount/point/.git/info/lfs
107 Status: 200
107 Status: 200
108 Content-Length: 371
108 Content-Length: 371
109 Content-Type: application/vnd.git-lfs+json
109 Content-Type: application/vnd.git-lfs+json
General Comments 0
You need to be logged in to leave comments. Login now