change log display
Including the file in the lines behaves better when limiting with --after, since only files that changed in the time period are shown. Still not fully happy with the line layout, but putting the +/- first followed by the date seems a good change.
This commit is contained in:
parent
9fb5f3edc7
commit
078788a9e7
1 changed files with 8 additions and 8 deletions
|
@ -38,19 +38,17 @@ seek = [withField afterOption return $ \afteropt ->
|
||||||
|
|
||||||
start :: Maybe String -> FilePath -> (Key, Backend) -> CommandStart
|
start :: Maybe String -> FilePath -> (Key, Backend) -> CommandStart
|
||||||
start afteropt file (key, _) = do
|
start afteropt file (key, _) = do
|
||||||
showStart file ""
|
|
||||||
let ps = case afteropt of
|
let ps = case afteropt of
|
||||||
Nothing -> []
|
Nothing -> []
|
||||||
Just date -> [Param "--after", Param date]
|
Just date -> [Param "--after", Param date]
|
||||||
showLog =<< (readLog <$> getLog key ps)
|
showLog file =<< (readLog <$> getLog key ps)
|
||||||
stop
|
stop
|
||||||
|
|
||||||
showLog :: [(POSIXTime, (Git.Ref, Git.Ref))] -> Annex ()
|
showLog :: FilePath -> [(POSIXTime, (Git.Ref, Git.Ref))] -> Annex ()
|
||||||
showLog ps = do
|
showLog file ps = do
|
||||||
zone <- liftIO getCurrentTimeZone
|
zone <- liftIO getCurrentTimeZone
|
||||||
sets <- mapM (getset snd) ps
|
sets <- mapM (getset snd) ps
|
||||||
previous <- maybe (return genesis) (getset fst) (lastMaybe ps)
|
previous <- maybe (return genesis) (getset fst) (lastMaybe ps)
|
||||||
liftIO $ putStrLn ""
|
|
||||||
mapM_ (diff zone) $ zip sets (drop 1 sets ++ [previous])
|
mapM_ (diff zone) $ zip sets (drop 1 sets ++ [previous])
|
||||||
where
|
where
|
||||||
genesis = (0, S.empty)
|
genesis = (0, S.empty)
|
||||||
|
@ -70,11 +68,13 @@ showLog ps = do
|
||||||
output time present s = do
|
output time present s = do
|
||||||
rs <- map (dropWhile isSpace) . lines <$>
|
rs <- map (dropWhile isSpace) . lines <$>
|
||||||
Remote.prettyPrintUUIDs "log" (S.toList s)
|
Remote.prettyPrintUUIDs "log" (S.toList s)
|
||||||
liftIO $ mapM_ (putStrLn . indent . format) rs
|
liftIO $ mapM_ (putStrLn . format) rs
|
||||||
where
|
where
|
||||||
format r = unwords
|
format r = unwords
|
||||||
[ time
|
[ if present then "+" else "-"
|
||||||
, if present then "+" else "-"
|
, time
|
||||||
|
, file
|
||||||
|
, "|"
|
||||||
, r
|
, r
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue