webapp: Defaults to sharing box.com account info with friends, allowing one-click enabling of the repository.

5 files changed, 16 insertions, 11 deletions

diff --git a/Creds.hs b/Creds.hs
index f5ea55000..06d3a52f9 100644
--- a/Creds.hs
+++ b/Creds.hs
@@ -34,7 +34,7 @@ data CredPairStorage = CredPairStorage
 {- Stores creds in a remote's configuration, if the remote allows
  - that. Otherwise, caches them locally. -}
 setRemoteCredPair :: RemoteConfig -> CredPairStorage -> Annex RemoteConfig
-setRemoteCredPair c storage = go =<< getRemoteCredPair' c storage
+setRemoteCredPair c storage = go =<< getRemoteCredPair c storage
   where
 	go (Just creds)
 		| embedCreds c = case credPairRemoteKey storage of
@@ -58,8 +58,8 @@ setRemoteCredPair c storage = go =<< getRemoteCredPair' c storage
 {- Gets a remote's credpair, from the environment if set, otherwise
  - from the cache in gitAnnexCredsDir, or failing that, from the
  - value in RemoteConfig. -}
-getRemoteCredPair :: String -> RemoteConfig -> CredPairStorage -> Annex (Maybe CredPair)
-getRemoteCredPair this c storage = maybe missing (return . Just) =<< getRemoteCredPair' c storage
+getRemoteCredPairFor :: String -> RemoteConfig -> CredPairStorage -> Annex (Maybe CredPair)
+getRemoteCredPairFor this c storage = maybe missing (return . Just) =<< getRemoteCredPair c storage
   where
 	(loginvar, passwordvar) = credPairEnvironment storage
 	missing = do
@@ -70,8 +70,8 @@ getRemoteCredPair this c storage = maybe missing (return . Just) =<< getRemoteCr
 			]
 		return Nothing
 
-getRemoteCredPair' :: RemoteConfig -> CredPairStorage -> Annex (Maybe CredPair)
-getRemoteCredPair' c storage = maybe fromcache (return . Just) =<< fromenv
+getRemoteCredPair :: RemoteConfig -> CredPairStorage -> Annex (Maybe CredPair)
+getRemoteCredPair c storage = maybe fromcache (return . Just) =<< fromenv
   where
 	fromenv = liftIO $ getEnvCredPair storage
 	fromcache = maybe fromconfig (return . Just) =<< readCacheCredPair storage
@@ -103,8 +103,6 @@ getEnvCredPair storage = liftM2 (,)
 	(uenv, penv) = credPairEnvironment storage
 	get = catchMaybeIO . getEnv
 
-
-
 {- Stores a CredPair in the environment. -}
 setEnvCredPair :: CredPair -> CredPairStorage -> IO ()
 setEnvCredPair (l, p) storage = do
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index f960c517f..55b704a33 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -221,7 +221,7 @@ glacierParams c params = datacenter:params
 		(fromJust $ M.lookup "datacenter" c)
 
 glacierEnv :: RemoteConfig -> UUID -> Annex (Maybe [(String, String)])
-glacierEnv c u = go =<< getRemoteCredPair "glacier" c creds
+glacierEnv c u = go =<< getRemoteCredPairFor "glacier" c creds
   where
 	go Nothing = return Nothing
 	go (Just (user, pass)) = do
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 400f3e027..ba5fb949b 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -262,7 +262,7 @@ s3ConnectionRequired c u =
 	maybe (error "Cannot connect to S3") return =<< s3Connection c u
 
 s3Connection :: RemoteConfig -> UUID -> Annex (Maybe AWSConnection)
-s3Connection c u = go =<< getRemoteCredPair "S3" c (AWS.creds u)
+s3Connection c u = go =<< getRemoteCredPairFor "S3" c (AWS.creds u)
   where
 	go Nothing = return Nothing
 	go (Just (ak, sk)) = return $ Just $ AWSConnection host port ak sk
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index b303dbe59..a5bba716b 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -7,7 +7,7 @@
 
 {-# LANGUAGE ScopedTypeVariables #-}
 
-module Remote.WebDAV (remote, setCredsEnv) where
+module Remote.WebDAV (remote, davCreds, setCredsEnv) where
 
 import Network.Protocol.HTTP.DAV
 import qualified Data.Map as M
@@ -321,7 +321,7 @@ noProps :: XML.Document
 noProps = XML.parseText_ XML.def $ LT.pack "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<propertyupdate/>"
 
 getCreds :: RemoteConfig -> UUID -> Annex (Maybe CredPair)
-getCreds c u = getRemoteCredPair "webdav" c (davCreds u)
+getCreds c u = getRemoteCredPairFor "webdav" c (davCreds u)
 
 davCreds :: UUID -> CredPairStorage
 davCreds u = CredPairStorage
diff --git a/debian/changelog b/debian/changelog
index aebe385a6..37c322acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (3.20121128) UNRELEASED; urgency=low
+
+  * webapp: Defaults to sharing box.com account info with friends, allowing
+    one-click enabling of the repository.
+
+ -- Joey Hess <joeyh@debian.org>  Wed, 28 Nov 2012 13:31:07 -0400
+
 git-annex (3.20121127) unstable; urgency=low
 
   * Fix dirContentsRecursive, which had missed some files in deeply nested