diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-06-02 11:05:50 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-06-02 11:05:50 +0100 |
| commit | 9bf4a545148ee30238dfb3669db8b357ed4b3f53 (patch) | |
| tree | 352aad677bdb0593a1f504e861bd216bbb8abcf3 /guix-qa-frontpage/branch.scm | |
| parent | ba394b3b431d84c08a55f2d981d850625202e6c5 (diff) | |
| download | qa-frontpage-9bf4a545148ee30238dfb3669db8b357ed4b3f53.tar qa-frontpage-9bf4a545148ee30238dfb3669db8b357ed4b3f53.tar.gz | |
Fix highlighting which branches need rebasing
Actually compare the base revision against master.
Diffstat (limited to 'guix-qa-frontpage/branch.scm')
| -rw-r--r-- | guix-qa-frontpage/branch.scm | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/guix-qa-frontpage/branch.scm b/guix-qa-frontpage/branch.scm index a704d57..afff87d 100644 --- a/guix-qa-frontpage/branch.scm +++ b/guix-qa-frontpage/branch.scm @@ -111,15 +111,19 @@ (target . ,branch-commit))) (up-to-date-with-master? - (let ((changes - (length - (revision-derivation-changes - (revision-derivation-changes-url - revisions - ;; TODO: Maybe do something smarter here? - #:systems '("x86_64-linux")))))) + (let* ((master-revision + (get-latest-processed-branch-revision "master")) + (changes + (length + (revision-derivation-changes + (revision-derivation-changes-url + `((base . ,merge-base) + (target . ,master-revision)) + ;; TODO: Maybe do something smarter here? + #:systems '("x86_64-linux")))))) `((up-to-date? . ,(< changes 3000)) - (changes . ,changes)))) + (changes . ,changes) + (master . ,master-revision)))) (derivation-changes-counts (with-exception-handler |