bb4f31a0ee
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.
81 lines
2.2 KiB
Haskell
81 lines
2.2 KiB
Haskell
{- git-annex repository initialization
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Init (
|
|
ensureInitialized,
|
|
initialize,
|
|
uninitialize
|
|
) where
|
|
|
|
import Common.Annex
|
|
import Utility.TempFile
|
|
import qualified Git
|
|
import qualified Annex.Branch
|
|
import Logs.UUID
|
|
import Annex.Version
|
|
import Annex.UUID
|
|
|
|
initialize :: Maybe String -> Annex ()
|
|
initialize mdescription = do
|
|
prepUUID
|
|
Annex.Branch.create
|
|
setVersion
|
|
gitPreCommitHookWrite
|
|
u <- getUUID
|
|
maybe (recordUUID u) (describeUUID u) mdescription
|
|
|
|
uninitialize :: Annex ()
|
|
uninitialize = do
|
|
gitPreCommitHookUnWrite
|
|
removeRepoUUID
|
|
|
|
{- Will automatically initialize if there is already a git-annex
|
|
branch from somewhere. Otherwise, require a manual init
|
|
to avoid git-annex accidentially being run in git
|
|
repos that did not intend to use it. -}
|
|
ensureInitialized :: Annex ()
|
|
ensureInitialized = getVersion >>= maybe needsinit checkVersion
|
|
where
|
|
needsinit = ifM Annex.Branch.hasSibling
|
|
( initialize Nothing
|
|
, error "First run: git-annex init"
|
|
)
|
|
|
|
{- set up a git pre-commit hook, if one is not already present -}
|
|
gitPreCommitHookWrite :: Annex ()
|
|
gitPreCommitHookWrite = unlessBare $ do
|
|
hook <- preCommitHook
|
|
ifM (liftIO $ doesFileExist hook)
|
|
( warning $ "pre-commit hook (" ++ hook ++ ") already exists, not configuring"
|
|
, liftIO $ do
|
|
viaTmp writeFile hook preCommitScript
|
|
p <- getPermissions hook
|
|
setPermissions hook $ p {executable = True}
|
|
)
|
|
|
|
gitPreCommitHookUnWrite :: Annex ()
|
|
gitPreCommitHookUnWrite = unlessBare $ do
|
|
hook <- preCommitHook
|
|
whenM (liftIO $ doesFileExist hook) $
|
|
ifM (liftIO $ (==) preCommitScript <$> readFile hook)
|
|
( liftIO $ removeFile hook
|
|
, warning $ "pre-commit hook (" ++ hook ++
|
|
") contents modified; not deleting." ++
|
|
" Edit it to remove call to git annex."
|
|
)
|
|
|
|
unlessBare :: Annex () -> Annex ()
|
|
unlessBare = unlessM $ fromRepo Git.repoIsLocalBare
|
|
|
|
preCommitHook :: Annex FilePath
|
|
preCommitHook = (</>) <$> fromRepo Git.localGitDir <*> pure "hooks/pre-commit"
|
|
|
|
preCommitScript :: String
|
|
preCommitScript =
|
|
"#!/bin/sh\n" ++
|
|
"# automatically configured by git-annex\n" ++
|
|
"git annex pre-commit .\n"
|