diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-09-18 20:11:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-09-18 20:11:39 -0400 |
| commit | dd463a3100f21d72c35ca1af5b0f63f6296cf322 (patch) | |
| tree | 048aa1402eb5b3717706cb97863f823904dec44e /Remote | |
| parent | d78b9f7d546bd4f13349e01777d5dd45fc01b0af (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 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 3 | ||||
| -rw-r--r-- | Remote/Directory.hs | 3 | ||||
| -rw-r--r-- | Remote/Git.hs | 3 | ||||
| -rw-r--r-- | Remote/Hook.hs | 3 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 3 | ||||
| -rw-r--r-- | Remote/S3real.hs | 3 | ||||
| -rw-r--r-- | Remote/Web.hs | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index ebb4b10a5..29c7a0419 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -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 diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 7ddb60462..b183042ef 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -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 diff --git a/Remote/Git.hs b/Remote/Git.hs index fadd48a03..9789a0625 100644 --- a/Remote/Git.hs +++ b/Remote/Git.hs @@ -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 diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 54b9806ff..aaeb702c7 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -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 diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 3707966ad..9d2d7ddcf 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -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 diff --git a/Remote/S3real.hs b/Remote/S3real.hs index 456a77f0e..77b6b6ca4 100644 --- a/Remote/S3real.hs +++ b/Remote/S3real.hs @@ -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 diff --git a/Remote/Web.hs b/Remote/Web.hs index 3695bb1ab..8fb29ec40 100644 --- a/Remote/Web.hs +++ b/Remote/Web.hs @@ -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 |