convert isPointerFile from Annex to IO

Annex/AutoMerge.hs

@@ -248,7 +248,7 @@ cleanConflictCruft resolvedks resolvedfs unstagedmap = do
 		| S.member f fs || S.member (conflictCruftBase f) fs = anyM id
 			[ pure (S.member i is)
 			, inks <$> isAnnexLink f
-			, inks <$> isPointerFile f
+			, inks <$> liftIO (isPointerFile f)
 			]
 		| otherwise = return False
 

Annex/Content.hs

@@ -505,7 +505,7 @@ moveAnnex key src = withObjectLoc key storeobject storedirect
 	alreadyhave = liftIO $ removeFile src
 
 populatePointerFile :: Key -> FilePath -> FilePath -> Annex ()
-populatePointerFile k obj f = go =<< isPointerFile f
+populatePointerFile k obj f = go =<< liftIO (isPointerFile f)
   where
 	go (Just k') | k == k' = do
 		liftIO $ nukeFile f

Annex/Link.hs

@@ -153,6 +153,6 @@ formatPointer k =
 	toInternalGitPath (pathSeparator:objectDir </> key2file k) ++ "\n"
 
 {- Checks if a file is a pointer to a key. -}
-isPointerFile :: FilePath -> Annex (Maybe Key)
-isPointerFile f = liftIO $ catchDefaultIO Nothing $ 
+isPointerFile :: FilePath -> IO (Maybe Key)
+isPointerFile f = catchDefaultIO Nothing $ 
 	parseLinkOrPointer <$> L.readFile f

Command/Lock.hs

@@ -41,7 +41,7 @@ startNew file key = ifM (isJust <$> isAnnexLink file)
 	( stop
 	, do
 		showStart "lock" file
-		go =<< isPointerFile file
+		go =<< liftIO (isPointerFile file)
 	)
   where
 	go (Just key')