lfs: drop deprecated remote store config options
The last of these were removed from fb-experimental in
86884a51e9aa, and we
might as well clean this up before the freeze.
--- a/hgext/lfs/__init__.py Fri Jan 12 18:11:05 2018 +0530
+++ b/hgext/lfs/__init__.py Fri Jan 12 23:13:38 2018 -0500
@@ -71,7 +71,7 @@
)
configitem('lfs', 'url',
- default=configitem.dynamicdefault,
+ default=None,
)
configitem('lfs', 'usercache',
default=None,
@@ -82,18 +82,6 @@
configitem('lfs', 'retry',
default=5,
)
-# Deprecated
-configitem('lfs', 'remotestore',
- default=None,
-)
-# Deprecated
-configitem('lfs', 'dummy',
- default=None,
-)
-# Deprecated
-configitem('lfs', 'git-lfs',
- default=None,
-)
cmdtable = {}
command = registrar.command(cmdtable)
--- a/hgext/lfs/blobstore.py Fri Jan 12 18:11:05 2018 +0530
+++ b/hgext/lfs/blobstore.py Fri Jan 12 23:13:38 2018 -0500
@@ -445,22 +445,7 @@
def remote(repo):
"""remotestore factory. return a store in _storemap depending on config"""
- defaulturl = ''
-
- # convert deprecated configs to the new url. TODO: remove this if other
- # places are migrated to the new url config.
- # deprecated config: lfs.remotestore
- deprecatedstore = repo.ui.config('lfs', 'remotestore')
- if deprecatedstore == 'dummy':
- # deprecated config: lfs.remotepath
- defaulturl = 'file://' + repo.ui.config('lfs', 'remotepath')
- elif deprecatedstore == 'git-lfs':
- # deprecated config: lfs.remoteurl
- defaulturl = repo.ui.config('lfs', 'remoteurl')
- elif deprecatedstore == 'null':
- defaulturl = 'null://'
-
- url = util.url(repo.ui.config('lfs', 'url', defaulturl))
+ url = util.url(repo.ui.config('lfs', 'url') or '')
scheme = url.scheme
if scheme not in _storemap:
raise error.Abort(_('lfs: unknown url scheme: %s') % scheme)