2011-06-29 15:55:16 +00:00
|
|
|
{- git ls-files interface
|
|
|
|
-
|
2012-06-27 13:27:59 +00:00
|
|
|
- Copyright 2010,2012 Joey Hess <joey@kitenet.net>
|
2011-06-29 15:55:16 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2011-06-30 17:16:57 +00:00
|
|
|
module Git.LsFiles (
|
2011-06-29 15:55:16 +00:00
|
|
|
inRepo,
|
|
|
|
notInRepo,
|
2012-12-24 18:24:13 +00:00
|
|
|
deleted,
|
2011-06-29 15:55:16 +00:00
|
|
|
staged,
|
|
|
|
stagedNotDeleted,
|
2012-12-12 23:20:38 +00:00
|
|
|
stagedDetails,
|
2011-06-29 15:55:16 +00:00
|
|
|
typeChanged,
|
|
|
|
typeChangedStaged,
|
2012-06-27 16:09:01 +00:00
|
|
|
Conflicting(..),
|
|
|
|
Unmerged(..),
|
|
|
|
unmerged,
|
2011-06-29 15:55:16 +00:00
|
|
|
) where
|
|
|
|
|
2011-12-20 18:37:53 +00:00
|
|
|
import Common
|
2011-06-30 17:16:57 +00:00
|
|
|
import Git
|
2011-12-14 19:56:11 +00:00
|
|
|
import Git.Command
|
2012-06-27 13:27:59 +00:00
|
|
|
import Git.Types
|
|
|
|
import Git.Sha
|
2011-06-29 15:55:16 +00:00
|
|
|
|
|
|
|
{- Scans for files that are checked into git at the specified locations. -}
|
2012-10-04 23:56:32 +00:00
|
|
|
inRepo :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
inRepo l = pipeNullSplit $ Params "ls-files --cached -z --" : map File l
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2011-09-25 18:37:13 +00:00
|
|
|
{- Scans for files at the specified locations that are not checked into git. -}
|
2012-10-04 23:56:32 +00:00
|
|
|
notInRepo :: Bool -> [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
notInRepo include_ignored l repo = pipeNullSplit params repo
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
|
|
|
params = [Params "ls-files --others"] ++ exclude ++
|
|
|
|
[Params "-z --"] ++ map File l
|
|
|
|
exclude
|
|
|
|
| include_ignored = []
|
|
|
|
| otherwise = [Param "--exclude-standard"]
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2012-12-24 18:24:13 +00:00
|
|
|
{- Returns a list of files in the specified locations that have been
|
|
|
|
- deleted. -}
|
|
|
|
deleted :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
deleted l repo = pipeNullSplit params repo
|
|
|
|
where
|
|
|
|
params = [Params "ls-files --deleted -z --"] ++ map File l
|
|
|
|
|
2011-06-29 15:55:16 +00:00
|
|
|
{- Returns a list of all files that are staged for commit. -}
|
2012-10-04 23:56:32 +00:00
|
|
|
staged :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
2011-11-08 19:34:10 +00:00
|
|
|
staged = staged' []
|
2011-06-29 15:55:16 +00:00
|
|
|
|
|
|
|
{- Returns a list of the files, staged for commit, that are being added,
|
|
|
|
- moved, or changed (but not deleted), from the specified locations. -}
|
2012-10-04 23:56:32 +00:00
|
|
|
stagedNotDeleted :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
2011-11-08 19:34:10 +00:00
|
|
|
stagedNotDeleted = staged' [Param "--diff-filter=ACMRT"]
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2012-10-04 23:56:32 +00:00
|
|
|
staged' :: [CommandParam] -> [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
staged' ps l = pipeNullSplit $ prefix ++ ps ++ suffix
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
|
|
|
prefix = [Params "diff --cached --name-only -z"]
|
|
|
|
suffix = Param "--" : map File l
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2012-12-12 23:20:38 +00:00
|
|
|
{- Returns details about files that are staged in the index
|
|
|
|
- (including the Sha of their staged contents),
|
|
|
|
- as well as files not yet in git. -}
|
|
|
|
stagedDetails :: [FilePath] -> Repo -> IO ([(FilePath, Maybe Sha)], IO Bool)
|
|
|
|
stagedDetails l repo = do
|
|
|
|
(ls, cleanup) <- pipeNullSplit params repo
|
|
|
|
return (map parse ls, cleanup)
|
2012-12-12 17:25:26 +00:00
|
|
|
where
|
2012-12-12 23:20:38 +00:00
|
|
|
params = [Params "ls-files --others --exclude-standard --stage -z --"] ++
|
2012-12-12 17:25:26 +00:00
|
|
|
map File l
|
2012-12-12 23:20:38 +00:00
|
|
|
parse s
|
|
|
|
| null file = (s, Nothing)
|
|
|
|
| otherwise = (file, extractSha $ take shaSize $ drop 7 metadata)
|
|
|
|
where
|
|
|
|
(metadata, file) = separate (== '\t') s
|
2012-12-12 17:25:26 +00:00
|
|
|
|
2011-06-29 15:55:16 +00:00
|
|
|
{- Returns a list of the files in the specified locations that are staged
|
|
|
|
- for commit, and whose type has changed. -}
|
2012-10-04 23:56:32 +00:00
|
|
|
typeChangedStaged :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
2011-11-08 19:34:10 +00:00
|
|
|
typeChangedStaged = typeChanged' [Param "--cached"]
|
2011-06-29 15:55:16 +00:00
|
|
|
|
|
|
|
{- Returns a list of the files in the specified locations whose type has
|
|
|
|
- changed. Files only staged for commit will not be included. -}
|
2012-10-04 23:56:32 +00:00
|
|
|
typeChanged :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
2011-11-08 19:34:10 +00:00
|
|
|
typeChanged = typeChanged' []
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2012-10-04 23:56:32 +00:00
|
|
|
typeChanged' :: [CommandParam] -> [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
2012-02-14 04:22:42 +00:00
|
|
|
typeChanged' ps l repo = do
|
2012-10-04 23:56:32 +00:00
|
|
|
(fs, cleanup) <- pipeNullSplit (prefix ++ ps ++ suffix) repo
|
2012-02-14 04:22:42 +00:00
|
|
|
-- git diff returns filenames relative to the top of the git repo;
|
|
|
|
-- convert to filenames relative to the cwd, like git ls-files.
|
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
|
|
|
let top = repoPath repo
|
2012-02-14 04:22:42 +00:00
|
|
|
cwd <- getCurrentDirectory
|
2012-10-04 23:56:32 +00:00
|
|
|
return (map (\f -> relPathDirToFile cwd $ top </> f) fs, cleanup)
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
|
|
|
prefix = [Params "diff --name-only --diff-filter=T -z"]
|
|
|
|
suffix = Param "--" : map File l
|
2012-06-27 13:27:59 +00:00
|
|
|
|
2012-06-27 16:09:01 +00:00
|
|
|
{- A item in conflict has two possible values.
|
|
|
|
- Either can be Nothing, when that side deleted the file. -}
|
|
|
|
data Conflicting v = Conflicting
|
|
|
|
{ valUs :: Maybe v
|
|
|
|
, valThem :: Maybe v
|
|
|
|
} deriving (Show)
|
|
|
|
|
2012-06-27 13:27:59 +00:00
|
|
|
data Unmerged = Unmerged
|
|
|
|
{ unmergedFile :: FilePath
|
2012-06-27 16:09:01 +00:00
|
|
|
, unmergedBlobType :: Conflicting BlobType
|
|
|
|
, unmergedSha :: Conflicting Sha
|
|
|
|
} deriving (Show)
|
2012-06-27 13:27:59 +00:00
|
|
|
|
|
|
|
{- Returns a list of the files in the specified locations that have
|
2012-06-27 16:09:01 +00:00
|
|
|
- unresolved merge conflicts.
|
|
|
|
-
|
|
|
|
- ls-files outputs multiple lines per conflicting file, each with its own
|
|
|
|
- stage number:
|
|
|
|
- 1 = old version, can be ignored
|
|
|
|
- 2 = us
|
|
|
|
- 3 = them
|
2012-12-24 18:24:13 +00:00
|
|
|
- If a line is omitted, that side removed the file.
|
2012-06-27 16:09:01 +00:00
|
|
|
-}
|
2012-10-04 23:56:32 +00:00
|
|
|
unmerged :: [FilePath] -> Repo -> IO ([Unmerged], IO Bool)
|
|
|
|
unmerged l repo = do
|
|
|
|
(fs, cleanup) <- pipeNullSplit params repo
|
|
|
|
return (reduceUnmerged [] $ catMaybes $ map parseUnmerged fs, cleanup)
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
|
|
|
params = Params "ls-files --unmerged -z --" : map File l
|
2012-06-27 16:09:01 +00:00
|
|
|
|
|
|
|
data InternalUnmerged = InternalUnmerged
|
|
|
|
{ isus :: Bool
|
|
|
|
, ifile :: FilePath
|
|
|
|
, iblobtype :: Maybe BlobType
|
|
|
|
, isha :: Maybe Sha
|
|
|
|
} deriving (Show)
|
|
|
|
|
|
|
|
parseUnmerged :: String -> Maybe InternalUnmerged
|
|
|
|
parseUnmerged s
|
2012-10-18 04:45:22 +00:00
|
|
|
| null file = Nothing
|
|
|
|
| otherwise = case words metadata of
|
|
|
|
(rawblobtype:rawsha:rawstage:_) -> do
|
|
|
|
stage <- readish rawstage :: Maybe Int
|
|
|
|
unless (stage == 2 || stage == 3) $
|
|
|
|
fail undefined -- skip stage 1
|
|
|
|
blobtype <- readBlobType rawblobtype
|
|
|
|
sha <- extractSha rawsha
|
|
|
|
return $ InternalUnmerged (stage == 2) file
|
|
|
|
(Just blobtype) (Just sha)
|
|
|
|
_ -> Nothing
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
|
|
|
(metadata, file) = separate (== '\t') s
|
2012-06-27 16:09:01 +00:00
|
|
|
|
|
|
|
reduceUnmerged :: [Unmerged] -> [InternalUnmerged] -> [Unmerged]
|
|
|
|
reduceUnmerged c [] = c
|
|
|
|
reduceUnmerged c (i:is) = reduceUnmerged (new:c) rest
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
|
|
|
(rest, sibi) = findsib i is
|
|
|
|
(blobtypeA, blobtypeB, shaA, shaB)
|
|
|
|
| isus i = (iblobtype i, iblobtype sibi, isha i, isha sibi)
|
|
|
|
| otherwise = (iblobtype sibi, iblobtype i, isha sibi, isha i)
|
|
|
|
new = Unmerged
|
|
|
|
{ unmergedFile = ifile i
|
|
|
|
, unmergedBlobType = Conflicting blobtypeA blobtypeB
|
|
|
|
, unmergedSha = Conflicting shaA shaB
|
|
|
|
}
|
2012-12-24 18:24:13 +00:00
|
|
|
findsib templatei [] = ([], removed templatei)
|
2012-12-12 17:20:58 +00:00
|
|
|
findsib templatei (l:ls)
|
|
|
|
| ifile l == ifile templatei = (ls, l)
|
2012-12-24 18:24:13 +00:00
|
|
|
| otherwise = (l:ls, removed templatei)
|
|
|
|
removed templatei = templatei
|
2012-12-12 17:20:58 +00:00
|
|
|
{ isus = not (isus templatei)
|
|
|
|
, iblobtype = Nothing
|
|
|
|
, isha = Nothing
|
|
|
|
}
|