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.
32 lines
856 B
Haskell
32 lines
856 B
Haskell
{- git-annex command
|
|
-
|
|
- Copyright 2010 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Command.PreCommit where
|
|
|
|
import Command
|
|
import qualified Command.Add
|
|
import qualified Command.Fix
|
|
|
|
def :: [Command]
|
|
def = [command "pre-commit" paramPaths seek "run by git pre-commit hook"]
|
|
|
|
{- The pre-commit hook needs to fix symlinks to all files being committed.
|
|
- And, it needs to inject unlocked files into the annex. -}
|
|
seek :: [CommandSeek]
|
|
seek =
|
|
[ withFilesToBeCommitted $ whenAnnexed Command.Fix.start
|
|
, withFilesUnlockedToBeCommitted start]
|
|
|
|
start :: FilePath -> CommandStart
|
|
start file = next $ perform file
|
|
|
|
perform :: FilePath -> CommandPerform
|
|
perform file = do
|
|
ok <- doCommand $ Command.Add.start file
|
|
if ok
|
|
then next $ return True
|
|
else error $ "failed to add " ++ file ++ "; canceling commit"
|