2010-10-10 19:54:02 +00:00
|
|
|
{- git-annex file locations
|
2010-10-27 20:53:54 +00:00
|
|
|
-
|
2011-12-02 18:39:47 +00:00
|
|
|
- Copyright 2010-2011 Joey Hess <joey@kitenet.net>
|
2010-10-27 20:53:54 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
2010-10-10 19:54:02 +00:00
|
|
|
-}
|
|
|
|
|
2010-10-11 21:52:46 +00:00
|
|
|
module Locations (
|
2010-10-13 00:04:36 +00:00
|
|
|
keyFile,
|
2010-10-13 07:41:12 +00:00
|
|
|
fileKey,
|
2011-12-02 18:39:47 +00:00
|
|
|
keyPaths,
|
2012-11-19 03:59:39 +00:00
|
|
|
keyPath,
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexLocation,
|
2013-04-04 19:46:33 +00:00
|
|
|
gitAnnexLink,
|
2012-12-07 18:40:31 +00:00
|
|
|
gitAnnexMapping,
|
2013-02-14 20:17:40 +00:00
|
|
|
gitAnnexInodeCache,
|
2013-02-19 20:26:07 +00:00
|
|
|
gitAnnexInodeSentinal,
|
|
|
|
gitAnnexInodeSentinalCache,
|
2011-11-29 02:43:51 +00:00
|
|
|
annexLocations,
|
2012-11-16 04:42:33 +00:00
|
|
|
annexLocation,
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexDir,
|
|
|
|
gitAnnexObjectDir,
|
|
|
|
gitAnnexTmpDir,
|
2011-01-28 18:10:50 +00:00
|
|
|
gitAnnexTmpLocation,
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexBadDir,
|
2011-04-29 17:59:00 +00:00
|
|
|
gitAnnexBadLocation,
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexUnusedLog,
|
2012-09-25 18:16:34 +00:00
|
|
|
gitAnnexFsckState,
|
2012-07-01 18:29:00 +00:00
|
|
|
gitAnnexTransferDir,
|
2012-09-26 16:06:44 +00:00
|
|
|
gitAnnexCredsDir,
|
2012-12-18 19:04:44 +00:00
|
|
|
gitAnnexMergeDir,
|
2011-06-23 15:37:26 +00:00
|
|
|
gitAnnexJournalDir,
|
2011-10-03 20:32:36 +00:00
|
|
|
gitAnnexJournalLock,
|
2011-12-11 18:14:28 +00:00
|
|
|
gitAnnexIndex,
|
2011-12-11 20:11:13 +00:00
|
|
|
gitAnnexIndexLock,
|
2012-06-11 05:20:19 +00:00
|
|
|
gitAnnexPidFile,
|
2012-06-13 17:35:15 +00:00
|
|
|
gitAnnexDaemonStatusFile,
|
2012-06-11 04:39:09 +00:00
|
|
|
gitAnnexLogFile,
|
2012-07-26 03:13:01 +00:00
|
|
|
gitAnnexHtmlShim,
|
2012-09-18 21:50:07 +00:00
|
|
|
gitAnnexUrlFile,
|
2012-10-03 21:04:52 +00:00
|
|
|
gitAnnexTmpCfgFile,
|
2012-01-20 19:34:52 +00:00
|
|
|
gitAnnexSshDir,
|
2012-03-04 20:00:24 +00:00
|
|
|
gitAnnexRemotesDir,
|
2012-08-31 22:59:57 +00:00
|
|
|
gitAnnexAssistantDefaultDir,
|
2011-01-27 20:10:45 +00:00
|
|
|
isLinkToAnnex,
|
2011-12-02 19:50:27 +00:00
|
|
|
annexHashes,
|
2011-04-02 17:49:03 +00:00
|
|
|
hashDirMixed,
|
2011-06-22 21:51:48 +00:00
|
|
|
hashDirLower,
|
2010-11-08 20:47:36 +00:00
|
|
|
|
|
|
|
prop_idempotent_fileKey
|
2010-10-11 21:52:46 +00:00
|
|
|
) where
|
2010-10-10 19:54:02 +00:00
|
|
|
|
2011-11-26 12:39:47 +00:00
|
|
|
import Data.Bits
|
|
|
|
import Data.Word
|
2011-03-15 21:47:00 +00:00
|
|
|
import Data.Hash.MD5
|
2010-10-16 20:20:49 +00:00
|
|
|
|
2011-10-04 02:24:57 +00:00
|
|
|
import Common
|
2010-10-14 07:18:11 +00:00
|
|
|
import Types
|
2011-06-02 01:56:04 +00:00
|
|
|
import Types.Key
|
2011-06-30 17:16:57 +00:00
|
|
|
import qualified Git
|
2010-10-10 19:54:02 +00:00
|
|
|
|
2011-01-27 21:00:32 +00:00
|
|
|
{- Conventions:
|
|
|
|
-
|
|
|
|
- Functions ending in "Dir" should always return values ending with a
|
|
|
|
- trailing path separator. Most code does not rely on that, but a few
|
|
|
|
- things do.
|
|
|
|
-
|
|
|
|
- Everything else should not end in a trailing path sepatator.
|
|
|
|
-
|
|
|
|
- Only functions (with names starting with "git") that build a path
|
|
|
|
- based on a git repository should return an absolute path.
|
|
|
|
- Everything else should use relative paths.
|
|
|
|
-}
|
|
|
|
|
2011-03-03 18:51:57 +00:00
|
|
|
{- The directory git annex uses for local state, relative to the .git
|
|
|
|
- directory -}
|
2011-01-27 21:00:32 +00:00
|
|
|
annexDir :: FilePath
|
2011-07-15 07:12:05 +00:00
|
|
|
annexDir = addTrailingPathSeparator "annex"
|
2011-03-03 18:51:57 +00:00
|
|
|
|
|
|
|
{- The directory git annex uses for locally available object content,
|
|
|
|
- relative to the .git directory -}
|
2011-01-27 21:00:32 +00:00
|
|
|
objectDir :: FilePath
|
|
|
|
objectDir = addTrailingPathSeparator $ annexDir </> "objects"
|
2010-10-13 05:04:06 +00:00
|
|
|
|
2011-11-29 02:43:51 +00:00
|
|
|
{- Annexed file's possible locations relative to the .git directory.
|
2011-11-29 03:08:11 +00:00
|
|
|
- There are two different possibilities, using different hashes. -}
|
2011-11-29 02:43:51 +00:00
|
|
|
annexLocations :: Key -> [FilePath]
|
2011-11-29 03:20:31 +00:00
|
|
|
annexLocations key = map (annexLocation key) annexHashes
|
2011-12-02 18:39:47 +00:00
|
|
|
annexLocation :: Key -> Hasher -> FilePath
|
|
|
|
annexLocation key hasher = objectDir </> keyPath key hasher
|
2010-10-13 07:41:12 +00:00
|
|
|
|
2013-04-04 19:46:33 +00:00
|
|
|
{- Annexed object's absolute location in a repository.
|
2011-11-29 03:08:11 +00:00
|
|
|
-
|
|
|
|
- When there are multiple possible locations, returns the one where the
|
|
|
|
- file is actually present.
|
|
|
|
-
|
|
|
|
- When the file is not present, returns the location where the file should
|
|
|
|
- be stored.
|
2013-01-06 18:29:01 +00:00
|
|
|
-
|
|
|
|
- This does not take direct mode into account, so in direct mode it is not
|
|
|
|
- the actual location of the file's content.
|
2011-11-29 02:43:51 +00:00
|
|
|
-}
|
2013-04-04 19:46:33 +00:00
|
|
|
gitAnnexLocation :: Key -> Git.Repo -> GitConfig -> IO FilePath
|
|
|
|
gitAnnexLocation key r config = gitAnnexLocation' key r (annexCrippledFileSystem config)
|
|
|
|
gitAnnexLocation' :: Key -> Git.Repo -> Bool -> IO FilePath
|
|
|
|
gitAnnexLocation' key r crippled
|
|
|
|
{- Bare repositories default to hashDirLower for new
|
|
|
|
- content, as it's more portable.
|
|
|
|
-
|
|
|
|
- Repositories on filesystems that are crippled also use
|
|
|
|
- hashDirLower, since they do not use symlinks and it's
|
|
|
|
- more portable. -}
|
|
|
|
| Git.repoIsLocalBare r || crippled =
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
check $ map inrepo $ annexLocations key
|
2013-04-04 19:46:33 +00:00
|
|
|
{- Non-bare repositories only use hashDirMixed, so
|
|
|
|
- don't need to do any work to check if the file is
|
|
|
|
- present. -}
|
|
|
|
| otherwise = return $ inrepo $ annexLocation key hashDirMixed
|
2012-10-29 01:27:15 +00:00
|
|
|
where
|
|
|
|
inrepo d = Git.localGitDir r </> d
|
|
|
|
check locs@(l:_) = fromMaybe l <$> firstM doesFileExist locs
|
|
|
|
check [] = error "internal"
|
2011-01-27 21:00:32 +00:00
|
|
|
|
2013-04-04 19:46:33 +00:00
|
|
|
{- Calculates a symlink to link a file to an annexed object. -}
|
|
|
|
gitAnnexLink :: FilePath -> Key -> Git.Repo -> IO FilePath
|
|
|
|
gitAnnexLink file key r = do
|
|
|
|
cwd <- getCurrentDirectory
|
|
|
|
let absfile = fromMaybe whoops $ absNormPath cwd file
|
|
|
|
loc <- gitAnnexLocation' key r False
|
|
|
|
return $ relPathDirToFile (parentDir absfile) loc
|
|
|
|
where
|
|
|
|
whoops = error $ "unable to normalize " ++ file
|
|
|
|
|
2012-12-07 18:40:31 +00:00
|
|
|
{- File that maps from a key to the file(s) in the git repository.
|
|
|
|
- Used in direct mode. -}
|
2013-04-04 19:46:33 +00:00
|
|
|
gitAnnexMapping :: Key -> Git.Repo -> GitConfig -> IO FilePath
|
|
|
|
gitAnnexMapping key r config = do
|
|
|
|
loc <- gitAnnexLocation key r config
|
2012-12-07 18:40:31 +00:00
|
|
|
return $ loc ++ ".map"
|
|
|
|
|
2012-12-07 21:28:23 +00:00
|
|
|
{- File that caches information about a key's content, used to determine
|
|
|
|
- if a file has changed.
|
|
|
|
- Used in direct mode. -}
|
2013-04-04 19:46:33 +00:00
|
|
|
gitAnnexInodeCache :: Key -> Git.Repo -> GitConfig -> IO FilePath
|
|
|
|
gitAnnexInodeCache key r config = do
|
|
|
|
loc <- gitAnnexLocation key r config
|
2012-12-07 21:28:23 +00:00
|
|
|
return $ loc ++ ".cache"
|
|
|
|
|
2013-02-19 20:26:07 +00:00
|
|
|
gitAnnexInodeSentinal :: Git.Repo -> FilePath
|
|
|
|
gitAnnexInodeSentinal r = gitAnnexDir r </> "sentinal"
|
|
|
|
|
|
|
|
gitAnnexInodeSentinalCache :: Git.Repo -> FilePath
|
|
|
|
gitAnnexInodeSentinalCache r = gitAnnexInodeSentinal r ++ ".cache"
|
|
|
|
|
2011-03-03 18:51:57 +00:00
|
|
|
{- The annex directory of a repository. -}
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexDir :: Git.Repo -> FilePath
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
gitAnnexDir r = addTrailingPathSeparator $ Git.localGitDir r </> annexDir
|
2010-11-07 21:36:24 +00:00
|
|
|
|
2011-11-29 02:43:51 +00:00
|
|
|
{- The part of the annex directory where file contents are stored. -}
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexObjectDir :: Git.Repo -> FilePath
|
Clean up handling of git directory and git worktree.
Baked into the code was an assumption that a repository's git directory
could be determined by adding ".git" to its work tree (or nothing for bare
repos). That fails when core.worktree, or GIT_DIR and GIT_WORK_TREE are
used to separate the two.
This was attacked at the type level, by storing the gitdir and worktree
separately, so Nothing for the worktree means a bare repo.
A complication arose because we don't learn where a repository is bare
until its configuration is read. So another Location type handles
repositories that have not had their config read yet. I am not entirely
happy with this being a Location type, rather than representing them
entirely separate from the Git type. The new code is not worse than the
old, but better types could enforce more safety.
Added support for core.worktree. Overriding it with -c isn't supported
because it's not really clear what to do if a git repo's config is read, is
not bare, and is then overridden to bare. What is the right git directory
in this case? I will worry about this if/when someone has a use case for
overriding core.worktree with -c. (See Git.Config.updateLocation)
Also removed and renamed some functions like gitDir and workTree that
misused git's terminology.
One minor regression is known: git annex add in a bare repository does not
print a nice error message, but runs git ls-files in a way that fails
earlier with a less nice error message. This is because before --work-tree
was always passed to git commands, even in a bare repo, while now it's not.
2012-05-18 20:38:26 +00:00
|
|
|
gitAnnexObjectDir r = addTrailingPathSeparator $ Git.localGitDir r </> objectDir
|
2010-11-08 19:14:54 +00:00
|
|
|
|
2011-06-21 18:44:56 +00:00
|
|
|
{- .git/annex/tmp/ is used for temp files -}
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexTmpDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexTmpDir r = addTrailingPathSeparator $ gitAnnexDir r </> "tmp"
|
2010-10-17 20:39:30 +00:00
|
|
|
|
2013-04-02 17:13:42 +00:00
|
|
|
{- The temp file to use for a given key's content. -}
|
2011-11-08 19:34:10 +00:00
|
|
|
gitAnnexTmpLocation :: Key -> Git.Repo -> FilePath
|
|
|
|
gitAnnexTmpLocation key r = gitAnnexTmpDir r </> keyFile key
|
2011-01-28 18:10:50 +00:00
|
|
|
|
2011-06-21 18:44:56 +00:00
|
|
|
{- .git/annex/bad/ is used for bad files found during fsck -}
|
2011-01-27 21:00:32 +00:00
|
|
|
gitAnnexBadDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexBadDir r = addTrailingPathSeparator $ gitAnnexDir r </> "bad"
|
2010-11-13 18:59:27 +00:00
|
|
|
|
2011-04-29 17:59:00 +00:00
|
|
|
{- The bad file to use for a given key. -}
|
2011-11-08 19:34:10 +00:00
|
|
|
gitAnnexBadLocation :: Key -> Git.Repo -> FilePath
|
|
|
|
gitAnnexBadLocation key r = gitAnnexBadDir r </> keyFile key
|
2011-04-29 17:59:00 +00:00
|
|
|
|
2012-04-14 18:22:33 +00:00
|
|
|
{- .git/annex/foounused is used to number possibly unused keys -}
|
2011-04-29 17:59:00 +00:00
|
|
|
gitAnnexUnusedLog :: FilePath -> Git.Repo -> FilePath
|
|
|
|
gitAnnexUnusedLog prefix r = gitAnnexDir r </> (prefix ++ "unused")
|
2010-11-15 22:04:19 +00:00
|
|
|
|
2012-09-25 18:16:34 +00:00
|
|
|
{- .git/annex/fsckstate is used to store information about incremental fscks. -}
|
|
|
|
gitAnnexFsckState :: Git.Repo -> FilePath
|
|
|
|
gitAnnexFsckState r = gitAnnexDir r </> "fsckstate"
|
|
|
|
|
2012-09-26 16:06:44 +00:00
|
|
|
{- .git/annex/creds/ is used to store credentials to access some special
|
|
|
|
- remotes. -}
|
|
|
|
gitAnnexCredsDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexCredsDir r = addTrailingPathSeparator $ gitAnnexDir r </> "creds"
|
|
|
|
|
2012-12-18 19:04:44 +00:00
|
|
|
{- .git/annex/merge/ is used for direct mode merges. -}
|
|
|
|
gitAnnexMergeDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexMergeDir r = addTrailingPathSeparator $ gitAnnexDir r </> "merge"
|
|
|
|
|
2012-09-26 16:06:44 +00:00
|
|
|
{- .git/annex/transfer/ is used to record keys currently
|
2012-08-23 17:42:13 +00:00
|
|
|
- being transferred, and other transfer bookkeeping info. -}
|
2012-07-01 18:29:00 +00:00
|
|
|
gitAnnexTransferDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexTransferDir r = addTrailingPathSeparator $ gitAnnexDir r </> "transfer"
|
|
|
|
|
2011-06-23 13:56:04 +00:00
|
|
|
{- .git/annex/journal/ is used to journal changes made to the git-annex
|
|
|
|
- branch -}
|
|
|
|
gitAnnexJournalDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexJournalDir r = addTrailingPathSeparator $ gitAnnexDir r </> "journal"
|
|
|
|
|
2011-10-03 20:32:36 +00:00
|
|
|
{- Lock file for the journal. -}
|
|
|
|
gitAnnexJournalLock :: Git.Repo -> FilePath
|
|
|
|
gitAnnexJournalLock r = gitAnnexDir r </> "journal.lck"
|
|
|
|
|
2011-12-11 18:14:28 +00:00
|
|
|
{- .git/annex/index is used to stage changes to the git-annex branch -}
|
|
|
|
gitAnnexIndex :: Git.Repo -> FilePath
|
|
|
|
gitAnnexIndex r = gitAnnexDir r </> "index"
|
|
|
|
|
2011-12-11 20:11:13 +00:00
|
|
|
{- Lock file for .git/annex/index. -}
|
|
|
|
gitAnnexIndexLock :: Git.Repo -> FilePath
|
|
|
|
gitAnnexIndexLock r = gitAnnexDir r </> "index.lck"
|
|
|
|
|
2012-06-11 05:20:19 +00:00
|
|
|
{- Pid file for daemon mode. -}
|
|
|
|
gitAnnexPidFile :: Git.Repo -> FilePath
|
|
|
|
gitAnnexPidFile r = gitAnnexDir r </> "daemon.pid"
|
|
|
|
|
2012-06-13 17:35:15 +00:00
|
|
|
{- Status file for daemon mode. -}
|
|
|
|
gitAnnexDaemonStatusFile :: Git.Repo -> FilePath
|
|
|
|
gitAnnexDaemonStatusFile r = gitAnnexDir r </> "daemon.status"
|
|
|
|
|
2012-06-11 04:39:09 +00:00
|
|
|
{- Log file for daemon mode. -}
|
|
|
|
gitAnnexLogFile :: Git.Repo -> FilePath
|
|
|
|
gitAnnexLogFile r = gitAnnexDir r </> "daemon.log"
|
|
|
|
|
2012-07-26 03:13:01 +00:00
|
|
|
{- Html shim file used to launch the webapp. -}
|
|
|
|
gitAnnexHtmlShim :: Git.Repo -> FilePath
|
|
|
|
gitAnnexHtmlShim r = gitAnnexDir r </> "webapp.html"
|
|
|
|
|
2012-09-18 21:50:07 +00:00
|
|
|
{- File containing the url to the webapp. -}
|
|
|
|
gitAnnexUrlFile :: Git.Repo -> FilePath
|
|
|
|
gitAnnexUrlFile r = gitAnnexDir r </> "url"
|
|
|
|
|
2012-10-03 21:04:52 +00:00
|
|
|
{- Temporary file used to edit configuriation from the git-annex branch. -}
|
|
|
|
gitAnnexTmpCfgFile :: Git.Repo -> FilePath
|
|
|
|
gitAnnexTmpCfgFile r = gitAnnexDir r </> "config.tmp"
|
|
|
|
|
2012-01-20 19:34:52 +00:00
|
|
|
{- .git/annex/ssh/ is used for ssh connection caching -}
|
|
|
|
gitAnnexSshDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexSshDir r = addTrailingPathSeparator $ gitAnnexDir r </> "ssh"
|
|
|
|
|
2012-03-04 20:00:24 +00:00
|
|
|
{- .git/annex/remotes/ is used for remote-specific state. -}
|
|
|
|
gitAnnexRemotesDir :: Git.Repo -> FilePath
|
|
|
|
gitAnnexRemotesDir r = addTrailingPathSeparator $ gitAnnexDir r </> "remotes"
|
|
|
|
|
2012-08-31 22:59:57 +00:00
|
|
|
{- This is the base directory name used by the assistant when making
|
|
|
|
- repositories, by default. -}
|
|
|
|
gitAnnexAssistantDefaultDir :: FilePath
|
|
|
|
gitAnnexAssistantDefaultDir = "annex"
|
|
|
|
|
Additional GIT_DIR support bugfixes. May actually work now.
Two fixes. First, and most importantly, relax the isLinkToAnnex check
to only look for /annex/objects/, not [^|/].git/annex/objects. If
GIT_DIR is used with a detached work tree, the git directory is
not necessarily named .git.
There are important caveats with doing that at all, since git-annex will
make symlinks that point at GIT_DIR, which means that the relative path
between GIT_DIR and GIT_WORK_TREE needs to remain stable across all clones
of the repository.
----
The other fix is just fixing crazy and wrong code that, when GIT_DIR is
set, expects to still find a git repository in the path below the work
tree, and uses some of its configuration, and some of GIT_DIR. What was I
thinking, and why can't I seem to get this code right?
2013-02-23 16:32:09 +00:00
|
|
|
{- Checks a symlink target to see if it appears to point to annexed content.
|
|
|
|
-
|
|
|
|
- We only look at paths inside the .git directory, and not at the .git
|
|
|
|
- directory itself, because GIT_DIR may cause a directory name other
|
|
|
|
- than .git to be used.
|
|
|
|
-}
|
2011-01-27 20:10:45 +00:00
|
|
|
isLinkToAnnex :: FilePath -> Bool
|
Additional GIT_DIR support bugfixes. May actually work now.
Two fixes. First, and most importantly, relax the isLinkToAnnex check
to only look for /annex/objects/, not [^|/].git/annex/objects. If
GIT_DIR is used with a detached work tree, the git directory is
not necessarily named .git.
There are important caveats with doing that at all, since git-annex will
make symlinks that point at GIT_DIR, which means that the relative path
between GIT_DIR and GIT_WORK_TREE needs to remain stable across all clones
of the repository.
----
The other fix is just fixing crazy and wrong code that, when GIT_DIR is
set, expects to still find a git repository in the path below the work
tree, and uses some of its configuration, and some of GIT_DIR. What was I
thinking, and why can't I seem to get this code right?
2013-02-23 16:32:09 +00:00
|
|
|
isLinkToAnnex s = ('/':objectDir) `isInfixOf` s
|
2011-01-27 20:10:45 +00:00
|
|
|
|
2011-12-02 18:39:47 +00:00
|
|
|
{- Converts a key into a filename fragment without any directory.
|
2010-10-13 07:41:12 +00:00
|
|
|
-
|
|
|
|
- Escape "/" in the key name, to keep a flat tree of files and avoid
|
|
|
|
- issues with keys containing "/../" or ending with "/" etc.
|
|
|
|
-
|
|
|
|
- "/" is escaped to "%" because it's short and rarely used, and resembles
|
|
|
|
- a slash
|
|
|
|
- "%" is escaped to "&s", and "&" to "&a"; this ensures that the mapping
|
|
|
|
- is one to one.
|
2011-03-16 03:39:04 +00:00
|
|
|
- ":" is escaped to "&c", because despite it being 2011, people still care
|
|
|
|
- about FAT.
|
2011-10-16 04:04:26 +00:00
|
|
|
-}
|
2010-10-13 07:41:12 +00:00
|
|
|
keyFile :: Key -> FilePath
|
2011-03-16 03:39:04 +00:00
|
|
|
keyFile key = replace "/" "%" $ replace ":" "&c" $
|
2012-08-08 20:06:01 +00:00
|
|
|
replace "%" "&s" $ replace "&" "&a" $ key2file key
|
2010-10-13 07:41:12 +00:00
|
|
|
|
2011-12-02 18:39:47 +00:00
|
|
|
{- A location to store a key on the filesystem. A directory hash is used,
|
|
|
|
- to protect against filesystems that dislike having many items in a
|
|
|
|
- single directory.
|
|
|
|
-
|
|
|
|
- The file is put in a directory with the same name, this allows
|
|
|
|
- write-protecting the directory to avoid accidental deletion of the file.
|
|
|
|
-}
|
|
|
|
keyPath :: Key -> Hasher -> FilePath
|
|
|
|
keyPath key hasher = hasher key </> f </> f
|
2012-10-29 01:27:15 +00:00
|
|
|
where
|
|
|
|
f = keyFile key
|
2011-12-02 18:39:47 +00:00
|
|
|
|
|
|
|
{- All possibile locations to store a key using different directory hashes. -}
|
|
|
|
keyPaths :: Key -> [FilePath]
|
|
|
|
keyPaths key = map (keyPath key) annexHashes
|
|
|
|
|
2010-10-14 03:31:08 +00:00
|
|
|
{- Reverses keyFile, converting a filename fragment (ie, the basename of
|
|
|
|
- the symlink target) into a key. -}
|
2011-03-16 01:34:13 +00:00
|
|
|
fileKey :: FilePath -> Maybe Key
|
2012-08-08 20:06:01 +00:00
|
|
|
fileKey file = file2key $
|
2011-03-16 03:39:04 +00:00
|
|
|
replace "&a" "&" $ replace "&s" "%" $
|
|
|
|
replace "&c" ":" $ replace "%" "/" file
|
2010-11-08 20:47:36 +00:00
|
|
|
|
|
|
|
{- for quickcheck -}
|
|
|
|
prop_idempotent_fileKey :: String -> Bool
|
2011-03-16 01:34:13 +00:00
|
|
|
prop_idempotent_fileKey s = Just k == fileKey (keyFile k)
|
2012-10-29 01:27:15 +00:00
|
|
|
where
|
|
|
|
k = stubKey { keyName = s, keyBackendName = "test" }
|
2011-03-15 21:47:00 +00:00
|
|
|
|
2011-12-02 18:39:47 +00:00
|
|
|
{- Two different directory hashes may be used. The mixed case hash
|
|
|
|
- came first, and is fine, except for the problem of case-strict
|
|
|
|
- filesystems such as Linux VFAT (mounted with shortname=mixed),
|
|
|
|
- which do not allow using a directory "XX" when "xx" already exists.
|
2011-12-02 18:56:48 +00:00
|
|
|
- To support that, most repositories use the lower case hash for new data. -}
|
2011-12-02 18:39:47 +00:00
|
|
|
type Hasher = Key -> FilePath
|
|
|
|
annexHashes :: [Hasher]
|
2011-12-02 18:56:48 +00:00
|
|
|
annexHashes = [hashDirLower, hashDirMixed]
|
2011-12-02 18:39:47 +00:00
|
|
|
|
|
|
|
hashDirMixed :: Hasher
|
2011-04-02 17:49:03 +00:00
|
|
|
hashDirMixed k = addTrailingPathSeparator $ take 2 dir </> drop 2 dir
|
2012-10-29 01:27:15 +00:00
|
|
|
where
|
|
|
|
dir = take 4 $ display_32bits_as_dir =<< [a,b,c,d]
|
|
|
|
ABCD (a,b,c,d) = md5 $ md5FilePath $ key2file k
|
2011-03-15 21:47:00 +00:00
|
|
|
|
2011-12-02 18:39:47 +00:00
|
|
|
hashDirLower :: Hasher
|
2011-04-02 17:49:03 +00:00
|
|
|
hashDirLower k = addTrailingPathSeparator $ take 3 dir </> drop 3 dir
|
2012-10-29 01:27:15 +00:00
|
|
|
where
|
|
|
|
dir = take 6 $ md5s $ md5FilePath $ key2file k
|
2011-03-15 21:47:00 +00:00
|
|
|
|
|
|
|
{- modified version of display_32bits_as_hex from Data.Hash.MD5
|
|
|
|
- Copyright (C) 2001 Ian Lynagh
|
|
|
|
- License: Either BSD or GPL
|
|
|
|
-}
|
|
|
|
display_32bits_as_dir :: Word32 -> String
|
|
|
|
display_32bits_as_dir w = trim $ swap_pairs cs
|
2012-10-29 01:27:15 +00:00
|
|
|
where
|
|
|
|
-- Need 32 characters to use. To avoid inaverdently making
|
|
|
|
-- a real word, use letters that appear less frequently.
|
|
|
|
chars = ['0'..'9'] ++ "zqjxkmvwgpfZQJXKMVWGPF"
|
|
|
|
cs = map (\x -> getc $ (shiftR w (6*x)) .&. 31) [0..7]
|
|
|
|
getc n = chars !! fromIntegral n
|
|
|
|
swap_pairs (x1:x2:xs) = x2:x1:swap_pairs xs
|
|
|
|
swap_pairs _ = []
|
|
|
|
-- Last 2 will always be 00, so omit.
|
|
|
|
trim = take 6
|