relFile does not have to be relative; rename to currFile

Annex/FileMatcher.hs

@@ -42,7 +42,7 @@ fileMatchInfo file = do
 	matchfile <- getTopFilePath <$> inRepo (toTopFilePath file)
 	return $ MatchingFile FileInfo
 		{ matchFile = matchfile
-		, relFile = file
+		, currFile = file
 		}
 
 matchAll :: FileMatcher Annex

CmdLine/Seek.hs

@@ -77,7 +77,7 @@ withPathContents a params = do
 		, return [(p, takeFileName p)]
 		)
 	checkmatch matcher (f, relf) = matcher $ MatchingFile $ FileInfo
-		{ relFile = f
+		{ currFile = f
 		, matchFile = relf
 		}
 

Limit.hs

@@ -239,7 +239,7 @@ limitSize vs s = case readSize dataUnits s of
 	checkkey sz key = return $ keySize key `vs` Just sz
 	check _ sz (Just key) = checkkey sz key
 	check fi sz Nothing = do
-		filesize <- liftIO $ catchMaybeIO $ getFileSize (relFile fi)
+		filesize <- liftIO $ catchMaybeIO $ getFileSize (currFile fi)
 		return $ filesize `vs` Just sz
 
 addMetaData :: String -> Annex ()
@@ -271,7 +271,7 @@ addTimeLimit s = do
 			else return True
 
 lookupFileKey :: FileInfo -> Annex (Maybe Key)
-lookupFileKey = Backend.lookupFile . relFile
+lookupFileKey = Backend.lookupFile . currFile
 
 checkKey :: (Key -> Annex Bool) -> MatchInfo -> Annex Bool
 checkKey a (MatchingFile fi) = lookupFileKey fi >>= maybe (return False) a

Types/FileMatcher.hs

@@ -19,8 +19,10 @@ data MatchInfo
 	| MatchingKey Key
 
 data FileInfo = FileInfo
-	{ relFile :: FilePath -- may be relative to cwd
+	{ currFile :: FilePath
-	, matchFile :: FilePath -- filepath to match on; may be relative to top
+	-- ^ current path to the file, for operations that examine it
+	, matchFile :: FilePath
+	-- ^ filepath to match on; may be relative to top of repo or cwd
 	}
 
 type FileMatcherMap a = M.Map UUID (Utility.Matcher.Matcher (S.Set UUID -> MatchInfo -> a Bool))