all commands building except for assistant

also, changed ConfigValue to a newtype, and moved it into Git.Config.
This commit is contained in:
Joey Hess 2019-12-05 14:36:43 -04:00
parent 718fa83da6
commit c20f4704a7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
40 changed files with 187 additions and 174 deletions

View file

@ -74,7 +74,7 @@ import Logs.Web
import Remote.List
import Config
import Config.DynamicConfig
import Git.Types (RemoteName, ConfigKey(..))
import Git.Types (RemoteName, ConfigKey(..), fromConfigValue)
import Utility.Aeson
{- Map from UUIDs of Remotes to a calculated value. -}
@ -150,7 +150,7 @@ byNameOrGroup :: RemoteName -> Annex [Remote]
byNameOrGroup n = go =<< getConfigMaybe (ConfigKey ("remotes." <> encodeBS' n))
where
go (Just l) = catMaybes
<$> mapM (byName . Just) (splitc ' ' (decodeBS' l))
<$> mapM (byName . Just) (splitc ' ' (fromConfigValue l))
go Nothing = maybeToList
<$> byName (Just n)