From dd463a3100f21d72c35ca1af5b0f63f6296cf322 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Sep 2011 20:11:39 -0400 Subject: rework annex-ignore handling Only one place need to filter the list of remotes for ignored remotes: keyPossibilities. Make the full list available to everything else. This allows getting rid of the special case handing for --from and --to to make ignored remotes not be ignored with those options. --- Remote.hs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'Remote.hs') diff --git a/Remote.hs b/Remote.hs index 429f9058b..0ce01872a 100644 --- a/Remote.hs +++ b/Remote.hs @@ -16,7 +16,6 @@ module Remote ( hasKeyCheap, remoteTypes, - genList, byName, prettyPrintUUIDs, remotesWithUUID, @@ -29,7 +28,7 @@ module Remote ( forceTrust ) where -import Control.Monad (filterM) +import Control.Monad.State (filterM) import Data.List import qualified Data.Map as M import Data.String.Utils @@ -83,7 +82,6 @@ genList = do where process m t = enumerate t >>= - filterM remoteNotIgnored >>= mapM (gen m t) gen m t r = do u <- getUUID r @@ -184,7 +182,7 @@ keyPossibilities' withtrusted key = do let validtrusteduuids = validuuids `intersect` trusted -- remotes that match uuids that have the key - allremotes <- genList + allremotes <- filterM (repoNotIgnored . repo) =<< genList let validremotes = remotesWithUUID allremotes validuuids return (sort validremotes, validtrusteduuids) -- cgit v1.2.3