git-annex/Command/Log.hs

287 lines
8.9 KiB
Haskell
Raw Normal View History

{- git-annex command
-
2016-07-17 19:15:08 +00:00
- Copyright 2012, 2016 Joey Hess <id@joeyh.name>
-
- Licensed under the GNU AGPL version 3 or higher.
-}
module Command.Log where
import qualified Data.Set as S
import qualified Data.Map as M
import Data.Char
import Data.Time.Clock.POSIX
import Data.Time
import qualified System.FilePath.ByteString as P
import Command
import Logs
2016-07-17 19:15:08 +00:00
import Logs.Location
import qualified Annex.Branch
import qualified Git
import Git.Command
import qualified Remote
2012-01-07 01:27:42 +00:00
import qualified Annex
2012-01-06 22:54:48 +00:00
data RefChange = RefChange
{ changetime :: POSIXTime
, oldref :: Git.Ref
, newref :: Git.Ref
2016-07-17 19:15:08 +00:00
, changekey :: Key
2012-01-06 22:54:48 +00:00
}
2016-07-17 19:15:08 +00:00
deriving (Show)
2012-01-06 22:54:48 +00:00
2016-07-17 19:15:08 +00:00
data LogChange = Added | Removed
type Outputter = LogChange -> POSIXTime -> [UUID] -> Annex ()
cmd :: Command
cmd = withGlobalOptions [annexedMatchingOptions] $
command "log" SectionQuery "shows location log"
2015-07-13 14:44:51 +00:00
paramPaths (seek <$$> optParser)
2012-01-06 21:24:03 +00:00
2015-07-13 14:44:51 +00:00
data LogOptions = LogOptions
{ logFiles :: CmdParams
2016-07-17 19:15:08 +00:00
, allOption :: Bool
, rawDateOption :: Bool
2015-07-13 14:44:51 +00:00
, gourceOption :: Bool
, passthruOptions :: [CommandParam]
}
2015-07-13 14:44:51 +00:00
optParser :: CmdParamsDesc -> Parser LogOptions
optParser desc = LogOptions
<$> cmdParams desc
2016-07-17 19:15:08 +00:00
<*> switch
( long "all"
<> short 'A'
<> help "display location log changes to all files"
)
<*> switch
( long "raw-date"
<> help "display seconds from unix epoch"
)
2015-07-13 14:44:51 +00:00
<*> switch
( long "gource"
<> help "format output for gource"
)
<*> (concat <$> many passthru)
2012-11-12 05:05:04 +00:00
where
2015-07-13 14:44:51 +00:00
passthru :: Parser [CommandParam]
passthru = datepassthru "since"
<|> datepassthru "after"
<|> datepassthru "until"
<|> datepassthru "before"
<|> (mkpassthru "max-count" <$> strOption
( long "max-count" <> metavar paramNumber
<> help "limit number of logs displayed"
))
datepassthru n = mkpassthru n <$> strOption
( long n <> metavar paramDate
<> help ("show log " ++ n ++ " date")
)
mkpassthru n v = [Param ("--" ++ n), Param v]
2015-07-13 14:44:51 +00:00
seek :: LogOptions -> CommandSeek
seek o = do
m <- Remote.uuidDescriptions
zone <- liftIO getCurrentTimeZone
2016-07-17 19:15:08 +00:00
let outputter = mkOutputter m zone o
let seeker = AnnexedFileSeeker
{ startAction = start o outputter
, checkContentPresent = Nothing
-- the way this uses the location log would not be helped
-- by precaching the current value
, usesLocationLog = False
}
2016-07-17 19:15:08 +00:00
case (logFiles o, allOption o) of
(fs, False) -> withFilesInGitAnnex ww seeker
=<< workTreeItems ww fs
2016-07-17 19:15:08 +00:00
([], True) -> commandAction (startAll o outputter)
(_, True) -> giveup "Cannot specify both files and --all"
where
ww = WarnUnmatchLsFiles
2016-07-17 19:15:08 +00:00
start :: LogOptions -> (FilePath -> Outputter) -> SeekInput -> RawFilePath -> Key -> CommandStart
start o outputter _ file key = do
2016-07-17 19:15:08 +00:00
(changes, cleanup) <- getKeyLog key (passthruOptions o)
showLogIncremental (outputter (fromRawFilePath file)) changes
void $ liftIO cleanup
stop
2016-07-17 19:15:08 +00:00
startAll :: LogOptions -> (String -> Outputter) -> CommandStart
startAll o outputter = do
(changes, cleanup) <- getAllLog (passthruOptions o)
showLog outputter changes
void $ liftIO cleanup
stop
{- Displays changes made. Only works when all the RefChanges are for the
- same key. The method is to compare each value with the value
- after it in the list, which is the old version of the value.
-
- This ncessarily buffers the whole list, so does not stream.
- But, the number of location log changes for a single key tends to be
- fairly small.
-
- This minimizes the number of reads from git; each logged value is read
- only once.
-
- This also generates subtly better output when the git-annex branch
- got diverged.
-}
showLogIncremental :: Outputter -> [RefChange] -> Annex ()
showLogIncremental outputter ps = do
2012-01-06 22:54:48 +00:00
sets <- mapM (getset newref) ps
previous <- maybe (return genesis) (getset oldref) (lastMaybe ps)
2016-07-17 19:15:08 +00:00
let l = sets ++ [previous]
let changes = map (\((t, new), (_, old)) -> (t, new, old))
(zip l (drop 1 l))
sequence_ $ compareChanges outputter changes
2012-11-12 05:05:04 +00:00
where
genesis = (0, S.empty)
getset select change = do
2016-07-17 19:15:08 +00:00
s <- S.fromList <$> loggedLocationsRef (select change)
2012-11-12 05:05:04 +00:00
return (changetime change, s)
2016-07-17 19:15:08 +00:00
{- Displays changes made. Streams, and can display changes affecting
- different keys, but does twice as much reading of logged values
- as showLogIncremental. -}
showLog :: (String -> Outputter) -> [RefChange] -> Annex ()
showLog outputter cs = forM_ cs $ \c -> do
let keyname = serializeKey (changekey c)
2016-07-17 19:15:08 +00:00
new <- S.fromList <$> loggedLocationsRef (newref c)
old <- S.fromList <$> loggedLocationsRef (oldref c)
sequence_ $ compareChanges (outputter keyname)
[(changetime c, new, old)]
mkOutputter :: UUIDDescMap -> TimeZone -> LogOptions -> FilePath -> Outputter
2016-07-17 19:15:08 +00:00
mkOutputter m zone o file
| rawDateOption o = normalOutput lookupdescription file show
| gourceOption o = gourceOutput lookupdescription file
| otherwise = normalOutput lookupdescription file (showTimeStamp zone)
where
lookupdescription u = maybe (fromUUID u) (fromUUIDDesc) (M.lookup u m)
normalOutput :: (UUID -> String) -> FilePath -> (POSIXTime -> String) -> Outputter
2016-07-17 19:15:08 +00:00
normalOutput lookupdescription file formattime logchange ts us =
liftIO $ mapM_ (putStrLn . format) us
2012-11-12 05:05:04 +00:00
where
time = formattime ts
2016-07-17 19:15:08 +00:00
addel = case logchange of
Added -> "+"
Removed -> "-"
2012-11-12 05:05:04 +00:00
format u = unwords [ addel, time, file, "|",
fromUUID u ++ " -- " ++ lookupdescription u ]
gourceOutput :: (UUID -> String) -> FilePath -> Outputter
2016-07-17 19:15:08 +00:00
gourceOutput lookupdescription file logchange ts us =
liftIO $ mapM_ (putStrLn . intercalate "|" . format) us
2012-11-12 05:05:04 +00:00
where
time = takeWhile isDigit $ show ts
2016-07-17 19:15:08 +00:00
addel = case logchange of
Added -> "A"
Removed -> "M"
2012-11-12 05:05:04 +00:00
format u = [ time, lookupdescription u, addel, file ]
2016-07-17 19:15:08 +00:00
{- Generates a display of the changes.
2012-01-07 04:45:01 +00:00
- Uses a formatter to generate a display of items that are added and
- removed. -}
2016-07-17 19:15:08 +00:00
compareChanges :: Ord a => (LogChange -> POSIXTime -> [a] -> b) -> [(POSIXTime, S.Set a, S.Set a)] -> [b]
compareChanges format changes = concatMap diff changes
2012-11-12 05:05:04 +00:00
where
2016-07-17 19:15:08 +00:00
diff (ts, new, old) =
[ format Added ts $ S.toList $ S.difference new old
, format Removed ts $ S.toList $ S.difference old new
]
2016-07-17 19:15:08 +00:00
{- Streams the git log for a given key's location log file.
-
- This is complicated by git log using paths relative to the current
- directory, even when looking at files in a different branch. A wacky
- relative path to the log file has to be used.
-
- The --remove-empty is a significant optimisation. It relies on location
- log files never being deleted in normal operation. Letting git stop
- once the location log file is gone avoids it checking all the way back
- to commit 0 to see if it used to exist, so generally speeds things up a
- *lot* for newish files. -}
2016-07-17 19:15:08 +00:00
getKeyLog :: Key -> [CommandParam] -> Annex ([RefChange], IO Bool)
getKeyLog key os = do
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
top <- fromRepo Git.repoPath
p <- liftIO $ relPathCwdToFile top
config <- Annex.getGitConfig
let logfile = p P.</> locationLogFile config key
getGitLog [fromRawFilePath logfile] (Param "--remove-empty" : os)
2016-07-17 19:15:08 +00:00
{- Streams the git log for all git-annex branch changes. -}
getAllLog :: [CommandParam] -> Annex ([RefChange], IO Bool)
getAllLog = getGitLog []
getGitLog :: [FilePath] -> [CommandParam] -> Annex ([RefChange], IO Bool)
getGitLog fs os = do
config <- Annex.getGitConfig
2016-07-17 19:15:08 +00:00
(ls, cleanup) <- inRepo $ pipeNullSplit $
[ Param "log"
, Param "-z"
, Param "--pretty=format:%ct"
, Param "--raw"
, Param "--no-abbrev"
2012-01-07 01:27:42 +00:00
] ++ os ++
[ Param $ Git.fromRef Annex.Branch.fullname
, Param "--"
2016-07-17 19:15:08 +00:00
] ++ map Param fs
return (parseGitRawLog config (map decodeBL' ls), cleanup)
2016-07-17 19:15:08 +00:00
-- Parses chunked git log --raw output, which looks something like:
--
-- [ "timestamp\n:changeline"
-- , "logfile"
-- , ""
-- , "timestamp\n:changeline"
-- , "logfile"
-- , ":changeline"
-- , "logfile"
-- , ""
-- ]
--
-- The timestamp is not included before all changelines, so
-- keep track of the most recently seen timestamp.
parseGitRawLog :: GitConfig -> [String] -> [RefChange]
parseGitRawLog config = parse epoch
2012-11-12 05:05:04 +00:00
where
2016-07-17 19:15:08 +00:00
epoch = toEnum 0 :: POSIXTime
parse oldts ([]:rest) = parse oldts rest
parse oldts (c1:c2:rest) = case mrc of
Just rc -> rc : parse ts rest
Nothing -> parse ts (c2:rest)
where
(ts, cl) = case separate (== '\n') c1 of
(cl', []) -> (oldts, cl')
(tss, cl') -> (parseTimeStamp tss, cl')
mrc = do
(old, new) <- parseRawChangeLine cl
key <- locationLogFileKey config (toRawFilePath c2)
2016-07-17 19:15:08 +00:00
return $ RefChange
{ changetime = ts
, oldref = old
, newref = new
, changekey = key
}
parse _ _ = []
-- Parses something like "100644 100644 oldsha newsha M"
parseRawChangeLine :: String -> Maybe (Git.Ref, Git.Ref)
parseRawChangeLine = go . words
2012-11-12 05:05:04 +00:00
where
go (_:_:oldsha:newsha:_) =
Just (Git.Ref (encodeBS oldsha), Git.Ref (encodeBS newsha))
2016-07-17 19:15:08 +00:00
go _ = Nothing
parseTimeStamp :: String -> POSIXTime
parseTimeStamp = utcTimeToPOSIXSeconds . fromMaybe (error "bad timestamp") .
2015-05-10 19:54:58 +00:00
parseTimeM True defaultTimeLocale "%s"
2012-01-07 03:43:18 +00:00
showTimeStamp :: TimeZone -> POSIXTime -> String
showTimeStamp zone = formatTime defaultTimeLocale rfc822DateFormat
. utcToZonedTime zone . posixSecondsToUTCTime