Emacs mode: push/pop next patch, not patch at point

The three operations we should have are:

  * Pop the topmost applied patch, no matter where point is.

  * Push the first unapplied patch, no matter where point is.

  * Push/pop the patch at point, depending on whether it's currently
    applied.

This patch makes "<" and ">" do the first two operations. The third is
coming in a later patch.

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 cce0c0ed21b0b3ffef5cd8034582306d52ba8927..17b5d6ba496d12525d785eb781260e5d5284eb94 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -81,7 +81,7 @@   (define-key stgit-mode-map "h"   'stgit-help)
   (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 "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)
+  (define-key stgit-mode-map "<"   'stgit-pop-next)

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


@@ -127,22 +127,16 @@ (defun stgit-rename (name)
     (stgit-goto-patch name)))
 
 (defun stgit-push-next ()
     (stgit-goto-patch name)))
 
 (defun stgit-push-next ()

-  "Push the patch on the line after pos"
+  "Push the first unapplied patch"

   (interactive)
   (interactive)

-  (forward-line 1)
-  (let ((patch (stgit-patch-at-point)))
-    (stgit-capture-output nil
-      (stgit-run "push" patch))
-    (stgit-refresh)))
+  (stgit-capture-output nil (stgit-run "push"))
+  (stgit-refresh))

 
 

-(defun stgit-pop ()
-  "Pop the patch on the current line"
+(defun stgit-pop-next ()
+  "Pop the topmost applied patch"

   (interactive)
   (interactive)

-  (let ((patch (stgit-patch-at-point)))
-    (stgit-capture-output nil
-      (stgit-run "pop" patch))
-    (stgit-refresh)
-    (previous-line)))
+  (stgit-capture-output nil (stgit-run "pop"))
+  (stgit-refresh))

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