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

enableremote: Better handling of the unusual case where multiple special remotes have been initialized with the same name

Browse source 
Before it would pick one at random, though preferring ones that were not
dead over dead ones.

Now, if one is dead and the other not, it will use the non-dead one. But if
both are not dead, or both dead, it will error out, suggesting the user
clarify what they want to enable.

Sponsored-by: Luke Shumaker on Patreon
This commit is contained in:
Joey Hess 2022-01-05 15:12:01 -04:00
parent 7f3628331c
commit 58afb00f6e
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Command/EnableRemote.hs
View file

@ -43,8 +43,13 @@ start [] = unknownNameError "Specify the remote to enable."
start (name:rest) = go =<< filter matchingname <$> Annex.getGitRemotes
where
matchingname r = Git.remoteName r == Just name
go [] = startSpecialRemote name (Logs.Remote.keyValToConfig Proposed rest)
=<< SpecialRemote.findExisting name
go [] =
let use = startSpecialRemote name (Logs.Remote.keyValToConfig Proposed rest)
in SpecialRemote.findExisting' name >>= \case
-- enable dead remote only when there is no
-- other remote with the same name
([], l) -> use l
(l, _) -> use l
go (r:_) = do
-- This could be either a normal git remote or a special
-- remote that has an url (eg gcrypt).
@ -69,16 +74,16 @@ startNormalRemote name restparams r
ai = ActionItemOther (Just name)
si = SeekInput [name]
startSpecialRemote :: Git.RemoteName -> Remote.RemoteConfig -> Maybe (UUID, Remote.RemoteConfig, Maybe (SpecialRemote.ConfigFrom UUID)) -> CommandStart
startSpecialRemote name config Nothing = do
startSpecialRemote :: Git.RemoteName -> Remote.RemoteConfig -> [(UUID, Remote.RemoteConfig, Maybe (SpecialRemote.ConfigFrom UUID))] -> CommandStart
startSpecialRemote name config [] = do
m <- SpecialRemote.specialRemoteMap
confm <- Logs.Remote.remoteConfigMap
Remote.nameToUUID' name >>= \case
Right u | u `M.member` m ->
startSpecialRemote name config $
Just (u, fromMaybe M.empty (M.lookup u confm), Nothing)
[(u, fromMaybe M.empty (M.lookup u confm), Nothing)]
_ -> unknownNameError "Unknown remote name."
startSpecialRemote name config (Just (u, c, mcu)) =
startSpecialRemote name config ((u, c, mcu):[]) =
starting "enableremote" ai si $ do
let fullconfig = config `M.union` c
t <- either giveup return (SpecialRemote.findType fullconfig)
@ -89,6 +94,8 @@ startSpecialRemote name config (Just (u, c, mcu)) =
where
ai = ActionItemOther (Just name)
si = SeekInput [name]
startSpecialRemote _ _ _ =
giveup "Multiple remotes have that name. Either use git-annex renameremote to rename them, or specify the uuid of the remote to enable."
performSpecialRemote :: RemoteType -> UUID -> R.RemoteConfig -> R.RemoteConfig -> RemoteGitConfig -> Maybe (SpecialRemote.ConfigFrom UUID) -> CommandPerform
performSpecialRemote t u oldc c gc mcu = do