log --after=date

Command/Log.hs

@@ -23,29 +23,39 @@ import qualified Annex.Branch
 import qualified Git
 import Git.Command
 import qualified Remote
+import qualified Option
 
 def :: [Command]
-def = [command "log" paramPaths seek "shows location log"]
+def = [withOptions [afterOption] $
+	command "log" paramPaths seek "shows location log"]
+
+afterOption :: Option
+afterOption = Option.field [] "after" paramDate "show log after date"
 
 seek :: [CommandSeek]
-seek = [withFilesInGit $ whenAnnexed $ start]
+seek = [withField afterOption return $ \afteropt ->
+	withFilesInGit $ whenAnnexed $ start afteropt]
 
-start :: FilePath -> (Key, Backend) -> CommandStart
+start :: Maybe String -> FilePath -> (Key, Backend) -> CommandStart
-start file (key, _) = do
+start afteropt file (key, _) = do
 	showStart file ""
-	showLog =<< readLog key
+	let ps = case afteropt of
+		Nothing -> []
+		Just date -> [Param "--after", Param date]
+	showLog =<< (readLog <$> getLog key ps)
 	stop
 
-showLog :: [(POSIXTime, Git.Ref)] -> Annex ()
+showLog :: [(POSIXTime, (Git.Ref, Git.Ref))] -> Annex ()
 showLog ps = do
 	zone <- liftIO getCurrentTimeZone
-	sets <- mapM getset ps
+	sets <- mapM (getset snd) ps
+	previous <- maybe (return genesis) (getset fst) (lastMaybe ps)
 	liftIO $ putStrLn ""
-	mapM_ (diff zone) $ zip sets (drop 1 sets ++ genesis)
+	mapM_ (diff zone) $ zip sets (drop 1 sets ++ [previous])
 	where
-		genesis = [(0, S.empty)]
+		genesis = (0, S.empty)
-		getset (ts, ref) = do
+		getset select (ts, refs) = do
-			s <- S.fromList <$> get ref
+			s <- S.fromList <$> get (select refs)
 			return (ts, s)
 		get ref = map toUUID . Logs.Presence.getLog . L.unpack <$>
 			catObject ref
@@ -68,27 +78,33 @@ showLog ps = do
 						, r
 						]
 
-getLog :: Key -> Annex [String]
+getLog :: Key -> [CommandParam] -> Annex [String]
-getLog key = do
+getLog key ps = do
 	top <- fromRepo Git.workTree
 	p <- liftIO $ relPathCwdToFile top
 	let logfile = p </> Logs.Location.logFile key
-	inRepo $ pipeNullSplit
+	inRepo $ pipeNullSplit $
 		[ Params "log -z --pretty=format:%ct --raw --abbrev=40"
-		, Param $ show Annex.Branch.fullname
+		, Param "--boundary"
+		] ++ ps ++
+		[ Param $ show Annex.Branch.fullname
 		, Param "--"
 		, Param logfile
 		]
 
-readLog :: Key -> Annex [(POSIXTime, Git.Ref)]
+readLog :: [String] -> [(POSIXTime, (Git.Ref, Git.Ref))]
-readLog key = mapMaybe (parse . lines) <$> getLog key
+readLog = mapMaybe (parse . lines)
 	where
 		parse (ts:raw:[]) = Just (parseTimeStamp ts, parseRaw raw)
 		parse _ = Nothing
 
 -- Parses something like ":100644 100644 oldsha newsha M"
-parseRaw :: String -> Git.Ref
+parseRaw :: String -> (Git.Ref, Git.Ref)
-parseRaw l = Git.Ref $ words l !! 3
+parseRaw l = (Git.Ref oldsha, Git.Ref newsha)
+	where
+		ws = words l
+		oldsha = ws !! 2
+		newsha = ws !! 3
 
 parseTimeStamp :: String -> POSIXTime
 parseTimeStamp = utcTimeToPOSIXSeconds . fromMaybe (error "bad timestamp") .

Git/Sha.hs

@@ -34,3 +34,6 @@ extractSha s
 {- Size of a git sha. -}
 shaSize :: Int
 shaSize = 40
+
+nullSha :: Ref		
+nullSha = Ref $ replicate shaSize '0'

Git/UnionMerge.hs

@@ -103,14 +103,13 @@ calc_merge ch differ repo streamer = gendiff >>= go
  - a line suitable for update_index that union merges the two sides of the
  - diff. -}
 mergeFile :: String -> FilePath -> CatFileHandle -> Repo -> IO (Maybe String)
-mergeFile info file h repo = case filter (/= nullsha) [Ref asha, Ref bsha] of
+mergeFile info file h repo = case filter (/= nullSha) [Ref asha, Ref bsha] of
 	[] -> return Nothing
 	(sha:[]) -> use sha
 	shas -> use =<< either return (hashObject repo . L.unlines) =<<
 		calcMerge . zip shas <$> mapM getcontents shas
 	where
 		[_colonmode, _bmode, asha, bsha, _status] = words info
-		nullsha = Ref $ replicate shaSize '0'
 		getcontents s = L.lines <$> catObject h s
 		use sha = return $ Just $ update_index_line sha file
 

Usage.hs

@@ -72,6 +72,8 @@ paramUUID :: String
 paramUUID = "UUID"
 paramType :: String
 paramType = "TYPE"
+paramDate :: String
+paramDate = "Date"
 paramFormat :: String
 paramFormat = "FORMAT"
 paramKeyValue :: String

doc/git-annex.mdwn

@@ -278,6 +278,9 @@ subdirectories).
   Displays the location log for the specified file or files,
   showing each repository they were added to ("+") and removed from ("-").
 
+  To only show location changes after a date, specify --after=date.
+  (The "date" can be any format accepted by git log, ie "last wednesday")
+
 * status
 
   Displays some statistics and other information, including how much data