aboutsummaryrefslogtreecommitdiff
path: root/guix-qa-frontpage/view
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-07-03 13:21:58 +0100
committerChristopher Baines <mail@cbaines.net>2023-07-03 13:21:58 +0100
commit65e18d4698fd176faa2469597d0bd94b122bae90 (patch)
tree0b84edd265a09f07f0df4b4a80bbd4380da4083b /guix-qa-frontpage/view
parentc415972a2cf62f8235e818a6ac59bc87ec800f89 (diff)
downloadqa-frontpage-65e18d4698fd176faa2469597d0bd94b122bae90.tar
qa-frontpage-65e18d4698fd176faa2469597d0bd94b122bae90.tar.gz
Improve display of too many changes for branches
Diffstat (limited to 'guix-qa-frontpage/view')
-rw-r--r--guix-qa-frontpage/view/branch.scm59
1 files changed, 38 insertions, 21 deletions
diff --git a/guix-qa-frontpage/view/branch.scm b/guix-qa-frontpage/view/branch.scm
index 5d9ddb2..7847360 100644
--- a/guix-qa-frontpage/view/branch.scm
+++ b/guix-qa-frontpage/view/branch.scm
@@ -63,27 +63,44 @@ td.bad {
branch)))
"View branch with Guix Data Service"))))
- ,@(if (assq-ref up-to-date-with-master 'up-to-date?)
- '()
- `((p (@ (style ,(string-join
- '("text-align: center;"
- "font-weight: bold;"
- "padding: 1rem;"
- "max-width: 46rem;"
- "border-width: 0.35em;"
- "border-style: dashed;"
- "border-color: red"))))
- "Too many changes ("
- ,(assq-ref up-to-date-with-master 'changes)
- " for "
- (span (@ (style "font-family: monospace;"))
- "x86_64-linux")
- ") between "
- (a (@ (href ,(string-append
- "https://data.qa.guix.gnu.org/revision/"
- (assq-ref revisions 'base))))
- "merge base")
- " and master, this branch should be rebased or master merged in.")))
+ ,@(cond
+ ((assq-ref up-to-date-with-master 'exception)
+ `((p (@ (style ,(string-join
+ '("text-align: center;"
+ "font-weight: bold;"
+ "padding: 1rem;"
+ "max-width: 46rem;"
+ "border-width: 0.35em;"
+ "border-style: dashed;"
+ "border-color: red"))))
+ "Exception checking changes between "
+ (a (@ (href ,(string-append
+ "https://data.qa.guix.gnu.org/revision/"
+ (assq-ref revisions 'base))))
+ "merge base")
+ " and master.")))
+ ((assq-ref up-to-date-with-master 'up-to-date?)
+ '())
+ (else
+ `((p (@ (style ,(string-join
+ '("text-align: center;"
+ "font-weight: bold;"
+ "padding: 1rem;"
+ "max-width: 46rem;"
+ "border-width: 0.35em;"
+ "border-style: dashed;"
+ "border-color: red"))))
+ "Too many changes ("
+ ,(assq-ref up-to-date-with-master 'changes)
+ " for "
+ (span (@ (style "font-family: monospace;"))
+ "x86_64-linux")
+ ") between "
+ (a (@ (href ,(string-append
+ "https://data.qa.guix.gnu.org/revision/"
+ (assq-ref revisions 'base))))
+ "merge base")
+ " and master, this branch should be rebased or master merged in."))))
(h2 "Substitute availability")
(div