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.
137 lines
3.9 KiB
Haskell
137 lines
3.9 KiB
Haskell
{- git-annex v2 -> v3 upgrade support
|
|
-
|
|
- Copyright 2011 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Upgrade.V2 where
|
|
|
|
import Common.Annex
|
|
import qualified Git
|
|
import qualified Git.Command
|
|
import qualified Git.Ref
|
|
import qualified Annex.Branch
|
|
import Logs.Location
|
|
import Annex.Content
|
|
import Utility.TempFile
|
|
|
|
olddir :: Git.Repo -> FilePath
|
|
olddir g
|
|
| Git.repoIsLocalBare g = ""
|
|
| otherwise = ".git-annex"
|
|
|
|
{- .git-annex/ moved to a git-annex branch.
|
|
-
|
|
- Strategy:
|
|
-
|
|
- * Create the git-annex branch.
|
|
- * Find each location log file in .git-annex/, and inject its content
|
|
- into the git-annex branch, unioning with any content already in
|
|
- there. (in passing, this deals with the semi transition that left
|
|
- some location logs hashed two different ways; both are found and
|
|
- merged).
|
|
- * Also inject remote.log, trust.log, and uuid.log.
|
|
- * git rm -rf .git-annex
|
|
- * Remove stuff that used to be needed in .gitattributes.
|
|
- * Commit changes.
|
|
-}
|
|
upgrade :: Annex Bool
|
|
upgrade = do
|
|
showAction "v2 to v3"
|
|
bare <- fromRepo Git.repoIsLocalBare
|
|
old <- fromRepo olddir
|
|
|
|
Annex.Branch.create
|
|
showProgress
|
|
|
|
e <- liftIO $ doesDirectoryExist old
|
|
when e $ do
|
|
mapM_ (\(k, f) -> inject f $ logFile k) =<< locationLogs
|
|
mapM_ (\f -> inject f f) =<< logFiles old
|
|
|
|
saveState False
|
|
showProgress
|
|
|
|
when e $ do
|
|
inRepo $ Git.Command.run "rm" [Param "-r", Param "-f", Param "-q", File old]
|
|
unless bare $ inRepo gitAttributesUnWrite
|
|
showProgress
|
|
|
|
unless bare push
|
|
|
|
return True
|
|
|
|
locationLogs :: Annex [(Key, FilePath)]
|
|
locationLogs = do
|
|
dir <- fromRepo gitStateDir
|
|
liftIO $ do
|
|
levela <- dirContents dir
|
|
levelb <- mapM tryDirContents levela
|
|
files <- mapM tryDirContents (concat levelb)
|
|
return $ mapMaybe islogfile (concat files)
|
|
where
|
|
tryDirContents d = catchDefaultIO (dirContents d) []
|
|
islogfile f = maybe Nothing (\k -> Just (k, f)) $
|
|
logFileKey $ takeFileName f
|
|
|
|
inject :: FilePath -> FilePath -> Annex ()
|
|
inject source dest = do
|
|
old <- fromRepo olddir
|
|
new <- liftIO (readFile $ old </> source)
|
|
Annex.Branch.change dest $ \prev ->
|
|
unlines $ nub $ lines prev ++ lines new
|
|
|
|
logFiles :: FilePath -> Annex [FilePath]
|
|
logFiles dir = return . filter (".log" `isSuffixOf`)
|
|
=<< liftIO (getDirectoryContents dir)
|
|
|
|
push :: Annex ()
|
|
push = do
|
|
origin_master <- inRepo $ Git.Ref.exists $ Git.Ref "origin/master"
|
|
origin_gitannex <- Annex.Branch.hasOrigin
|
|
case (origin_master, origin_gitannex) of
|
|
(_, True) -> do
|
|
-- Merge in the origin's git-annex branch,
|
|
-- so that pushing the git-annex branch
|
|
-- will immediately work. Not pushed here,
|
|
-- because it's less obnoxious to let the user
|
|
-- push.
|
|
Annex.Branch.update
|
|
(True, False) -> do
|
|
-- push git-annex to origin, so that
|
|
-- "git push" will from then on
|
|
-- automatically push it
|
|
Annex.Branch.update -- just in case
|
|
showAction "pushing new git-annex branch to origin"
|
|
showOutput
|
|
inRepo $ Git.Command.run "push"
|
|
[Param "origin", Param $ show Annex.Branch.name]
|
|
_ -> do
|
|
-- no origin exists, so just let the user
|
|
-- know about the new branch
|
|
Annex.Branch.update
|
|
showLongNote $
|
|
"git-annex branch created\n" ++
|
|
"Be sure to push this branch when pushing to remotes.\n"
|
|
|
|
{- Old .gitattributes contents, not needed anymore. -}
|
|
attrLines :: [String]
|
|
attrLines =
|
|
[ stateDir </> "*.log merge=union"
|
|
, stateDir </> "*/*/*.log merge=union"
|
|
]
|
|
|
|
gitAttributesUnWrite :: Git.Repo -> IO ()
|
|
gitAttributesUnWrite repo = do
|
|
let attributes = Git.attributes repo
|
|
whenM (doesFileExist attributes) $ do
|
|
c <- readFileStrict attributes
|
|
liftIO $ viaTmp writeFile attributes $ unlines $
|
|
filter (`notElem` attrLines) $ lines c
|
|
Git.Command.run "add" [File attributes] repo
|
|
|
|
stateDir :: FilePath
|
|
stateDir = addTrailingPathSeparator ".git-annex"
|
|
gitStateDir :: Git.Repo -> FilePath
|
|
gitStateDir repo = addTrailingPathSeparator $ Git.repoPath repo </> stateDir
|