34c8af74ba
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.
91 lines
2.3 KiB
Haskell
91 lines
2.3 KiB
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- 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
|
|
import GitAnnex.Options
|
|
|
|
def :: [Command]
|
|
def = [notBareRepo $ noCommit $ noMessages $ withOptions [jsonOption] $
|
|
command "status" paramPaths seek SectionCommon
|
|
"show the working tree status"]
|
|
|
|
seek :: CommandSeek
|
|
seek = withWords start
|
|
|
|
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.
|
|
cwd <- liftIO getCurrentDirectory
|
|
top <- fromRepo Git.repoPath
|
|
start' [relPathDirToFile cwd top]
|
|
start locs = start' locs
|
|
|
|
start' :: [FilePath] -> CommandStart
|
|
start' locs = do
|
|
(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
|
|
stop
|
|
|
|
data Status
|
|
= NewFile
|
|
| DeletedFile
|
|
| ModifiedFile
|
|
|
|
showStatus :: Status -> String
|
|
showStatus NewFile = "?"
|
|
showStatus DeletedFile = "D"
|
|
showStatus ModifiedFile = "M"
|
|
|
|
showFileStatus :: FilePath -> Status -> Annex ()
|
|
showFileStatus f s = unlessM (showFullJSON [("status", ss), ("file", f)]) $
|
|
liftIO $ putStrLn $ ss ++ " " ++ f
|
|
where
|
|
ss = showStatus s
|
|
|
|
statusDirect :: FilePath -> Annex (Maybe Status)
|
|
statusDirect f = checkstatus =<< liftIO (catchMaybeIO $ getFileStatus f)
|
|
where
|
|
checkstatus Nothing = return $ Just DeletedFile
|
|
checkstatus (Just s)
|
|
-- Git thinks that present direct mode files modifed,
|
|
-- so have to check.
|
|
| not (isSymbolicLink s) = checkkey s =<< catKeyFile f
|
|
| otherwise = Just <$> checkNew f
|
|
|
|
checkkey s (Just k) = ifM (sameFileStatus k s)
|
|
( 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
|
|
)
|