mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

didn't mean to commit this incomplete workaround

Browse source 
though I suppose it's nice to have it in the history..
This commit is contained in:
Joey Hess 2019-12-26 15:07:50 -04:00
parent 293f95c2d6
commit de14a7bab5
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 5 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Command/Smudge.hs
View file

@ -24,12 +24,9 @@ import Backend
import Utility.Metered import Utility.Metered
import Annex.InodeSentinal import Annex.InodeSentinal
import Utility.InodeCache import Utility.InodeCache
import Utility.ThreadScheduler
import qualified Data.ByteString as S import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
import Data.Time.Clock
import Data.Time.Clock.POSIX
cmd :: Command cmd :: Command
cmd = noCommit $ noMessages $ cmd = noCommit $ noMessages $
@ -91,14 +88,11 @@ clean file = do
Just k -> do Just k -> do
getMoveRaceRecovery k (toRawFilePath file) getMoveRaceRecovery k (toRawFilePath file)
liftIO $ L.hPut stdout b liftIO $ L.hPut stdout b
Nothing -> do Nothing -> go b =<< catKeyFile (toRawFilePath file)
ic <- withTSDelta (liftIO . genInodeCache (toRawFilePath file))
go ic b =<< catKeyFile (toRawFilePath file)
gitMtimeWorkaround ic
) )
stop stop
where where
go ic b oldkey = ifM (shouldAnnex file ic oldkey) go b oldkey = ifM (shouldAnnex file oldkey)
( do ( do
-- Before git 2.5, failing to consume all stdin here -- Before git 2.5, failing to consume all stdin here
-- would cause a SIGPIPE and crash it. -- would cause a SIGPIPE and crash it.
@ -166,8 +160,8 @@ clean file = do
-- annexed content before, annex it. This handles cases such as renaming an -- annexed content before, annex it. This handles cases such as renaming an
-- unlocked annexed file followed by git add, which the user naturally -- unlocked annexed file followed by git add, which the user naturally
-- expects to behave the same as git mv. -- expects to behave the same as git mv.
shouldAnnex :: FilePath -> Maybe InodeCache -> Maybe Key -> Annex Bool shouldAnnex :: FilePath -> Maybe Key -> Annex Bool
shouldAnnex file mic moldkey = ifM (annexGitAddToAnnex <$> Annex.getGitConfig) shouldAnnex file moldkey = ifM (annexGitAddToAnnex <$> Annex.getGitConfig)
( checkmatcher checkheuristics ( checkmatcher checkheuristics
, checkheuristics , checkheuristics
) )
@ -180,7 +174,7 @@ shouldAnnex file mic moldkey = ifM (annexGitAddToAnnex <$> Annex.getGitConfig)
Just _ -> return True Just _ -> return True
Nothing -> checkknowninode Nothing -> checkknowninode
checkknowninode = case mic of checkknowninode = withTSDelta (liftIO . genInodeCache (toRawFilePath file)) >>= \case
Nothing -> pure False Nothing -> pure False
Just ic -> Database.Keys.isInodeKnown ic =<< sentinalStatus Just ic -> Database.Keys.isInodeKnown ic =<< sentinalStatus
@ -219,14 +213,3 @@ updateSmudged restage = streamSmudged $ \k topf -> do
Just k' | k' == k -> toplevelWarning False $ Just k' | k' == k -> toplevelWarning False $
"unable to populate worktree file " ++ fromRawFilePath f "unable to populate worktree file " ++ fromRawFilePath f
_ -> noop _ -> noop
-- If the mtime of a worktree file is too close to the mtime of the index
-- file, git will distrust the index. Which results in it running
-- the clean filter again later. While that's not normally a problem,
--
gitMtimeWorkaround :: Maybe InodeCache -> Annex ()
gitMtimeWorkaround Nothing = noop
gitMtimeWorkaround (Just ic) = liftIO $ do
now <- getCurrentTime
when (abs (diffUTCTime (posixSecondsToUTCTime (inodeCacheToMtime ic)) now) < 1) $ do
threadDelaySeconds (Seconds 1)