From 0ac35d9b0ea997f9d6051d86889f4bb4df914498 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 21 Dec 2015 18:41:15 -0400 Subject: wip v6 support for assistant Files are not yet added to v6 repos in unlocked mode. --- Annex/Content/Direct.hs | 4 ---- Annex/InodeSentinal.hs | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'Annex') diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs index 59bea8f99..3b9d1aea2 100644 --- a/Annex/Content/Direct.hs +++ b/Annex/Content/Direct.hs @@ -21,7 +21,6 @@ module Annex.Content.Direct ( addInodeCache, writeInodeCache, compareInodeCaches, - compareInodeCachesWith, sameInodeCache, elemInodeCaches, sameFileStatus, @@ -172,9 +171,6 @@ sameFileStatus key f status = do ([], Nothing) -> return True _ -> return False -compareInodeCachesWith :: Annex InodeComparisonType -compareInodeCachesWith = ifM inodesChanged ( return Weakly, return Strongly ) - {- Copies the contentfile to the associated file, if the associated - file has no content. If the associated file does have content, - even if the content differs, it's left unchanged. -} diff --git a/Annex/InodeSentinal.hs b/Annex/InodeSentinal.hs index 8b48094df..412a7accc 100644 --- a/Annex/InodeSentinal.hs +++ b/Annex/InodeSentinal.hs @@ -24,6 +24,9 @@ compareInodeCaches x y , return False ) +compareInodeCachesWith :: Annex InodeComparisonType +compareInodeCachesWith = ifM inodesChanged ( return Weakly, return Strongly ) + {- Checks if one of the provided old InodeCache matches the current - version of a file. -} sameInodeCache :: FilePath -> [InodeCache] -> Annex Bool -- cgit v1.2.3