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

@ -66,7 +66,8 @@ gen r u c = do
removeKey = remove,
hasKey = checkPresent r bupr',
hasKeyCheap = bupLocal buprepo,
config = c
config = c,
repo = r
}
bupSetup :: UUID -> RemoteConfig -> Annex RemoteConfig

View file

@ -57,7 +57,8 @@ gen r u c = do
removeKey = remove dir,
hasKey = checkPresent dir,
hasKeyCheap = True,
config = Nothing
config = Nothing,
repo = r
}
directorySetup :: UUID -> RemoteConfig -> Annex RemoteConfig

View file

@ -71,7 +71,8 @@ gen r u _ = do
removeKey = dropKey r',
hasKey = inAnnex r',
hasKeyCheap = cheap,
config = Nothing
config = Nothing,
repo = r'
}
{- Tries to read the config for a specified remote, updates state, and

View file

@ -58,7 +58,8 @@ gen r u c = do
removeKey = remove hooktype,
hasKey = checkPresent r hooktype,
hasKeyCheap = False,
config = Nothing
config = Nothing,
repo = r
}
hookSetup :: UUID -> RemoteConfig -> Annex RemoteConfig

View file

@ -66,7 +66,8 @@ gen r u c = do
removeKey = remove o,
hasKey = checkPresent r o,
hasKeyCheap = False,
config = Nothing
config = Nothing,
repo = r
}
genRsyncOpts :: Git.Repo -> Annex RsyncOpts

View file

@ -67,7 +67,8 @@ gen' r u c cst =
removeKey = remove this,
hasKey = checkPresent this,
hasKeyCheap = False,
config = c
config = c,
repo = r
}
s3Setup :: UUID -> RemoteConfig -> Annex RemoteConfig

View file

@ -58,7 +58,8 @@ gen r _ _ =
removeKey = dropKey,
hasKey = checkKey,
hasKeyCheap = False,
config = Nothing
config = Nothing,
repo = r
}
{- The urls for a key are stored in remote/web/hash/key.log