diff options
| -rw-r--r-- | lisp/magit-bisect.el | 29 | ||||
| -rw-r--r-- | lisp/magit-mode.el | 2 | ||||
| -rw-r--r-- | lisp/magit.el | 2 |
3 files changed, 18 insertions, 15 deletions
diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el index a4345c7..4db2489 100644 --- a/lisp/magit-bisect.el +++ b/lisp/magit-bisect.el @@ -54,18 +54,21 @@ ;;; Commands -;;;###autoload (autoload 'magit-bisect-popup "magit-bisect" nil t) -(magit-define-popup magit-bisect-popup - "Popup console for bisect commands." +;;;###autoload (autoload 'magit-bisect "magit-bisect" nil t) +(define-transient-command magit-bisect () + "Narrow in on the commit that introduced a bug." :man-page "git-bisect" - :actions '((?B "Start" magit-bisect-start) - (?s "Start script" magit-bisect-run)) - :sequence-actions '((?b "Bad" magit-bisect-bad) - (?g "Good" magit-bisect-good) - (?k "Skip" magit-bisect-skip) - (?r "Reset" magit-bisect-reset) - (?s "Run script" magit-bisect-run)) - :sequence-predicate 'magit-bisect-in-progress-p) + ["Actions" + :if-not magit-bisect-in-progress-p + ("B" "Start" magit-bisect-start) + ("s" "Start script" magit-bisect-run)] + ["Actions" + :if magit-bisect-in-progress-p + ("B" "Bad" magit-bisect-bad) + ("g" "Good" magit-bisect-good) + ("k" "Skip" magit-bisect-skip) + ("r" "Reset" magit-bisect-reset) + ("s" "Run script" magit-bisect-run)]) ;;;###autoload (defun magit-bisect-start (bad good) @@ -74,8 +77,8 @@ Bisecting a bug means to find the commit that introduced it. This command starts such a bisect session by asking for a know good and a bad commit. To move the session forward use the -other actions from the bisect popup (\ -\\<magit-status-mode-map>\\[magit-bisect-popup])." +other actions from the bisect transient command (\ +\\<magit-status-mode-map>\\[magit-bisect])." (interactive (if (magit-bisect-in-progress-p) (user-error "Already bisecting") (magit-bisect-start-read-args))) diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el index 605a420..afe0b1f 100644 --- a/lisp/magit-mode.el +++ b/lisp/magit-mode.el @@ -414,7 +414,7 @@ starts complicating other things, then it will be removed." (define-key map "a" 'magit-cherry-apply) (define-key map "A" 'magit-cherry-pick-popup) (define-key map "b" 'magit-branch-popup) - (define-key map "B" 'magit-bisect-popup) + (define-key map "B" 'magit-bisect) (define-key map "c" 'magit-commit-popup) (define-key map "d" 'magit-diff-popup) (define-key map "D" 'magit-diff-refresh-popup) diff --git a/lisp/magit.el b/lisp/magit.el index cf4b5df..d01269a 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -227,7 +227,7 @@ and/or `magit-branch-remote-head'." :actions '("Popup and dwim commands" (?A "Cherry-picking" magit-cherry-pick-popup) (?b "Branching" magit-branch-popup) - (?B "Bisecting" magit-bisect-popup) + (?B "Bisecting" magit-bisect) (?c "Committing" magit-commit-popup) (?d "Diffing" magit-diff-popup) (?D "Change diffs" magit-diff-refresh-popup) |