2013-11-07 17:55:36 +00:00
|
|
|
{- git-annex command
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2013 Joey Hess <id@joeyh.name>
|
2013-11-07 17:55:36 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
|
|
|
module Command.Status where
|
|
|
|
|
|
|
|
import Common.Annex
|
|
|
|
import Command
|
|
|
|
import Annex.CatFile
|
|
|
|
import Annex.Content.Direct
|
|
|
|
import Config
|
|
|
|
import qualified Git.LsFiles as LsFiles
|
|
|
|
import qualified Git.Ref
|
|
|
|
import qualified Git
|
|
|
|
|
2014-10-14 18:20:10 +00:00
|
|
|
cmd :: [Command]
|
|
|
|
cmd = [notBareRepo $ noCommit $ noMessages $ withOptions [jsonOption] $
|
2013-11-07 17:55:36 +00:00
|
|
|
command "status" paramPaths seek SectionCommon
|
|
|
|
"show the working tree status"]
|
|
|
|
|
fix inversion of control in CommandSeek (no behavior changes)
I've been disliking how the command seek actions were written for some
time, with their inversion of control and ugly workarounds.
The last straw to fix it was sync --content, which didn't fit the
Annex [CommandStart] interface well at all. I have not yet made it take
advantage of the changed interface though.
The crucial change, and probably why I didn't do it this way from the
beginning, is to make each CommandStart action be run with exceptions
caught, and if it fails, increment a failure counter in annex state.
So I finally remove the very first code I wrote for git-annex, which
was before I had exception handling in the Annex monad, and so ran outside
that monad, passing state explicitly as it ran each CommandStart action.
This was a real slog from 1 to 5 am.
Test suite passes.
Memory usage is lower than before, sometimes by a couple of megabytes, and
remains constant, even when running in a large repo, and even when
repeatedly failing and incrementing the error counter. So no accidental
laziness space leaks.
Wall clock speed is identical, even in large repos.
This commit was sponsored by an anonymous bitcoiner.
2014-01-20 08:11:42 +00:00
|
|
|
seek :: CommandSeek
|
|
|
|
seek = withWords start
|
2013-11-07 17:55:36 +00:00
|
|
|
|
|
|
|
start :: [FilePath] -> CommandStart
|
|
|
|
start [] = do
|
|
|
|
-- Like git status, when run without a directory, behave as if
|
|
|
|
-- given the path to the top of the repository.
|
|
|
|
top <- fromRepo Git.repoPath
|
2015-01-06 19:31:24 +00:00
|
|
|
d <- liftIO $ relPathCwdToFile top
|
|
|
|
start' [d]
|
2014-01-18 16:05:10 +00:00
|
|
|
start locs = start' locs
|
2013-11-07 17:55:36 +00:00
|
|
|
|
2014-01-18 16:05:10 +00:00
|
|
|
start' :: [FilePath] -> CommandStart
|
|
|
|
start' locs = do
|
2013-11-07 17:55:36 +00:00
|
|
|
(l, cleanup) <- inRepo $ LsFiles.modifiedOthers locs
|
|
|
|
getstatus <- ifM isDirect
|
|
|
|
( return statusDirect
|
|
|
|
, return $ Just <$$> statusIndirect
|
|
|
|
)
|
|
|
|
forM_ l $ \f -> maybe noop (showFileStatus f) =<< getstatus f
|
|
|
|
void $ liftIO cleanup
|
2014-01-18 16:05:10 +00:00
|
|
|
stop
|
2013-11-07 17:55:36 +00:00
|
|
|
|
|
|
|
data Status
|
|
|
|
= NewFile
|
|
|
|
| DeletedFile
|
|
|
|
| ModifiedFile
|
|
|
|
|
|
|
|
showStatus :: Status -> String
|
|
|
|
showStatus NewFile = "?"
|
|
|
|
showStatus DeletedFile = "D"
|
|
|
|
showStatus ModifiedFile = "M"
|
|
|
|
|
|
|
|
showFileStatus :: FilePath -> Status -> Annex ()
|
2014-01-18 16:05:10 +00:00
|
|
|
showFileStatus f s = unlessM (showFullJSON [("status", ss), ("file", f)]) $
|
|
|
|
liftIO $ putStrLn $ ss ++ " " ++ f
|
|
|
|
where
|
|
|
|
ss = showStatus s
|
2013-11-07 17:55:36 +00:00
|
|
|
|
|
|
|
statusDirect :: FilePath -> Annex (Maybe Status)
|
|
|
|
statusDirect f = checkstatus =<< liftIO (catchMaybeIO $ getFileStatus f)
|
|
|
|
where
|
|
|
|
checkstatus Nothing = return $ Just DeletedFile
|
|
|
|
checkstatus (Just s)
|
2014-11-03 17:17:55 +00:00
|
|
|
-- Git thinks that present direct mode files are modifed,
|
2013-11-07 17:55:36 +00:00
|
|
|
-- so have to check.
|
|
|
|
| not (isSymbolicLink s) = checkkey s =<< catKeyFile f
|
|
|
|
| otherwise = Just <$> checkNew f
|
|
|
|
|
2015-01-20 23:35:50 +00:00
|
|
|
checkkey s (Just k) = ifM (sameFileStatus k f s)
|
2013-11-07 17:55:36 +00:00
|
|
|
( return Nothing
|
|
|
|
, return $ Just ModifiedFile
|
|
|
|
)
|
|
|
|
checkkey _ Nothing = Just <$> checkNew f
|
|
|
|
|
|
|
|
statusIndirect :: FilePath -> Annex Status
|
|
|
|
statusIndirect f = ifM (liftIO $ isJust <$> catchMaybeIO (getFileStatus f))
|
|
|
|
( checkNew f
|
|
|
|
, return DeletedFile
|
|
|
|
)
|
|
|
|
where
|
|
|
|
|
|
|
|
checkNew :: FilePath -> Annex Status
|
|
|
|
checkNew f = ifM (isJust <$> catObjectDetails (Git.Ref.fileRef f))
|
|
|
|
( return ModifiedFile
|
|
|
|
, return NewFile
|
|
|
|
)
|