diff options
| author | Alex Kost <alezost@gmail.com> | 2018-08-22 10:32:39 +0300 |
|---|---|---|
| committer | Alex Kost <alezost@gmail.com> | 2018-08-26 00:06:26 +0300 |
| commit | f05dafb2b8da4c7361879df66972cd1504c38706 (patch) | |
| tree | 6ad489770e3e140551e6567e37764a90a35a3f0b /build-farm-popup.el | |
| parent | Add interface for Cuirass jobsets (diff) | |
| download | emacs-build-farm-f05dafb2b8da4c7361879df66972cd1504c38706.tar.gz | |
Read project/jobset according to farm type (Hydra or Cuirass)
* build-farm.el (build-farm-check-project-support): New procedure.
(build-farm-read-project, build-farm-read-jobset): Use keyword arguments.
* build-farm-build.el (build-farm-build-latest-prompt-args): Prompt for
project only for Hydra farm.
* build-farm-popup.el (build-farm-popup-read-jobset): Likewise.
(build-farm-popup-read-project): New procedure.
* build-farm-project.el (build-farm-projects, build-farm-project): Check
if current farm type is Hydra.
Diffstat (limited to 'build-farm-popup.el')
| -rw-r--r-- | build-farm-popup.el | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/build-farm-popup.el b/build-farm-popup.el index 5cd8309..61dd933 100644 --- a/build-farm-popup.el +++ b/build-farm-popup.el @@ -53,11 +53,8 @@ (?n "number" build-farm-set-number-of-builds build-farm-popup-format-number-of-builds)) - :options '(;; "Options for latest and queued builds" - ;; (?n "Number of builds" "number=" - ;; magit-popup-read-number) - "Options for latest builds" - (?p "project" "project=" build-farm-read-project) + :options '("Options for latest builds" + (?p "project" "project=" build-farm-popup-read-project) (?j "jobset" "jobset=" build-farm-popup-read-jobset) (?J "job" "job=") (?s "system" "system=" build-farm-read-system)) @@ -65,14 +62,21 @@ (?q "queued" build-farm-popup-queued-builds) (?i "build by ID" build-farm-build))) +(defun build-farm-popup-read-project (&optional prompt initial-input) + "Read project from minibuffer. +See `completing-read' for PROMPT and INITIAL-INPUT." + (build-farm-read-project :prompt prompt + :initial-input initial-input)) + (defun build-farm-popup-read-jobset (&optional prompt initial-input) "Read jobset for the current project from minibuffer. See `completing-read' for PROMPT and INITIAL-INPUT." (build-farm-read-jobset - (plist-get (build-farm-popup-parse-build-args - (magit-popup-get-args)) - :project) - prompt initial-input)) + :prompt prompt + :initial-input initial-input + :project (plist-get (build-farm-popup-parse-build-args + (magit-popup-get-args)) + :project))) (defun build-farm-popup-variable-value (var-name) "Return string formatted for popup buffer. |