cbaebf538a
Now gitattributes are looked up, efficiently, in only the places that
really need them, using the same approach used for cat-file.
The old CheckAttr code seemed very fragile, in the way it streamed files
through git check-attr.
I actually found that cad8824852
was still deadlocking with ghc 7.4, at the end of adding a lot of files.
This should fix that problem, and avoid future ones.
The best part is that this removes withAttrFilesInGit and withNumCopies,
which were complicated Seek methods, as well as simplfying the types
for several other Seek methods that had a Backend tupled in.
35 lines
866 B
Haskell
35 lines
866 B
Haskell
{- git check-attr interface, with handle automatically stored in the Annex monad
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Annex.CheckAttr (
|
|
checkAttr,
|
|
checkAttrHandle
|
|
) where
|
|
|
|
import Common.Annex
|
|
import qualified Git.CheckAttr as Git
|
|
import qualified Annex
|
|
|
|
{- All gitattributes used by git-annex. -}
|
|
annexAttrs :: [Git.Attr]
|
|
annexAttrs =
|
|
[ "annex.backend"
|
|
, "annex.numcopies"
|
|
]
|
|
|
|
checkAttr :: Git.Attr -> FilePath -> Annex String
|
|
checkAttr attr file = do
|
|
h <- checkAttrHandle
|
|
liftIO $ Git.checkAttr h attr file
|
|
|
|
checkAttrHandle :: Annex Git.CheckAttrHandle
|
|
checkAttrHandle = maybe startup return =<< Annex.getState Annex.checkattrhandle
|
|
where
|
|
startup = do
|
|
h <- inRepo $ Git.checkAttrStart annexAttrs
|
|
Annex.changeState $ \s -> s { Annex.checkattrhandle = Just h }
|
|
return h
|