Skip to content

feedbackOnStatus: Use format for everything #273

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

Merged
OpsBotPrime merged 1 commit into from
Oct 3, 2024
Merged

feedbackOnStatus: Use format for everything #273

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
27 changes: 9 additions & 18 deletions src/Logic.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1202,18 +1202,12 @@ feedbackOnStatus (BaseBranch projectBaseBranchName) prId pr state = case Pr.clas
len = length train
prs = if len == 1 then "PR" else "PRs"
in CommentFeedback $ case train of
[] -> Text.concat ["Rebased as ", sha, ", waiting for CI …"]
[] -> format "Rebased as {}, waiting for CI …" [sha]
(_ : _) ->
Text.concat
[ "Speculatively rebased as "
, sha
, " behind "
, Text.pack $ show len
, " other "
, prs
, ", waiting for CI …"
]
PrStatusBuildStarted url -> CommentFeedback $ Text.concat ["[CI job :yellow_circle:](", url, ") started."]
format
"Speculatively rebased as {} behind {} other {}, waiting for CI …"
[sha, Text.pack $ show len, prs]
PrStatusBuildStarted url -> CommentFeedback $ format "[CI job :yellow_circle:]({}) started." [url]
PrStatusAwaitingPromotion -> CommentFeedback "The PR is waiting to be pushed to the target branch"
PrStatusIntegrated -> CommentFeedback "The build succeeded."
PrStatusIncorrectBaseBranch ->
Expand All @@ -1235,13 +1229,10 @@ feedbackOnStatus (BaseBranch projectBaseBranchName) prId pr state = case Pr.clas
Branch prBranchName = Pr.branch pr
in
CommentFeedback $
Text.concat
[ "Failed to rebase, please rebase manually using\n\n"
, " git fetch && git rebase --interactive --autosquash origin/"
, targetBranchName
, " "
, prBranchName
]
format
"Failed to rebase, please rebase manually using\n\n\
\ git fetch && git rebase --interactive --autosquash origin/{} {}"
[targetBranchName, prBranchName]
-- The following is not actually shown to the user
-- as it is never set with needsFeedback=True,
-- but here in case we decide to show it.
Expand Down