remove URL backend

3 files changed, 6 insertions, 63 deletions

diff --git a/Backend/URL.hs b/Backend/URL.hs
deleted file mode 100644
index e41004dd4..000000000
--- a/Backend/URL.hs
+++ /dev/null
@@ -1,61 +0,0 @@
-{- git-annex "URL" backend
- -
- - Copyright 2010 Joey Hess <joey@kitenet.net>
- -
- - Licensed under the GNU GPL version 3 or higher.
- -}
-
-module Backend.URL (backends) where
-
-import Control.Monad.State (liftIO)
-
-import Types
-import Types.Backend
-import Utility
-import Messages
-import Types.Key
-
-backends :: [Backend Annex]
-backends = [backend]
-
-backend :: Backend Annex
-backend = Backend {
-	name = "URL",
-	getKey = keyValue,
-	storeFileKey = dummyStore,
-	retrieveKeyFile = downloadUrl,
-	-- allow keys to be removed; presumably they can always be
-	-- downloaded again
-	removeKey = dummyRemove,
-	-- similarly, keys are always assumed to be out there on the web
-	hasKey = dummyOk,
-	-- and nothing needed to fsck
-	fsckKey = dummyFsck,
-	-- and key upgrade not needed
-	upgradableKey = \_ -> return False
-}
-
--- cannot generate url from filename
-keyValue :: FilePath -> Annex (Maybe Key)
-keyValue _ = return Nothing
-
--- cannot change url contents
-dummyStore :: FilePath -> Key -> Annex Bool
-dummyStore _ _ = return False
-
-dummyRemove :: Key -> Maybe a -> Annex Bool
-dummyRemove _ _ = return True
-
-dummyFsck :: Key -> Maybe FilePath -> Maybe a -> Annex Bool
-dummyFsck _ _ _ = return True
-
-dummyOk :: Key -> Annex Bool
-dummyOk _ = return True
-
-downloadUrl :: Key -> FilePath -> Annex Bool
-downloadUrl key file = do
-	showNote $ "downloading"
-	showProgress -- make way for curl progress bar
-	liftIO $ boolSystem "curl" [Params "-# -o", File file, File url]
-	where
-		url = keyName key
diff --git a/BackendList.hs b/BackendList.hs
index bc3fd8314..e4e1d76fe 100644
--- a/BackendList.hs
+++ b/BackendList.hs
@@ -10,12 +10,10 @@ module BackendList (allBackends) where
 -- When adding a new backend, import it here and add it to the list.
 import qualified Backend.WORM
 import qualified Backend.SHA
-import qualified Backend.URL
 import Types
 
 allBackends :: [Backend Annex]
 allBackends = concat 
 	[ Backend.WORM.backends
 	, Backend.SHA.backends
-	, Backend.URL.backends
 	]
diff --git a/debian/NEWS b/debian/NEWS
index 22835ace8..ad4e946e6 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,9 @@
+git-annex (3.20110702) unstable; urgency=low
+
+  The URL backend has been removed. Instead the new web remote can be used.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 01 Jul 2011 15:40:51 -0400
+
 git-annex (3.20110624) exerimental; urgency=low
 
   There has been another change to the git-annex data store.