# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 2018-01-13 04:13:38
# Node ID 6d6d20658ccebbc969b66c56a778fb448b50eef1
# Parent  991f0be9dc39c402d63a4a8f19cde052095c4689

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.

diff --git a/hgext/lfs/__init__.py b/hgext/lfs/__init__.py
--- a/hgext/lfs/__init__.py
+++ b/hgext/lfs/__init__.py
@@ -71,7 +71,7 @@ configitem('experimental', 'lfs.user-age
 )
 
 configitem('lfs', 'url',
-    default=configitem.dynamicdefault,
+    default=None,
 )
 configitem('lfs', 'usercache',
     default=None,
@@ -82,18 +82,6 @@ configitem('lfs', 'threshold',
 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)
diff --git a/hgext/lfs/blobstore.py b/hgext/lfs/blobstore.py
--- a/hgext/lfs/blobstore.py
+++ b/hgext/lfs/blobstore.py
@@ -445,22 +445,7 @@ def _verifyfile(oid, fp):
 
 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)