diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-29 14:43:34 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-29 14:43:34 -0400 |
| commit | 9d7ce6bff0c9dcf66983eb100927fc7776c447f9 (patch) | |
| tree | b3cf2fe44d25b092b16f08ba3680bf5719dc3a6c /Assistant | |
| parent | bce30628d5e6df5b64c482bc5fe161576efaaa79 (diff) | |
reorg matcher types; no non-type code changes
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 8a8e8faf0..97ccf083e 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -35,6 +35,7 @@ import Annex.CatFile import Annex.CheckIgnore import Annex.Link import Annex.FileMatcher +import Types.FileMatcher import Annex.ReplaceFile import Git.Types import Config @@ -196,7 +197,7 @@ runHandler handler file filestatus = void $ do | otherwise = f {- Small files are added to git as-is, while large ones go into the annex. -} -add :: FileMatcher -> FilePath -> Assistant (Maybe Change) +add :: FileMatcher Annex -> FilePath -> Assistant (Maybe Change) add bigfilematcher file = ifM (liftAnnex $ checkFileMatcher bigfilematcher file) ( pendingAddChange file , do @@ -205,7 +206,7 @@ add bigfilematcher file = ifM (liftAnnex $ checkFileMatcher bigfilematcher file) madeChange file AddFileChange ) -onAdd :: FileMatcher -> Handler +onAdd :: FileMatcher Annex -> Handler onAdd matcher file filestatus | maybe False isRegularFile filestatus = unlessIgnored file $ @@ -218,7 +219,7 @@ shouldRestage ds = scanComplete ds || forceRestage ds {- In direct mode, add events are received for both new files, and - modified existing files. -} -onAddDirect :: Bool -> FileMatcher -> Handler +onAddDirect :: Bool -> FileMatcher Annex -> Handler onAddDirect symlinkssupported matcher file fs = do v <- liftAnnex $ catKeyFile file case (v, fs) of |