diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-01-01 13:52:47 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-01-01 13:58:14 -0400 |
| commit | 18a3a186e9cdb69ee503d961d8285a341d818c48 (patch) | |
| tree | d415a97f6c65e2268c948c6c2425d1b94b16df92 /Command | |
| parent | b6e3e7516dfdc054b9e1a281b2e49b392d235ee2 (diff) | |
type based git config handling for remotes
Still a couple of places that use git config ad-hoc, but this is most of it
done.
Diffstat (limited to 'Command')
| -rw-r--r-- | Command/Status.hs | 2 | ||||
| -rw-r--r-- | Command/Sync.hs | 4 | ||||
| -rw-r--r-- | Command/Unused.hs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/Command/Status.hs b/Command/Status.hs index 9c5e3e70a..89ba55cfa 100644 --- a/Command/Status.hs +++ b/Command/Status.hs @@ -200,7 +200,7 @@ transfer_list = stat "transfers in progress" $ nojson $ lift $ do disk_size :: Stat disk_size = stat "available local disk space" $ json id $ lift $ calcfree - <$> (annexDiskReserve <$> Annex.getConfig) + <$> (annexDiskReserve <$> Annex.getGitConfig) <*> inRepo (getDiskFree . gitAnnexDir) where calcfree reserve (Just have) = unwords diff --git a/Command/Sync.hs b/Command/Sync.hs index f7241ce82..61ac3802a 100644 --- a/Command/Sync.hs +++ b/Command/Sync.hs @@ -72,8 +72,8 @@ syncRemotes rs = ifM (Annex.getState Annex.fast) ( nub <$> pickfast , wanted ) unwords (map Types.Remote.name s) return l available = filter (not . Remote.specialRemote) - <$> (filterM (repoSyncable . Types.Remote.repo) - =<< Remote.enabledRemoteList) + . filter (remoteAnnexSync . Types.Remote.gitconfig) + <$> Remote.enabledRemoteList good = filterM $ Remote.Git.repoAvail . Types.Remote.repo fastest = fromMaybe [] . headMaybe . Remote.byCost diff --git a/Command/Unused.hs b/Command/Unused.hs index 2823ccefd..5f8af2185 100644 --- a/Command/Unused.hs +++ b/Command/Unused.hs @@ -180,9 +180,9 @@ exclude smaller larger = S.toList $ remove larger $ S.fromList smaller - so will easily fit on even my lowest memory systems. -} bloomCapacity :: Annex Int -bloomCapacity = fromMaybe 500000 . annexBloomCapacity <$> Annex.getConfig +bloomCapacity = fromMaybe 500000 . annexBloomCapacity <$> Annex.getGitConfig bloomAccuracy :: Annex Int -bloomAccuracy = fromMaybe 1000 . annexBloomAccuracy <$> Annex.getConfig +bloomAccuracy = fromMaybe 1000 . annexBloomAccuracy <$> Annex.getGitConfig bloomBitsHashes :: Annex (Int, Int) bloomBitsHashes = do capacity <- bloomCapacity |