mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

GETCONFIG name fix

Browse source 
Fix regression that prevented external special remotes from using GETCONFIG
to query values like "name". (Introduced in version 7.20200202.7.)
This commit is contained in:
Joey Hess 2020-03-09 12:38:04 -04:00
parent d9bd645bf8
commit 6a91471923
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,5 +1,7 @@
git-annex (8.20200227) UNRELEASED; urgency=medium git-annex (8.20200227) UNRELEASED; urgency=medium
* Fix regression that prevented external special remotes from using
GETCONFIG to query values like "name". (Introduced in version 7.20200202.7.)
* Improve behavior when a directory git-annex is writing to gets * Improve behavior when a directory git-annex is writing to gets
unmounted. Previously it could in some cases re-create the mount point unmounted. Previously it could in some cases re-create the mount point
and directory tree, and even write object contents to the wrong disk. and directory tree, and even write object contents to the wrong disk.

4
Remote/External.hs
View file

@ -424,9 +424,9 @@ handleRequest' st external req mp responsehandler
modifyTVar' (externalConfigChanges st) $ \f -> modifyTVar' (externalConfigChanges st) $ \f ->
f . M.insert (Accepted setting) (Accepted value) f . M.insert (Accepted setting) (Accepted value)
handleRemoteRequest (GETCONFIG setting) = do handleRemoteRequest (GETCONFIG setting) = do
value <- fromMaybe "" value <- maybe "" fromProposedAccepted
. (M.lookup (Accepted setting)) . (M.lookup (Accepted setting))
. getRemoteConfigPassedThrough . unparsedRemoteConfig
<$> liftIO (atomically $ readTVar $ externalConfig st) <$> liftIO (atomically $ readTVar $ externalConfig st)
send $ VALUE value send $ VALUE value
handleRemoteRequest (SETCREDS setting login password) = case (externalUUID external, externalGitConfig external) of handleRemoteRequest (SETCREDS setting login password) = case (externalUUID external, externalGitConfig external) of

5
Types/RemoteConfig.hs
View file

@ -23,8 +23,9 @@ type RemoteConfig = M.Map RemoteConfigField (ProposedAccepted String)
{- Before being used a RemoteConfig has to be parsed. -} {- Before being used a RemoteConfig has to be parsed. -}
data ParsedRemoteConfig = ParsedRemoteConfig data ParsedRemoteConfig = ParsedRemoteConfig
(M.Map RemoteConfigField RemoteConfigValue) { parsedRemoteConfigMap :: M.Map RemoteConfigField RemoteConfigValue
RemoteConfig , unparsedRemoteConfig :: RemoteConfig
}
{- Remotes can have configuration values of many types, so use Typeable {- Remotes can have configuration values of many types, so use Typeable
- to let them all be stored in here. -} - to let them all be stored in here. -}

1
doc/bugs/git-annex_no_longer_provides_remote_name_with_GETCONFIG_name.mdwn
View file

@ -18,3 +18,4 @@ There is no day that ends without me being grateful for git-annex ;-)
[[!meta author=mih]] [[!meta author=mih]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> [[fixed|done]] --[[Joey]]