From 0c3e208a834b83112c7b33bf2c5fbe77c2ce923a Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Sat, 21 Nov 2020 20:29:14 +0000
Subject: [PATCH] Start merging the package derivation comparison code

---
 guix-data-service/web/compare/controller.scm |  2 ++
 guix-data-service/web/compare/html.scm       | 22 ++------------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/guix-data-service/web/compare/controller.scm b/guix-data-service/web/compare/controller.scm
index 6c96d55..1a811d6 100644
--- a/guix-data-service/web/compare/controller.scm
+++ b/guix-data-service/web/compare/controller.scm
@@ -571,6 +571,7 @@
          (render-html
           #:sxml (compare/package-derivations
                   query-parameters
+                  'revision
                   systems
                   (valid-targets->options targets)
                   build-status-strings
@@ -626,6 +627,7 @@
                      (render-html
                       #:sxml (compare/package-derivations
                               query-parameters
+                              'revision
                               systems
                               (valid-targets->options targets)
                               build-status-strings
diff --git a/guix-data-service/web/compare/html.scm b/guix-data-service/web/compare/html.scm
index 4406d1d..2ae85a0 100644
--- a/guix-data-service/web/compare/html.scm
+++ b/guix-data-service/web/compare/html.scm
@@ -653,6 +653,7 @@
                  environment-variables))))))))))
 
 (define (compare/package-derivations query-parameters
+                                     mode
                                      valid-systems
                                      valid-targets
                                      valid-build-statuses
@@ -688,26 +689,7 @@
           (@ (method "get")
              (action "")
              (class "form-horizontal"))
-          ,(form-horizontal-control
-            "Base commit" query-parameters
-            #:required? #t
-            #:help-text "The commit to use as the basis for the comparison."
-            #:font-family "monospace")
-          ,(form-horizontal-control
-            "Target commit" query-parameters
-            #:required? #t
-            #:help-text "The commit to compare against the base commit."
-            #:font-family "monospace")
-          ,(form-horizontal-control
-            "System" query-parameters
-            #:options valid-systems
-            #:help-text "Only include derivations for this system."
-            #:font-family "monospace")
-          ,(form-horizontal-control
-            "Target" query-parameters
-            #:options valid-targets
-            #:help-text "Only include derivations that are build for this system."
-            #:font-family "monospace")
+          ,@(compare-form-controls-for-mode mode query-parameters)
           ,(form-horizontal-control
             "Build change" query-parameters
             #:options '(("(none specified)" . "")