better handling of multiple repositories with the same name
Used to fail with a bad error message, indicating there was no repository with the specified name, or something like that. Now, suggest they use the uuid to disambiguate. * info, enableremotemote, renameremote: Avoid a confusing message when more than one repository matches the user provided name. * info: Exit nonzero when the input is not supported. Sponsored-by: Kevin Mueller on Patreon
This commit is contained in:
parent
826b225ca8
commit
452b080dba
6 changed files with 41 additions and 33 deletions
|
@ -79,10 +79,10 @@ startSpecialRemote name config [] = do
|
|||
m <- SpecialRemote.specialRemoteMap
|
||||
confm <- Logs.Remote.remoteConfigMap
|
||||
Remote.nameToUUID' name >>= \case
|
||||
Right u | u `M.member` m ->
|
||||
([u], _) | u `M.member` m ->
|
||||
startSpecialRemote name config $
|
||||
[(u, fromMaybe M.empty (M.lookup u confm), Nothing)]
|
||||
_ -> unknownNameError "Unknown remote name."
|
||||
(_, msg) -> unknownNameError msg
|
||||
startSpecialRemote name config ((u, c, mcu):[]) =
|
||||
starting "enableremote" ai si $ do
|
||||
let fullconfig = config `M.union` c
|
||||
|
|
|
@ -165,28 +165,24 @@ autoenableInfo = showCustom "info" (SeekInput []) $ do
|
|||
itemInfo :: InfoOptions -> (SeekInput, String) -> Annex ()
|
||||
itemInfo o (si, p) = ifM (isdir p)
|
||||
( dirInfo o p si
|
||||
, do
|
||||
v <- Remote.byName' p
|
||||
case v of
|
||||
Right r -> remoteInfo o r si
|
||||
Left _ -> do
|
||||
v' <- Remote.nameToUUID' p
|
||||
case v' of
|
||||
Right u -> uuidInfo o u si
|
||||
Left _ -> do
|
||||
relp <- liftIO $ relPathCwdToFile (toRawFilePath p)
|
||||
lookupKey relp >>= \case
|
||||
Just k -> fileInfo o (fromRawFilePath relp) si k
|
||||
Nothing -> treeishInfo o p si
|
||||
, Remote.byName' p >>= \case
|
||||
Right r -> remoteInfo o r si
|
||||
Left _ -> Remote.nameToUUID' p >>= \case
|
||||
([], _) -> do
|
||||
relp <- liftIO $ relPathCwdToFile (toRawFilePath p)
|
||||
lookupKey relp >>= \case
|
||||
Just k -> fileInfo o (fromRawFilePath relp) si k
|
||||
Nothing -> treeishInfo o p si
|
||||
([u], _) -> uuidInfo o u si
|
||||
(_us, msg) -> noInfo p si msg
|
||||
)
|
||||
where
|
||||
isdir = liftIO . catchBoolIO . (isDirectory <$$> getFileStatus)
|
||||
|
||||
noInfo :: String -> SeekInput -> Annex ()
|
||||
noInfo s si = do
|
||||
noInfo :: String -> SeekInput -> String -> Annex ()
|
||||
noInfo s si msg = do
|
||||
showStart "info" (encodeBS s) si
|
||||
showNote $ "not a directory or an annexed file or a treeish or a remote or a uuid"
|
||||
showEndFail
|
||||
giveup msg
|
||||
|
||||
dirInfo :: InfoOptions -> FilePath -> SeekInput -> Annex ()
|
||||
dirInfo o dir si = showCustom (unwords ["info", dir]) si $ do
|
||||
|
@ -203,6 +199,7 @@ treeishInfo o t si = do
|
|||
mi <- getTreeStatInfo o (Git.Ref (encodeBS t))
|
||||
case mi of
|
||||
Nothing -> noInfo t si
|
||||
"not a directory or an annexed file or a treeish or a remote or a uuid"
|
||||
Just i -> showCustom (unwords ["info", t]) si $ do
|
||||
stats <- selStats
|
||||
(tostats (tree_name:tree_fast_stats False))
|
||||
|
|
|
@ -35,12 +35,12 @@ start ps@(oldname:newname:[]) = Annex.SpecialRemote.findExisting oldname >>= \ca
|
|||
-- as a fallback when there is nothing with the name in the
|
||||
-- special remote log.
|
||||
[] -> Remote.nameToUUID' oldname >>= \case
|
||||
Left e -> giveup e
|
||||
Right u -> do
|
||||
([u], _) -> do
|
||||
m <- Logs.Remote.remoteConfigMap
|
||||
case M.lookup u m of
|
||||
Nothing -> giveup "That is not a special remote."
|
||||
Just cfg -> go u cfg Nothing
|
||||
(_, msg) -> giveup msg
|
||||
_ -> giveup $ "There are multiple special remotes named " ++ oldname ++ ". Provide instead the uuid or description of the remote to rename."
|
||||
where
|
||||
ai = ActionItemOther Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue