From b9aa944b09e60badb99c65a87f5689e0ab9010e3 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Sep 2011 18:21:42 -0400 Subject: add --and --or --not -( and -) I dislike -( and -), but without using a different option parser, can't easily use bare parens. --and and --or will become more useful once there are more interesting limits than --exclude --- Limit.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Limit.hs') diff --git a/Limit.hs b/Limit.hs index 324baee2e..91ea3453c 100644 --- a/Limit.hs +++ b/Limit.hs @@ -35,7 +35,7 @@ getMatcher = do Annex.changeState $ \s -> s { Annex.limit = Right matcher } return matcher -{- Adds something to the limit list. -} +{- Adds something to the limit list, which is built up reversed. -} add :: Limit -> Annex () add l = Annex.changeState $ \s -> s { Annex.limit = append $ Annex.limit s } where @@ -43,16 +43,16 @@ add l = Annex.changeState $ \s -> s { Annex.limit = append $ Annex.limit s } append _ = error "internal" {- Adds a new limit. -} -addl :: (FilePath -> Annex Bool) -> Annex () -addl = add . Utility.Matcher.Operation +addlimit :: (FilePath -> Annex Bool) -> Annex () +addlimit = add . Utility.Matcher.Operation {- Adds a new token. -} -addt :: String -> Annex () -addt = add . Utility.Matcher.Token +token :: String -> Annex () +token = add . Utility.Matcher.Token {- Add a limit to skip files that do not match the glob. -} exclude :: String -> Annex () -exclude glob = addl $ return . notExcluded +exclude glob = addlimit $ return . notExcluded where notExcluded f = isNothing $ match cregex f [] cregex = compile regex [] -- cgit v1.2.3