branch: elpa/magit
commit 69b310e1096265579399ec3be9af73182e7895cc
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-rebase-insert-merge-sequence: Insert sections for all steps
---
lisp/magit-sequence.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el
index 8be5352efb..0979e69cb3 100644
--- a/lisp/magit-sequence.el
+++ b/lisp/magit-sequence.el
@@ -1024,9 +1024,7 @@ status buffer (i.e., the reverse of how they will be
applied)."
((or 'commit (and 'merge (guard abbrev)))
(magit-sequence-insert-commit action target 'magit-sequence-pick
abbrev trailer))
- ((or 'exec 'label 'merge)
- (insert (propertize action 'font-lock-face 'magit-sequence-onto) "\s"
- (propertize target 'font-lock-face 'git-rebase-label)
"\n")))))
+ (_ (magit-sequence-insert-step action target)))))
(let ((dir (magit-gitdir)))
(magit-sequence-insert-sequence
(magit-file-line (expand-file-name "rebase-merge/stopped-sha" dir))
@@ -1131,6 +1129,14 @@ status buffer (i.e., the reverse of how they will be
applied)."
(concat (propertize abbrev 'face 'magit-hash) " " msg "\n")
(concat (magit-format-rev-summary hash) "\n")))))
+(defun magit-sequence-insert-step (type target)
+ (magit-insert-section (rebase-step (cons type target))
+ (magit-insert-heading
+ (propertize type 'font-lock-face 'magit-sequence-onto)
+ (and target
+ (concat "\s"
+ (propertize target 'font-lock-face 'git-rebase-label))))))
+
;;; _
(provide 'magit-sequence)
;;; magit-sequence.el ends here
