summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-09-18 20:11:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-09-18 20:11:39 -0400
commitdd463a3100f21d72c35ca1af5b0f63f6296cf322 (patch)
tree048aa1402eb5b3717706cb97863f823904dec44e /Annex.hs
parentd78b9f7d546bd4f13349e01777d5dd45fc01b0af (diff)
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.
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex.hs b/Annex.hs
index ad65e05dd..1517a3470 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -26,7 +26,7 @@ import Control.Applicative hiding (empty)
import qualified Git
import Git.Queue
import Types.Backend
-import Types.Remote
+import qualified Types.Remote
import Types.Crypto
import Types.BranchState
import Types.TrustLevel
@@ -48,7 +48,7 @@ newtype Annex a = Annex { runAnnex :: StateT AnnexState IO a }
data AnnexState = AnnexState
{ repo :: Git.Repo
, backends :: [Backend Annex]
- , remotes :: [Remote Annex]
+ , remotes :: [Types.Remote.Remote Annex]
, repoqueue :: Queue
, output :: OutputType
, force :: Bool