2011-12-14 19:56:11 +00:00
|
|
|
{- running git commands
|
|
|
|
-
|
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
|
|
|
- Copyright 2010-2012 Joey Hess <joey@kitenet.net>
|
2011-12-14 19:56:11 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Git.Command where
|
|
|
|
|
2012-10-04 23:41:58 +00:00
|
|
|
import System.Process (std_out, env)
|
2011-12-14 19:56:11 +00:00
|
|
|
|
|
|
|
import Common
|
|
|
|
import Git
|
|
|
|
import Git.Types
|
2012-09-15 21:25:05 +00:00
|
|
|
import qualified Utility.CoProcess as CoProcess
|
2011-12-14 19:56:11 +00:00
|
|
|
|
|
|
|
{- Constructs a git command line operating on the specified repo. -}
|
|
|
|
gitCommandLine :: [CommandParam] -> Repo -> [CommandParam]
|
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
|
|
|
gitCommandLine params Repo { location = l@(Local _ _ ) } = setdir : settree ++ params
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
setdir = Param $ "--git-dir=" ++ gitdir l
|
|
|
|
settree = case worktree l of
|
|
|
|
Nothing -> []
|
|
|
|
Just t -> [Param $ "--work-tree=" ++ t]
|
2011-12-14 19:56:11 +00:00
|
|
|
gitCommandLine _ repo = assertLocal repo $ error "internal"
|
|
|
|
|
|
|
|
{- Runs git in the specified repo. -}
|
|
|
|
runBool :: String -> [CommandParam] -> Repo -> IO Bool
|
|
|
|
runBool subcommand params repo = assertLocal repo $
|
2012-08-25 00:50:39 +00:00
|
|
|
boolSystemEnv "git"
|
|
|
|
(gitCommandLine (Param subcommand : params) repo)
|
|
|
|
(gitEnv repo)
|
2011-12-14 19:56:11 +00:00
|
|
|
|
|
|
|
{- Runs git in the specified repo, throwing an error if it fails. -}
|
|
|
|
run :: String -> [CommandParam] -> Repo -> IO ()
|
|
|
|
run subcommand params repo = assertLocal repo $
|
2012-01-24 19:28:13 +00:00
|
|
|
unlessM (runBool subcommand params repo) $
|
2012-01-26 00:43:01 +00:00
|
|
|
error $ "git " ++ subcommand ++ " " ++ show params ++ " failed"
|
2011-12-14 19:56:11 +00:00
|
|
|
|
2012-10-04 22:47:31 +00:00
|
|
|
{- Runs a git subcommand and returns its output, lazily.
|
2011-12-14 19:56:11 +00:00
|
|
|
-
|
2012-10-04 22:47:31 +00:00
|
|
|
- Also returns an action that should be used when the output is all
|
|
|
|
- read (or no more is needed), that will wait on the command, and
|
|
|
|
- return True if it succeeded. Failure to wait will result in zombies.
|
2011-12-14 19:56:11 +00:00
|
|
|
-}
|
2012-10-04 22:47:31 +00:00
|
|
|
pipeReadLazy :: [CommandParam] -> Repo -> IO (String, IO Bool)
|
|
|
|
pipeReadLazy params repo = assertLocal repo $ do
|
2012-10-04 23:41:58 +00:00
|
|
|
(_, Just h, _, pid) <- createProcess p { std_out = CreatePipe }
|
|
|
|
fileEncoding h
|
2012-10-04 22:47:31 +00:00
|
|
|
c <- hGetContents h
|
|
|
|
return (c, checkSuccessProcess pid)
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
p = gitCreateProcess params repo
|
2012-10-04 22:04:09 +00:00
|
|
|
|
|
|
|
{- Runs a git subcommand, and returns its output, strictly.
|
|
|
|
-
|
|
|
|
- Nonzero exit status is ignored.
|
|
|
|
-}
|
|
|
|
pipeReadStrict :: [CommandParam] -> Repo -> IO String
|
|
|
|
pipeReadStrict params repo = assertLocal repo $
|
|
|
|
withHandle StdoutHandle (createProcessChecked ignoreFailureProcess) p $ \h -> do
|
|
|
|
fileEncoding h
|
|
|
|
output <- hGetContentsStrict h
|
|
|
|
hClose h
|
|
|
|
return output
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
p = gitCreateProcess params repo
|
2011-12-14 19:56:11 +00:00
|
|
|
|
2012-07-17 18:40:05 +00:00
|
|
|
{- Runs a git subcommand, feeding it input, and returning its output,
|
|
|
|
- which is expected to be fairly small, since it's all read into memory
|
|
|
|
- strictly. -}
|
|
|
|
pipeWriteRead :: [CommandParam] -> String -> Repo -> IO String
|
2012-07-18 19:30:26 +00:00
|
|
|
pipeWriteRead params s repo = assertLocal repo $
|
2012-08-25 00:50:39 +00:00
|
|
|
writeReadProcessEnv "git" (toCommand $ gitCommandLine params repo)
|
2012-10-12 16:19:30 +00:00
|
|
|
(gitEnv repo) s (Just fileEncoding)
|
2012-08-25 00:50:39 +00:00
|
|
|
|
|
|
|
{- Runs a git subcommand, feeding it input on a handle with an action. -}
|
|
|
|
pipeWrite :: [CommandParam] -> Repo -> (Handle -> IO ()) -> IO ()
|
2012-10-04 22:04:09 +00:00
|
|
|
pipeWrite params repo = withHandle StdinHandle createProcessSuccess $
|
|
|
|
gitCreateProcess params repo
|
|
|
|
|
2011-12-14 19:56:11 +00:00
|
|
|
{- Reads null terminated output of a git command (as enabled by the -z
|
|
|
|
- parameter), and splits it. -}
|
2012-10-04 22:47:31 +00:00
|
|
|
pipeNullSplit :: [CommandParam] -> Repo -> IO ([String], IO Bool)
|
|
|
|
pipeNullSplit params repo = do
|
|
|
|
(s, cleanup) <- pipeReadLazy params repo
|
|
|
|
return (filter (not . null) $ split sep s, cleanup)
|
2012-12-13 04:24:19 +00:00
|
|
|
where
|
|
|
|
sep = "\0"
|
2011-12-14 19:56:11 +00:00
|
|
|
|
2012-10-04 23:56:32 +00:00
|
|
|
|
2012-10-04 22:47:31 +00:00
|
|
|
pipeNullSplitZombie :: [CommandParam] -> Repo -> IO [String]
|
2012-10-04 23:56:32 +00:00
|
|
|
pipeNullSplitZombie params repo = leaveZombie <$> pipeNullSplit params repo
|
|
|
|
|
|
|
|
{- Doesn't run the cleanup action. A zombie results. -}
|
|
|
|
leaveZombie :: (a, IO Bool) -> a
|
|
|
|
leaveZombie = fst
|
2012-10-04 22:47:31 +00:00
|
|
|
|
2012-09-15 21:25:05 +00:00
|
|
|
{- Runs a git command as a coprocess. -}
|
|
|
|
gitCoProcessStart :: [CommandParam] -> Repo -> IO CoProcess.CoProcessHandle
|
|
|
|
gitCoProcessStart params repo = CoProcess.start "git" (toCommand $ gitCommandLine params repo) (gitEnv repo)
|
2012-10-04 22:47:31 +00:00
|
|
|
|
|
|
|
gitCreateProcess :: [CommandParam] -> Repo -> CreateProcess
|
|
|
|
gitCreateProcess params repo =
|
|
|
|
(proc "git" $ toCommand $ gitCommandLine params repo)
|
|
|
|
{ env = gitEnv repo }
|