unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-11 02:25:39 +03:00
Code Issues Projects Releases Wiki Activity

Fix formatting of an error message

Browse Source 
It was leaving out spaces between literal text and generated text.
This commit is contained in:
Greg Pfeil 2024-07-05 10:52:27 -06:00
parent 67399e9193
commit 41a0da8477
No known key found for this signature in database
GPG Key ID: 1193ACD196ED61F2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unison-cli/src/Unison/CommandLine/InputPatterns.hs
View File

@ -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
}

2
unison-cli/src/Unison/CommandLine/OutputMessages.hs
View File

@ -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