@@ -1196,18 +1196,14 @@ feedbackOnStatus (BaseBranch projectBaseBranchName) prId pr state = case Pr.clas
11961196 len = length train
11971197 prs = if len == 1 then " PR" else " PRs"
11981198 in CommentFeedback $ case train of
1199- [] -> Text. concat [ " Rebased as " , sha, " , waiting for CI …" ]
1199+ [] -> format " Rebased as {}, waiting for CI …" [sha ]
12001200 (_ : _) ->
1201- Text. concat
1202- [ " Speculatively rebased as "
1203- , sha
1204- , " behind "
1205- , Text. pack $ show len
1206- , " other "
1207- , prs
1208- , " , waiting for CI …"
1209- ]
1210- PrStatusBuildStarted url -> CommentFeedback $ Text. concat [" [CI job :yellow_circle:](" , url, " ) started." ]
1201+ format
1202+ " Speculatively rebased as {} behind {} other {}, waiting for CI …"
1203+ [sha, Text. pack $ show len, prs]
1204+ PrStatusBuildStarted url ->
1205+ CommentFeedback $
1206+ format " [CI job :yellow_circle:]({}) started." [url]
12111207 PrStatusAwaitingPromotion -> CommentFeedback " The PR is waiting to be pushed to the target branch"
12121208 PrStatusIntegrated -> CommentFeedback " The build succeeded."
12131209 PrStatusIncorrectBaseBranch ->
@@ -1229,13 +1225,10 @@ feedbackOnStatus (BaseBranch projectBaseBranchName) prId pr state = case Pr.clas
12291225 Branch prBranchName = Pr. branch pr
12301226 in
12311227 CommentFeedback $
1232- Text. concat
1233- [ " Failed to rebase, please rebase manually using\n\n "
1234- , " git fetch && git rebase --interactive --autosquash origin/"
1235- , targetBranchName
1236- , " "
1237- , prBranchName
1238- ]
1228+ format
1229+ " Failed to rebase, please rebase manually using\n\n \
1230+ \ git fetch && git rebase --interactive --autosquash origin/{} {}"
1231+ [targetBranchName, prBranchName]
12391232 -- The following is not actually shown to the user
12401233 -- as it is never set with needsFeedback=True,
12411234 -- but here in case we decide to show it.
0 commit comments