aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2023-10-21 16:12:20 +0100
committerChristopher Baines <mail@cbaines.net>2023-10-21 16:12:20 +0100
commit77ac35e2ccf47aee813d8bf303b69580e26edb8c (patch)
tree12744b1881bf23bc8b5c5f7ad29b374518c61486
parent612ec41197915e1d0cc935f4145f1fcedcd5c329 (diff)
downloadqa-frontpage-77ac35e2ccf47aee813d8bf303b69580e26edb8c.tar
qa-frontpage-77ac35e2ccf47aee813d8bf303b69580e26edb8c.tar.gz
Highlight the intended branch on the issue page
-rw-r--r--guix-qa-frontpage/manage-patch-branches.scm2
-rw-r--r--guix-qa-frontpage/server.scm3
-rw-r--r--guix-qa-frontpage/view/issue.scm7
3 files changed, 11 insertions, 1 deletions
diff --git a/guix-qa-frontpage/manage-patch-branches.scm b/guix-qa-frontpage/manage-patch-branches.scm
index 951817f..63d1054 100644
--- a/guix-qa-frontpage/manage-patch-branches.scm
+++ b/guix-qa-frontpage/manage-patch-branches.scm
@@ -29,6 +29,8 @@
#:use-module (guix-qa-frontpage guix-data-service)
#:export (create-branch-for-issue
+ patchwork-series->branch
+
start-manage-patch-branches-thread
get-issue-branch-base-and-target-refs))
diff --git a/guix-qa-frontpage/server.scm b/guix-qa-frontpage/server.scm
index b10669e..4e88a3b 100644
--- a/guix-qa-frontpage/server.scm
+++ b/guix-qa-frontpage/server.scm
@@ -525,6 +525,8 @@
(select-create-branch-for-issue-log
database
number))
+ (branch
+ (patchwork-series->branch series))
(master-branch-substitute-availability
(with-sqlite-cache
database
@@ -541,6 +543,7 @@
(render-html
#:sxml (issue-view number
series
+ branch
(assq-ref (assq-ref series 'mumi)
'tags)
base-and-target-refs
diff --git a/guix-qa-frontpage/view/issue.scm b/guix-qa-frontpage/view/issue.scm
index 55f0193..bbd34e2 100644
--- a/guix-qa-frontpage/view/issue.scm
+++ b/guix-qa-frontpage/view/issue.scm
@@ -15,7 +15,7 @@
issue-prepare-review-view))
-(define (issue-view issue-number series mumi-tags
+(define (issue-view issue-number series branch mumi-tags
base-and-target-refs
create-branch-for-issue-log
comparison-link
@@ -350,6 +350,11 @@ div.bad {
,tag))
(or debbugs-usertags '())))
+ (h3 (@ (style ,(if (string=? branch "master")
+ ""
+ "padding-left: 0.2em; border-left-width: 0.3em; border-left-style: solid; border-left-color: orange")))
+ "For branch: " (code ,branch))
+
(ul
,@(map
(lambda (patch)