diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-10-14 02:52:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-10-14 02:52:17 -0400 |
| commit | 0b55bd05de7b83a474ea58e9d45676934667f4bd (patch) | |
| tree | 1e2373381a650d0c2c5c1bc6c5cffa58cf922989 /Locations.hs | |
| parent | 4c1d8b9689043c18214b1da7d5c145fb0859443d (diff) | |
more namespace cleanup
Diffstat (limited to 'Locations.hs')
| -rw-r--r-- | Locations.hs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Locations.hs b/Locations.hs index 5d701681c..8c1915b02 100644 --- a/Locations.hs +++ b/Locations.hs @@ -11,7 +11,8 @@ module Locations ( ) where import Data.String.Utils -import Types +import AbstractTypes +import qualified BackendTypes as Backend import qualified GitRepo as Git {- Long-term, cross-repo state is stored in files inside the .git-annex @@ -32,7 +33,7 @@ annexLocation r backend key = {- Annexed file's location relative to the gitWorkTree -} annexLocationRelative :: Git.Repo -> Backend -> Key -> FilePath annexLocationRelative r backend key = - Git.dir r ++ "/annex/" ++ (name backend) ++ "/" ++ (keyFile key) + Git.dir r ++ "/annex/" ++ (Backend.name backend) ++ "/" ++ (keyFile key) {- Converts a key into a filename fragment. - @@ -50,4 +51,5 @@ keyFile key = replace "/" "%" $ replace "%" "&s" $ replace "&" "&a" $ show key {- Reverses keyFile, converting a filename fragment (ie, the basename of - the symlink target) into a key. -} fileKey :: FilePath -> Key -fileKey file = Key $ replace "&a" "&" $ replace "&s" "%" $ replace "%" "/" file +fileKey file = Backend.Key $ + replace "&a" "&" $ replace "&s" "%" $ replace "%" "/" file |