From 77ac35e2ccf47aee813d8bf303b69580e26edb8c Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sat, 21 Oct 2023 16:12:20 +0100 Subject: Highlight the intended branch on the issue page --- guix-qa-frontpage/manage-patch-branches.scm | 2 ++ guix-qa-frontpage/server.scm | 3 +++ guix-qa-frontpage/view/issue.scm | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) 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) -- cgit v1.2.3