summaryrefslogtreecommitdiff
path: root/Locations.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-31 16:00:32 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-31 16:00:32 -0400
commitcf4c926f2e78bd315988c1aae063f6b4148a2fae (patch)
treef7fdc76a1cc92c2c2836aff9ea10543679ab0457 /Locations.hs
parentb2c28c1ac0700eadc8689cdfb6f065d5147108bd (diff)
more Wall cleaning
Diffstat (limited to 'Locations.hs')
-rw-r--r--Locations.hs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Locations.hs b/Locations.hs
index 49ee878c8..a296f8d87 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -18,11 +18,11 @@ module Locations (
import Data.String.Utils
import Types
-import qualified TypeInternals as Internals
import qualified GitRepo as Git
{- Long-term, cross-repo state is stored in files inside the .git-annex
- directory, in the git repository's working tree. -}
+stateLoc :: String
stateLoc = ".git-annex/"
gitStateDir :: Git.Repo -> FilePath
gitStateDir repo = (Git.workTree repo) ++ "/" ++ stateLoc
@@ -35,13 +35,13 @@ gitStateDir repo = (Git.workTree repo) ++ "/" ++ stateLoc
-}
annexLocation :: Git.Repo -> Key -> FilePath
annexLocation r key =
- (Git.workTree r) ++ "/" ++ (annexLocationRelative r key)
+ (Git.workTree r) ++ "/" ++ (annexLocationRelative key)
{- Annexed file's location relative to git's working tree.
-
- Note: Assumes repo is NOT bare.-}
-annexLocationRelative :: Git.Repo -> Key -> FilePath
-annexLocationRelative r key = ".git/annex/" ++ (keyFile key)
+annexLocationRelative :: Key -> FilePath
+annexLocationRelative key = ".git/annex/" ++ (keyFile key)
{- .git-annex/tmp is used for temp files
-