From f355dc9cd039e3ac21e266eee7dcb91e1beaaaa6 Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Sat, 21 Jul 2018 22:53:02 +0300 Subject: Complete jobset names when possible * build-farm.el (build-farm-jobset-names): New function. (build-farm-read-jobset): Add 'project' argument. * build-farm-build.el (build-farm-build-latest-prompt-args): Adjust accordingly. --- build-farm-build.el | 2 +- build-farm.el | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/build-farm-build.el b/build-farm-build.el index a85cfea..1b75bc0 100644 --- a/build-farm-build.el +++ b/build-farm-build.el @@ -57,7 +57,7 @@ for the number of builds." (build-farm-read-project nil project) project)) (jobset (if current-prefix-arg - (build-farm-read-jobset nil jobset) + (build-farm-read-jobset project nil jobset) jobset)) (job-or-name (if current-prefix-arg (build-farm-read-job nil job) diff --git a/build-farm.el b/build-farm.el index 94104db..96e654a 100644 --- a/build-farm.el +++ b/build-farm.el @@ -203,17 +203,19 @@ SEARCH-TYPE and ARGS." (mapcar #'bui-entry-id (build-farm-get-project-entries-once url))) +(defun build-farm-jobset-names (project &optional url) + "Return jobsets for PROJECT from URL build farm." + (bui-entry-non-void-value + (bui-entry-by-id (build-farm-get-project-entries-once url) + project) + 'jobsets)) + (build-farm-define-readers :require-match nil :completions-getter build-farm-project-names :single-reader build-farm-read-project :single-prompt "Project: ") -(build-farm-define-readers - :require-match nil - :single-reader build-farm-read-jobset - :single-prompt "Jobset: ") - (build-farm-define-readers :require-match nil :single-reader build-farm-read-job @@ -225,6 +227,14 @@ SEARCH-TYPE and ARGS." :single-reader build-farm-read-system :single-prompt "System: ") +(defun build-farm-read-jobset (project &optional prompt initial-input) + "Read jobset for PROJECT from minibuffer. +See `completing-read' for PROMPT and INITIAL-INPUT." + (build-farm-completing-read + (or prompt "Jobset: ") + (build-farm-jobset-names project) + nil nil initial-input)) + ;;; Filters for processing raw entries -- cgit v1.3