From 7891768a52c0f3e803cbde829e935cf7c4ea56bb Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Thu, 30 Jun 2016 21:49:35 -0400 Subject: Add magit-cherry-toggle-upstream-section command --- lisp/km-magit.el | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'lisp/km-magit.el') diff --git a/lisp/km-magit.el b/lisp/km-magit.el index 9455237..d4b89f2 100644 --- a/lisp/km-magit.el +++ b/lisp/km-magit.el @@ -594,6 +594,25 @@ show tags by default." ((derived-mode-p 'magit-cherry-mode) (call-interactively #'km/magit-cherry-flip-revs)))) +(defun km/magit-cherry-insert-in-upstream () + (insert ?\n) + (magit-insert-section (cherries) + (magit-insert-heading "In upstream:") + (magit-git-wash (apply-partially 'magit-log-wash-log 'cherry) + "cherry" "-v" "--abbrev" + (nth 1 magit-refresh-args) (nth 0 magit-refresh-args)))) + +(defun km/magit-cherry-toggle-upstream-section () + (interactive) + (let ((pos (point))) + (if (memq #'km/magit-cherry-insert-in-upstream magit-cherry-sections-hook) + (kill-local-variable 'magit-cherry-sections-hook) + (setq-local magit-cherry-sections-hook + (append magit-cherry-sections-hook + '(km/magit-cherry-insert-in-upstream)))) + (magit-refresh-buffer) + (goto-char pos))) + (defun km/magit-diff-visit-file (&optional prev-rev other-window) "Like `magit-diff-visit-file', but with the option to visit REV^. -- cgit v1.2.3