Show More
@@ -71,7 +71,7 b" configitem('experimental', 'lfs.user-age" | |||||
71 | ) |
|
71 | ) | |
72 |
|
72 | |||
73 | configitem('lfs', 'url', |
|
73 | configitem('lfs', 'url', | |
74 | default=configitem.dynamicdefault, |
|
74 | default=None, | |
75 | ) |
|
75 | ) | |
76 | configitem('lfs', 'usercache', |
|
76 | configitem('lfs', 'usercache', | |
77 | default=None, |
|
77 | default=None, | |
@@ -82,18 +82,6 b" configitem('lfs', 'threshold'," | |||||
82 | configitem('lfs', 'retry', |
|
82 | configitem('lfs', 'retry', | |
83 | default=5, |
|
83 | default=5, | |
84 | ) |
|
84 | ) | |
85 | # Deprecated |
|
|||
86 | configitem('lfs', 'remotestore', |
|
|||
87 | default=None, |
|
|||
88 | ) |
|
|||
89 | # Deprecated |
|
|||
90 | configitem('lfs', 'dummy', |
|
|||
91 | default=None, |
|
|||
92 | ) |
|
|||
93 | # Deprecated |
|
|||
94 | configitem('lfs', 'git-lfs', |
|
|||
95 | default=None, |
|
|||
96 | ) |
|
|||
97 |
|
85 | |||
98 | cmdtable = {} |
|
86 | cmdtable = {} | |
99 | command = registrar.command(cmdtable) |
|
87 | command = registrar.command(cmdtable) |
@@ -445,22 +445,7 b' def _verifyfile(oid, fp):' | |||||
445 |
|
445 | |||
446 | def remote(repo): |
|
446 | def remote(repo): | |
447 | """remotestore factory. return a store in _storemap depending on config""" |
|
447 | """remotestore factory. return a store in _storemap depending on config""" | |
448 | defaulturl = '' |
|
448 | url = util.url(repo.ui.config('lfs', 'url') or '') | |
449 |
|
||||
450 | # convert deprecated configs to the new url. TODO: remove this if other |
|
|||
451 | # places are migrated to the new url config. |
|
|||
452 | # deprecated config: lfs.remotestore |
|
|||
453 | deprecatedstore = repo.ui.config('lfs', 'remotestore') |
|
|||
454 | if deprecatedstore == 'dummy': |
|
|||
455 | # deprecated config: lfs.remotepath |
|
|||
456 | defaulturl = 'file://' + repo.ui.config('lfs', 'remotepath') |
|
|||
457 | elif deprecatedstore == 'git-lfs': |
|
|||
458 | # deprecated config: lfs.remoteurl |
|
|||
459 | defaulturl = repo.ui.config('lfs', 'remoteurl') |
|
|||
460 | elif deprecatedstore == 'null': |
|
|||
461 | defaulturl = 'null://' |
|
|||
462 |
|
||||
463 | url = util.url(repo.ui.config('lfs', 'url', defaulturl)) |
|
|||
464 | scheme = url.scheme |
|
449 | scheme = url.scheme | |
465 | if scheme not in _storemap: |
|
450 | if scheme not in _storemap: | |
466 | raise error.Abort(_('lfs: unknown url scheme: %s') % scheme) |
|
451 | raise error.Abort(_('lfs: unknown url scheme: %s') % scheme) |
General Comments 0
You need to be logged in to leave comments.
Login now