diff --git a/unison-cli/src/Unison/CommandLine/InputPatterns.hs b/unison-cli/src/Unison/CommandLine/InputPatterns.hs index 4cbc21bd6..bfe9d51b4 100644 --- a/unison-cli/src/Unison/CommandLine/InputPatterns.hs +++ b/unison-cli/src/Unison/CommandLine/InputPatterns.hs @@ -1773,8 +1773,8 @@ pullImpl name aliases pullMode addendum = do These sourceProject sourceBranch -> Right (Input.LibInstallI True (ProjectAndBranch sourceProject (Just sourceBranch))) (Right source, Left _, Right path) -> - Left $ - "I think you want to merge" + Left . P.wrap $ + "I think you want to merge " <> case source of RemoteRepo.ReadShare'LooseCode _sourcePath -> "some non-project code" RemoteRepo.ReadShare'ProjectBranch (This sourceProject) -> @@ -1787,11 +1787,11 @@ pullImpl name aliases pullMode addendum = do "the latest release of" <> prettyProjectName sourceProject RemoteRepo.ReadShare'ProjectBranch (These sourceProject (ProjectBranchNameOrLatestRelease'Name sourceBranch)) -> prettyProjectAndBranchName (ProjectAndBranch sourceProject sourceBranch) - <> "into the" + <> " into the " <> prettyPath' path - <> "namespace, but the" + <> " namespace, but the " <> makeExample' pull - <> "command only supports merging into the top level of a local project branch." + <> " command only supports merging into the top level of a local project branch." args -> wrongArgsLength "no more than two arguments" args } diff --git a/unison-cli/src/Unison/CommandLine/OutputMessages.hs b/unison-cli/src/Unison/CommandLine/OutputMessages.hs index 291fcf6e2..781b7d410 100644 --- a/unison-cli/src/Unison/CommandLine/OutputMessages.hs +++ b/unison-cli/src/Unison/CommandLine/OutputMessages.hs @@ -2131,7 +2131,7 @@ notifyUser dir = \case <> P.group (IP.makeExample IP.libInstallInputPattern [prettyProjectAndBranchName libdep] <> ".") PullIntoMissingBranch source (ProjectAndBranch maybeTargetProject targetBranch) -> pure . P.wrap $ - "I think you're wanting to merge" + "I think you want to merge" <> sourcePretty <> "into the" <> targetPretty