X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/7cc45294865ddc8ac6c3a1af15a71be6be9965a4..9ab06b9858bbb0196867506724a8d74c8f39e113:/contrib/stgit.el?ds=sidebyside

diff --git a/contrib/stgit.el b/contrib/stgit.el
index b066b14..ed6342c 100644
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -463,19 +463,23 @@ find copied files."
       (pop-to-buffer nil)
       (git-status dir))))
 
-(defun stgit-next-line (&optional arg try-vscroll)
+(defun stgit-goal-column ()
+  "Return goal column for the current line"
+  (cond ((get-text-property (point) 'stgit-file-patchsym) 4)
+        ((get-text-property (point) 'stgit-patchsym)      2)
+        (t 0)))
+
+(defun stgit-next-line (&optional arg)
   "Move cursor vertically down ARG lines"
-  (interactive "p\np")
-  (next-line arg try-vscroll)
-  (when (looking-at "  \\S-")
-    (forward-char 2)))
+  (interactive "p")
+  (next-line arg)
+  (move-to-column (stgit-goal-column)))
 
-(defun stgit-previous-line (&optional arg try-vscroll)
+(defun stgit-previous-line (&optional arg)
   "Move cursor vertically up ARG lines"
-  (interactive "p\np")
-  (previous-line arg try-vscroll)
-  (when (looking-at "  \\S-")
-    (forward-char 2)))
+  (interactive "p")
+  (previous-line arg)
+  (move-to-column (stgit-goal-column)))
 
 (defun stgit-next-patch (&optional arg)
   "Move cursor down ARG patches"
@@ -517,10 +521,12 @@ find copied files."
           ("u" .        stgit-unmark-down)
           ("?" .        stgit-help)
           ("h" .        stgit-help)
-          ("p" .        stgit-previous-line)
-          ("n" .        stgit-next-line)
-          ("\C-p" .     stgit-previous-patch)
-          ("\C-n" .     stgit-next-patch)
+          ("\C-p" .     stgit-previous-line)
+          ("\C-n" .     stgit-next-line)
+          ([up] .       stgit-previous-line)
+          ([down] .     stgit-next-line)
+          ("p" .        stgit-previous-patch)
+          ("n" .        stgit-next-patch)
           ("\M-{" .     stgit-previous-patch)
           ("\M-}" .     stgit-next-patch)
           ("s" .        stgit-git-status)
@@ -786,7 +792,7 @@ With numeric prefix argument, pop that many patches."
 		;; just one file
 		(stgit-run-git "diff" (concat id "^") id "--"
 			       (cdr patched-file)))))
-        (stgit-run "show" "-O" "--patch-with-stat" patchsym))
+        (stgit-run "show" "-O" "--patch-with-stat" "-O" "-M" patchsym))
       (with-current-buffer standard-output
 	(goto-char (point-min))
 	(diff-mode)))))
@@ -890,6 +896,28 @@ the point is after or before the applied patches."
 	  ((save-excursion (re-search-backward "^>" nil t)) :top)
 	  (t :bottom))))
 
+(defun stgit-sort-patches (patchsyms)
+  "Returns the list of patches in PATCHSYMS sorted according to
+their position in the patch series, bottommost first.
+
+PATCHSYMS may not contain duplicate entries."
+  (let (sorted-patchsyms
+        (series (with-output-to-string
+                  (with-current-buffer standard-output
+                    (stgit-run-silent "series" "--noprefix"))))
+        start)
+    (while (string-match "^\\(.+\\)" series start)
+      (let ((patchsym (intern (match-string 1 series))))
+        (when (memq patchsym patchsyms)
+          (setq sorted-patchsyms (cons patchsym sorted-patchsyms))))
+      (setq start (match-end 0)))
+    (setq sorted-patchsyms (nreverse sorted-patchsyms))
+
+    (unless (= (length patchsyms) (length sorted-patchsyms))
+      (error "Internal error"))
+
+    sorted-patchsyms))
+
 (defun stgit-move-patches (patchsyms target-patch)
   "Move the patches in PATCHSYMS to below TARGET-PATCH.
 If TARGET-PATCH is :bottom or :top, move the patches to the
@@ -909,21 +937,7 @@ Interactively, move the marked patches to where the point is."
         (apply 'stgit-run "float" patchsyms))
 
     ;; need to have patchsyms sorted by position in the stack
-    (let (sorted-patchsyms
-          (series (with-output-to-string
-                    (with-current-buffer standard-output
-                      (stgit-run-silent "series" "--noprefix"))))
-          start)
-      (while (string-match "^\\(.+\\)" series start)
-        (let ((patchsym (intern (match-string 1 series))))
-          (when (memq patchsym patchsyms)
-            (setq sorted-patchsyms (cons patchsym sorted-patchsyms))))
-        (setq start (match-end 0)))
-      (setq sorted-patchsyms (nreverse sorted-patchsyms))
-    
-      (unless (= (length patchsyms) (length sorted-patchsyms))
-        (error "Internal error"))
-
+    (let ((sorted-patchsyms (stgit-sort-patches patchsyms)))
       (while sorted-patchsyms
         (setq sorted-patchsyms
               (and (stgit-capture-output nil
@@ -936,17 +950,35 @@ Interactively, move the marked patches to where the point is."
 
 (defun stgit-squash (patchsyms)
   "Squash the patches in PATCHSYMS.
-Interactively, squash the marked patches."
+Interactively, squash the marked patches.
+
+Unless there are any conflicts, the patches will be merged into
+one patch, which will occupy the same spot in the series as the
+deepest patch had before the squash."
   (interactive (list stgit-marked-patches))
   (when (< (length patchsyms) 2)
     (error "Need at least two patches to squash"))
-  (let ((edit-buf (get-buffer-create "*StGit edit*"))
-        (dir default-directory))
+  (let ((stgit-buffer (current-buffer))
+        (edit-buf (get-buffer-create "*StGit edit*"))
+        (dir default-directory)
+        (sorted-patchsyms (stgit-sort-patches patchsyms)))
     (log-edit 'stgit-confirm-squash t nil edit-buf)
-    (set (make-local-variable 'stgit-patchsyms) patchsyms)
+    (set (make-local-variable 'stgit-patchsyms) sorted-patchsyms)
     (setq default-directory dir)
-    (let ((standard-output edit-buf))
-      (apply 'stgit-run-silent "squash" "--save-template=-" patchsyms))))
+    (let ((result (let ((standard-output edit-buf))
+                    (apply 'stgit-run-silent "squash"
+                           "--save-template=-" sorted-patchsyms))))
+
+      ;; stg squash may have reordered the patches or caused conflicts
+      (with-current-buffer stgit-buffer
+        (stgit-reload))
+
+      (unless (eq 0 result)
+        (fundamental-mode)
+        (rename-buffer "*StGit error*")
+        (resize-temp-buffer-window)
+        (switch-to-buffer-other-window stgit-buffer)
+        (error "stg squash failed")))))
 
 (defun stgit-confirm-squash ()
   (interactive)