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.
This commit is contained in:
Joey Hess 2011-09-18 20:11:39 -04:00
parent d78b9f7d54
commit dd463a3100
11 changed files with 24 additions and 25 deletions

View file

@ -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)