diff options
| -rw-r--r-- | guix-qa-frontpage/branch.scm | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/guix-qa-frontpage/branch.scm b/guix-qa-frontpage/branch.scm index 345f49b..14e13fd 100644 --- a/guix-qa-frontpage/branch.scm +++ b/guix-qa-frontpage/branch.scm @@ -51,9 +51,14 @@ (map (lambda (issue) (let ((branch (issue-title->branch - (assoc-ref issue "title")))) + (assoc-ref issue "title"))) + (issue-number + (assoc-ref issue "number"))) (cons branch - `(("issue_number" . ,(assoc-ref issue "number")))))) + `(("issue_number" . ,issue-number) + ("issue_date" . ,(assoc-ref issue "date")))))) + ;; TODO: Mumi doesn't expose this yet + ;; ,@(mumi-issue-blocking-info issue-number))))) (vector->list (mumi-search-issues ;; TODO: Finalise this @@ -79,7 +84,18 @@ (stable-sort branches (lambda (a b) - (not (assoc-ref (cdr b) "issue_number")))))) + (let ((a-has-issue + (->bool (assoc-ref (cdr a) "issue_number"))) + (b-has-issue + (->bool (assoc-ref (cdr b) "issue_number")))) + (if (and a-has-issue b-has-issue) + ;; TODO: Sort by blocking info + (let ((a-date + (assoc-ref (cdr a) "issue_date")) + (b-date + (assoc-ref (cdr b) "issue_date"))) + (string<? a-date b-date)) + a-has-issue)))))) (define* (branch-data branch-name) (let* ((branch-commit |