Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: show push error messages #5065

Merged
merged 1 commit into from
Jun 10, 2024
Merged

bugfix: show push error messages #5065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions unison-cli/src/Unison/Codebase/Editor/HandleInput/Push.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,22 +452,23 @@ data UploadPlan = UploadPlan
-- Execute an upload plan.
executeUploadPlan :: UploadPlan -> Cli ()
executeUploadPlan UploadPlan {remoteBranch, causalHash, afterUploadAction} = do
numUploaded <-
(uploadResult, numUploaded) <-
Cli.with withEntitiesUploadedProgressCallback \(uploadedCallback, getNumUploaded) -> do
let upload =
Share.uploadEntities
(codeserverBaseURL Codeserver.defaultCodeserver)
-- On the wire, the remote branch is encoded as e.g.
-- { "repo_info": "@unison/base/@arya/topic", ... }
(Share.RepoInfo (into @Text (ProjectAndBranch (remoteBranch ^. #project) (remoteBranch ^. #branch))))
(Set.NonEmpty.singleton causalHash)
uploadedCallback
upload & onLeftM \err0 -> do
(Cli.returnEarly . Output.ShareError) case err0 of
Share.SyncError err -> ShareErrorUploadEntities err
Share.TransportError err -> ShareErrorTransport err
liftIO getNumUploaded
uploadResult <-
Share.uploadEntities
(codeserverBaseURL Codeserver.defaultCodeserver)
-- On the wire, the remote branch is encoded as e.g.
-- { "repo_info": "@unison/base/@arya/topic", ... }
(Share.RepoInfo (into @Text (ProjectAndBranch (remoteBranch ^. #project) (remoteBranch ^. #branch))))
(Set.NonEmpty.singleton causalHash)
uploadedCallback
numUploaded <- liftIO getNumUploaded
pure (uploadResult, numUploaded)
Cli.respond (Output.UploadedEntities numUploaded)
uploadResult & onLeft \err0 -> do
(Cli.returnEarly . Output.ShareError) case err0 of
Share.SyncError err -> ShareErrorUploadEntities err
Share.TransportError err -> ShareErrorTransport err
afterUploadAction
let ProjectAndBranch projectName branchName = remoteBranch
Cli.respond (ViewOnShare (Right (Share.hardCodedUri, projectName, branchName)))
Expand Down