move

diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 3d2ab1c585c9c01a5f2f6ac28e3c2966d42c88bb..59bea8f99b9575e54e92f70f90378feb261ef397 100644 (file)
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -162,14 +162,6 @@ removeInodeCache key = withInodeCacheFile key $ \f ->
 withInodeCacheFile :: Key -> (FilePath -> Annex a) -> Annex a
 withInodeCacheFile key a = a =<< calcRepo (gitAnnexInodeCache key)
 
-{- Checks if a InodeCache matches the current version of a file. -}
-sameInodeCache :: FilePath -> [InodeCache] -> Annex Bool
-sameInodeCache _ [] = return False
-sameInodeCache file old = go =<< withTSDelta (liftIO . genInodeCache file)
-  where
-       go Nothing = return False
-       go (Just curr) = elemInodeCaches curr old
-
 {- Checks if a FileStatus matches the recorded InodeCache of a file. -}
 sameFileStatus :: Key -> FilePath -> FileStatus -> Annex Bool
 sameFileStatus key f status = do
@@ -180,13 +172,6 @@ sameFileStatus key f status = do
                ([], Nothing) -> return True
                _ -> return False
 
-elemInodeCaches :: InodeCache -> [InodeCache] -> Annex Bool
-elemInodeCaches _ [] = return False
-elemInodeCaches c (l:ls) = ifM (compareInodeCaches c l)
-       ( return True
-       , elemInodeCaches c ls
-       )
-
 compareInodeCachesWith :: Annex InodeComparisonType
 compareInodeCachesWith = ifM inodesChanged ( return Weakly, return Strongly )
 

diff --git a/Annex/InodeSentinal.hs b/Annex/InodeSentinal.hs
index 450e3b96777eb45246835222247d3ff555b555ba..8b48094dfc50a10e3d9b3201a48d9b3873195e36 100644 (file)
--- a/Annex/InodeSentinal.hs
+++ b/Annex/InodeSentinal.hs
@@ -14,7 +14,8 @@ import qualified Annex
 import Utility.InodeCache
 import Annex.Perms
 
-{- If the inodes have changed, only the size and mtime are compared. -}
+{- If the sendinal shows the inodes have changed, only the size and mtime
+ - are compared. -}
 compareInodeCaches :: InodeCache -> InodeCache -> Annex Bool
 compareInodeCaches x y
        | compareStrong x y = return True
@@ -23,6 +24,22 @@ compareInodeCaches x y
                , return False
                )
 
+{- Checks if one of the provided old InodeCache matches the current
+ - version of a file. -}
+sameInodeCache :: FilePath -> [InodeCache] -> Annex Bool
+sameInodeCache _ [] = return False
+sameInodeCache file old = go =<< withTSDelta (liftIO . genInodeCache file)
+  where
+       go Nothing = return False
+       go (Just curr) = elemInodeCaches curr old
+
+elemInodeCaches :: InodeCache -> [InodeCache] -> Annex Bool
+elemInodeCaches _ [] = return False
+elemInodeCaches c (l:ls) = ifM (compareInodeCaches c l)
+       ( return True
+       , elemInodeCaches c ls
+       )
+
 {- Some filesystems get new inodes each time they are mounted.
  - In order to work on such a filesystem, a sentinal file is used to detect
  - when the inodes have changed.