diff options
author | Joey Hess <joey@kitenet.net> | 2010-10-14 02:41:54 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-10-14 02:41:54 -0400 |
commit | 4c1d8b9689043c18214b1da7d5c145fb0859443d (patch) | |
tree | 5a64d81d7e1cc8805c1283e2f48a5d11532c2fe9 /Remotes.hs | |
parent | 48643b68b3ff05399b72f44b8b02ff34d6de046c (diff) |
more namespace cleanup
Diffstat (limited to 'Remotes.hs')
-rw-r--r-- | Remotes.hs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Remotes.hs b/Remotes.hs index 39404bf19..918ae2290 100644 --- a/Remotes.hs +++ b/Remotes.hs @@ -1,9 +1,9 @@ {- git-annex remote repositories -} module Remotes ( - remotesList, - remotesWithKey, - remoteEnsureGitConfigRead + list, + withKey, + ensureGitConfigRead ) where import Control.Monad.State (liftIO) @@ -17,12 +17,12 @@ import UUID import List {- Human visible list of remotes. -} -remotesList :: [Git.Repo] -> String -remotesList remotes = join " " $ map Git.repoDescribe remotes +list :: [Git.Repo] -> String +list remotes = join " " $ map Git.repoDescribe remotes {- Cost ordered list of remotes that the LocationLog indicate may have a key. -} -remotesWithKey :: Key -> Annex [Git.Repo] -remotesWithKey key = do +withKey :: Key -> Annex [Git.Repo] +withKey key = do g <- gitAnnex uuids <- liftIO $ keyLocations g key allremotes <- remotesByCost @@ -71,8 +71,8 @@ repoCost r = do - because reading it may be expensive. This function ensures that it is - read for a specified remote, and updates state. It returns the - updated git repo also. -} -remoteEnsureGitConfigRead :: Git.Repo -> Annex Git.Repo -remoteEnsureGitConfigRead r = do +ensureGitConfigRead :: Git.Repo -> Annex Git.Repo +ensureGitConfigRead r = do if (Map.null $ Git.configMap r) then do r' <- liftIO $ Git.configRead r |