2011-06-29 15:55:16 +00:00
|
|
|
{- git ls-files interface
|
|
|
|
-
|
2018-05-14 18:58:13 +00:00
|
|
|
- Copyright 2010-2018 Joey Hess <id@joeyh.name>
|
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,
|
2018-05-14 18:58:13 +00:00
|
|
|
notInRepoIncludingEmptyDirectories,
|
2013-08-22 14:20:03 +00:00
|
|
|
allFiles,
|
2012-12-24 18:24:13 +00:00
|
|
|
deleted,
|
2013-02-20 18:12:55 +00:00
|
|
|
modified,
|
2013-11-07 17:55:36 +00:00
|
|
|
modifiedOthers,
|
2011-06-29 15:55:16 +00:00
|
|
|
staged,
|
|
|
|
stagedNotDeleted,
|
2013-07-28 19:27:36 +00:00
|
|
|
stagedOthersDetails,
|
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,
|
2013-10-23 16:58:01 +00:00
|
|
|
StagedDetails,
|
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
|
|
|
|
2013-09-19 18:48:42 +00:00
|
|
|
import Numeric
|
|
|
|
import System.Posix.Types
|
|
|
|
|
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)
|
2015-06-01 17:52:23 +00:00
|
|
|
inRepo l = pipeNullSplit $
|
|
|
|
Param "ls-files" :
|
|
|
|
Param "--cached" :
|
|
|
|
Param "-z" :
|
|
|
|
Param "--" :
|
|
|
|
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)
|
2018-05-14 18:58:13 +00:00
|
|
|
notInRepo = notInRepo' []
|
|
|
|
|
|
|
|
notInRepo' :: [CommandParam] -> Bool -> [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
notInRepo' ps include_ignored l repo = pipeNullSplit params repo
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
2015-06-01 17:52:23 +00:00
|
|
|
params = concat
|
|
|
|
[ [ Param "ls-files", Param "--others"]
|
2018-05-14 18:58:13 +00:00
|
|
|
, ps
|
2015-06-01 17:52:23 +00:00
|
|
|
, exclude
|
|
|
|
, [ Param "-z", Param "--" ]
|
|
|
|
, map File l
|
|
|
|
]
|
2012-12-12 17:20:58 +00:00
|
|
|
exclude
|
|
|
|
| include_ignored = []
|
|
|
|
| otherwise = [Param "--exclude-standard"]
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2018-05-14 18:58:13 +00:00
|
|
|
{- Scans for files at the specified locations that are not checked into
|
|
|
|
- git. Empty directories are included in the result. -}
|
|
|
|
notInRepoIncludingEmptyDirectories :: Bool -> [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
notInRepoIncludingEmptyDirectories = notInRepo' [Param "--directory"]
|
|
|
|
|
2013-08-22 14:20:03 +00:00
|
|
|
{- Finds all files in the specified locations, whether checked into git or
|
|
|
|
- not. -}
|
|
|
|
allFiles :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
2015-06-01 17:52:23 +00:00
|
|
|
allFiles l = pipeNullSplit $
|
|
|
|
Param "ls-files" :
|
|
|
|
Param "--cached" :
|
|
|
|
Param "--others" :
|
|
|
|
Param "-z" :
|
|
|
|
Param "--" :
|
|
|
|
map File l
|
2013-08-22 14:20:03 +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
|
2015-06-01 17:52:23 +00:00
|
|
|
params =
|
|
|
|
Param "ls-files" :
|
|
|
|
Param "--deleted" :
|
|
|
|
Param "-z" :
|
|
|
|
Param "--" :
|
|
|
|
map File l
|
2012-12-24 18:24:13 +00:00
|
|
|
|
2013-02-20 18:12:55 +00:00
|
|
|
{- Returns a list of files in the specified locations that have been
|
|
|
|
- modified. -}
|
|
|
|
modified :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
modified l repo = pipeNullSplit params repo
|
|
|
|
where
|
2015-06-01 17:52:23 +00:00
|
|
|
params =
|
|
|
|
Param "ls-files" :
|
|
|
|
Param "--modified" :
|
|
|
|
Param "-z" :
|
|
|
|
Param "--" :
|
|
|
|
map File l
|
2013-11-07 17:55:36 +00:00
|
|
|
|
2013-12-12 18:01:24 +00:00
|
|
|
{- Files that have been modified or are not checked into git (and are not
|
|
|
|
- ignored). -}
|
2013-11-07 17:55:36 +00:00
|
|
|
modifiedOthers :: [FilePath] -> Repo -> IO ([FilePath], IO Bool)
|
|
|
|
modifiedOthers l repo = pipeNullSplit params repo
|
|
|
|
where
|
2015-06-01 17:52:23 +00:00
|
|
|
params =
|
|
|
|
Param "ls-files" :
|
|
|
|
Param "--modified" :
|
|
|
|
Param "--others" :
|
|
|
|
Param "--exclude-standard" :
|
|
|
|
Param "-z" :
|
|
|
|
Param "--" :
|
|
|
|
map File l
|
2013-02-20 18:12:55 +00:00
|
|
|
|
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
|
2015-06-01 17:52:23 +00:00
|
|
|
prefix = [Param "diff", Param "--cached", Param "--name-only", Param "-z"]
|
2015-03-30 23:44:13 +00:00
|
|
|
suffix = Param "--" : map File l
|
2011-06-29 15:55:16 +00:00
|
|
|
|
2013-10-23 16:58:01 +00:00
|
|
|
type StagedDetails = (FilePath, Maybe Sha, Maybe FileMode)
|
|
|
|
|
2013-07-28 19:27:36 +00:00
|
|
|
{- Returns details about files that are staged in the index,
|
|
|
|
- as well as files not yet in git. Skips ignored files. -}
|
2013-10-23 16:58:01 +00:00
|
|
|
stagedOthersDetails :: [FilePath] -> Repo -> IO ([StagedDetails], IO Bool)
|
2015-06-01 17:52:23 +00:00
|
|
|
stagedOthersDetails = stagedDetails' [Param "--others", Param "--exclude-standard"]
|
2013-07-28 19:27:36 +00:00
|
|
|
|
|
|
|
{- Returns details about all files that are staged in the index. -}
|
2013-10-23 16:58:01 +00:00
|
|
|
stagedDetails :: [FilePath] -> Repo -> IO ([StagedDetails], IO Bool)
|
2013-07-28 19:27:36 +00:00
|
|
|
stagedDetails = stagedDetails' []
|
|
|
|
|
|
|
|
{- Gets details about staged files, including the Sha of their staged
|
|
|
|
- contents. -}
|
2013-10-23 16:58:01 +00:00
|
|
|
stagedDetails' :: [CommandParam] -> [FilePath] -> Repo -> IO ([StagedDetails], IO Bool)
|
2013-07-28 19:27:36 +00:00
|
|
|
stagedDetails' ps l repo = do
|
2012-12-12 23:20:38 +00:00
|
|
|
(ls, cleanup) <- pipeNullSplit params repo
|
|
|
|
return (map parse ls, cleanup)
|
2012-12-12 17:25:26 +00:00
|
|
|
where
|
2015-06-01 17:52:23 +00:00
|
|
|
params = Param "ls-files" : Param "--stage" : Param "-z" : ps ++
|
2015-03-30 23:44:13 +00:00
|
|
|
Param "--" : map File l
|
2012-12-12 23:20:38 +00:00
|
|
|
parse s
|
2013-09-19 18:48:42 +00:00
|
|
|
| null file = (s, Nothing, Nothing)
|
|
|
|
| otherwise = (file, extractSha $ take shaSize rest, readmode mode)
|
2012-12-12 23:20:38 +00:00
|
|
|
where
|
|
|
|
(metadata, file) = separate (== '\t') s
|
2013-09-19 18:48:42 +00:00
|
|
|
(mode, rest) = separate (== ' ') metadata
|
2013-09-27 23:58:48 +00:00
|
|
|
readmode = fst <$$> headMaybe . readOct
|
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.
|
2015-01-06 19:31:24 +00:00
|
|
|
top <- absPath (repoPath repo)
|
2014-06-10 23:20:14 +00:00
|
|
|
currdir <- getCurrentDirectory
|
2015-01-06 19:31:24 +00:00
|
|
|
return (map (\f -> relPathDirToFileAbs currdir $ top </> f) fs, cleanup)
|
2012-12-12 17:20:58 +00:00
|
|
|
where
|
2015-06-01 17:52:23 +00:00
|
|
|
prefix =
|
|
|
|
[ Param "diff"
|
|
|
|
, Param "--name-only"
|
|
|
|
, Param "--diff-filter=T"
|
|
|
|
, Param "-z"
|
|
|
|
]
|
2015-03-30 23:44:13 +00:00
|
|
|
suffix = Param "--" : (if null l then [File "."] else 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
|
2018-05-14 18:22:44 +00:00
|
|
|
, unmergedTreeItemType :: Conflicting TreeItemType
|
2012-06-27 16:09:01 +00:00
|
|
|
, unmergedSha :: Conflicting Sha
|
2018-05-14 18:22:44 +00:00
|
|
|
}
|
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
|
2015-06-01 17:52:23 +00:00
|
|
|
params =
|
|
|
|
Param "ls-files" :
|
|
|
|
Param "--unmerged" :
|
|
|
|
Param "-z" :
|
|
|
|
Param "--" :
|
|
|
|
map File l
|
2012-06-27 16:09:01 +00:00
|
|
|
|
|
|
|
data InternalUnmerged = InternalUnmerged
|
|
|
|
{ isus :: Bool
|
|
|
|
, ifile :: FilePath
|
2018-05-14 18:22:44 +00:00
|
|
|
, itreeitemtype :: Maybe TreeItemType
|
2012-06-27 16:09:01 +00:00
|
|
|
, isha :: Maybe Sha
|
2018-05-14 18:22:44 +00:00
|
|
|
}
|
2012-06-27 16:09:01 +00:00
|
|
|
|
|
|
|
parseUnmerged :: String -> Maybe InternalUnmerged
|
|
|
|
parseUnmerged s
|
2012-10-18 04:45:22 +00:00
|
|
|
| null file = Nothing
|
|
|
|
| otherwise = case words metadata of
|
2018-05-14 18:22:44 +00:00
|
|
|
(rawtreeitemtype:rawsha:rawstage:_) -> do
|
2012-10-18 04:45:22 +00:00
|
|
|
stage <- readish rawstage :: Maybe Int
|
2015-04-19 04:38:29 +00:00
|
|
|
if stage /= 2 && stage /= 3
|
|
|
|
then Nothing
|
|
|
|
else do
|
2018-05-14 18:22:44 +00:00
|
|
|
treeitemtype <- readTreeItemType rawtreeitemtype
|
2015-04-19 04:38:29 +00:00
|
|
|
sha <- extractSha rawsha
|
|
|
|
return $ InternalUnmerged (stage == 2) file
|
2018-05-14 18:22:44 +00:00
|
|
|
(Just treeitemtype) (Just sha)
|
2012-10-18 04:45:22 +00:00
|
|
|
_ -> 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
|
2018-05-14 18:22:44 +00:00
|
|
|
(treeitemtypeA, treeitemtypeB, shaA, shaB)
|
|
|
|
| isus i = (itreeitemtype i, itreeitemtype sibi, isha i, isha sibi)
|
|
|
|
| otherwise = (itreeitemtype sibi, itreeitemtype i, isha sibi, isha i)
|
2012-12-12 17:20:58 +00:00
|
|
|
new = Unmerged
|
|
|
|
{ unmergedFile = ifile i
|
2018-05-14 18:22:44 +00:00
|
|
|
, unmergedTreeItemType = Conflicting treeitemtypeA treeitemtypeB
|
2012-12-12 17:20:58 +00:00
|
|
|
, 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)
|
2018-05-14 18:22:44 +00:00
|
|
|
, itreeitemtype = Nothing
|
2012-12-12 17:20:58 +00:00
|
|
|
, isha = Nothing
|
|
|
|
}
|