Emacs mode: Let "P" push or pop patch at point

When the user presses "P", push or pop the patch at point depending on
whether it's applied or unapplied.

Signed-off-by: Karl Hasselström <kha@treskal.com>
Signed-off-by: David Kågedal <davidk@lysator.liu.se>

diff --git a/contrib/stgit.el b/contrib/stgit.el
index 17b5d6ba496d12525d785eb781260e5d5284eb94..d371e71f0f8cfb0c03a35158ea1a86ef17116cba 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -82,6 +82,7 @@   (define-key stgit-mode-map "g"   'stgit-refresh)
   (define-key stgit-mode-map "r"   'stgit-rename)
   (define-key stgit-mode-map ">"   'stgit-push-next)
   (define-key stgit-mode-map "<"   'stgit-pop-next)
   (define-key stgit-mode-map "r"   'stgit-rename)
   (define-key stgit-mode-map ">"   'stgit-push-next)
   (define-key stgit-mode-map "<"   'stgit-pop-next)

+  (define-key stgit-mode-map "P"   'stgit-push-or-pop)

   (define-key stgit-mode-map "="   'stgit-show))
 
 (defun stgit-mode ()
   (define-key stgit-mode-map "="   'stgit-show))
 
 (defun stgit-mode ()


@@ -138,6 +139,21 @@ (defun stgit-pop-next ()
   (stgit-capture-output nil (stgit-run "pop"))
   (stgit-refresh))
 
   (stgit-capture-output nil (stgit-run "pop"))
   (stgit-refresh))
 

+(defun stgit-applied-at-point ()
+  "Is the patch on the current line applied?"
+  (save-excursion
+    (beginning-of-line)
+    (looking-at "[>+]")))
+
+(defun stgit-push-or-pop ()
+  "Push or pop the patch on the current line"
+  (interactive)
+  (let ((patch (stgit-patch-at-point))
+        (applied (stgit-applied-at-point)))
+    (stgit-capture-output nil
+       (stgit-run (if applied "pop" "push") patch))
+    (stgit-refresh)))
+

 (defun stgit-show ()
   "Show the patch on the current line"
   (interactive)
 (defun stgit-show ()
   "Show the patch on the current line"
   (interactive)