From b5c8ba7db3ea2eb4f1cd28e49cadb5fd348ca738 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 9 Dec 2015 15:42:16 -0400
Subject: move InodeSentinal from direct mode code to its own module

Will be used outside of direct mode for v6 unlocked files, and is already
used outside of direct mode when adding files to annex.
---
 Annex/Content/Direct.hs | 60 ++++---------------------------------------------
 1 file changed, 4 insertions(+), 56 deletions(-)

(limited to 'Annex/Content/Direct.hs')

diff --git a/Annex/Content/Direct.hs b/Annex/Content/Direct.hs
index 86e053d7f..1edcbaed5 100644
--- a/Annex/Content/Direct.hs
+++ b/Annex/Content/Direct.hs
@@ -1,12 +1,13 @@
 {- git-annex file content managing for direct mode
+ -
+ - This is deprecated, and will be removed when direct mode gets removed
+ - from git-annex.
  -
  - Copyright 2012-2014 Joey Hess <id@joeyh.name>
  -
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE CPP #-}
-
 module Annex.Content.Direct (
 	associatedFiles,
 	associatedFilesRelative,
@@ -26,15 +27,10 @@ module Annex.Content.Direct (
 	sameFileStatus,
 	removeInodeCache,
 	toInodeCache,
-	inodesChanged,
-	createInodeSentinalFile,
 	addContentWhenNotPresent,
-	withTSDelta,
-	getTSDelta,
 ) where
 
 import Common.Annex
-import qualified Annex
 import Annex.Perms
 import qualified Git
 import Utility.Tmp
@@ -43,6 +39,7 @@ import Utility.InodeCache
 import Utility.CopyFile
 import Annex.ReplaceFile
 import Annex.Link
+import Annex.InodeSentinal
 
 {- Absolute FilePaths of Files in the tree that are associated with a key. -}
 associatedFiles :: Key -> Annex [FilePath]
@@ -212,52 +209,3 @@ addContentWhenNotPresent key contentfile associatedfile = do
 		replaceFile associatedfile $
 			liftIO . void . copyFileExternal CopyAllMetaData contentfile
 	updateInodeCache key associatedfile	
-
-{- 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.
- -
- - If the sentinal file does not exist, we have to assume that the
- - inodes have changed.
- -}
-inodesChanged :: Annex Bool
-inodesChanged = sentinalInodesChanged <$> sentinalStatus
-
-withTSDelta :: (TSDelta -> Annex a) -> Annex a
-withTSDelta a = a =<< getTSDelta
-
-getTSDelta :: Annex TSDelta
-#ifdef mingw32_HOST_OS
-getTSDelta = sentinalTSDelta <$> sentinalStatus
-#else
-getTSDelta = pure noTSDelta -- optimisation
-#endif
-
-sentinalStatus :: Annex SentinalStatus
-sentinalStatus = maybe check return =<< Annex.getState Annex.sentinalstatus
-  where
-	check = do
-		sc <- liftIO . checkSentinalFile =<< annexSentinalFile
-		Annex.changeState $ \s -> s { Annex.sentinalstatus = Just sc }
-		return sc
-
-{- The sentinal file is only created when first initializing a repository.
- - If there are any annexed objects in the repository already, creating
- - the file would invalidate their inode caches. -}
-createInodeSentinalFile :: Annex ()
-createInodeSentinalFile = unlessM (alreadyexists <||> hasobjects) $ do
-	s <- annexSentinalFile
-	createAnnexDirectory (parentDir (sentinalFile s))
-	liftIO $ writeSentinalFile s
-  where
-	alreadyexists = liftIO. sentinalFileExists =<< annexSentinalFile
-	hasobjects = liftIO . doesDirectoryExist =<< fromRepo gitAnnexObjectDir
-
-annexSentinalFile :: Annex SentinalFile
-annexSentinalFile = do
-	sentinalfile <- fromRepo gitAnnexInodeSentinal
-	sentinalcachefile <- fromRepo gitAnnexInodeSentinalCache
-	return SentinalFile
-		{ sentinalFile = sentinalfile
-		, sentinalCacheFile = sentinalcachefile
-		}
-- 
cgit v1.2.3