spw/log-view-git-fixup: implement instant fixups

1 files changed, 9 insertions, 3 deletions

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 7ecd2e03..7d8742fe 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -3626,14 +3626,15 @@ mutt's review view, after exiting EDITOR."
   (interactive)
   (spw/log-view-eshell-git-range "cherry-pick"))
 
-(defun spw/log-view-git-fixup ()
-  (interactive)
+(defun spw/log-view-git-fixup (&optional instant)
+  (interactive "P")
   (let ((project-root (project-root (project-current)))
 	(summary
 	 (format "Summary: fixup! %s\n\n"
 		 (cadr
 		  (process-lines
-		   "git" "rev-list" "--format=%s" (log-view-current-tag))))))
+		   "git" "rev-list" "--format=%s" (log-view-current-tag)))))
+	(previous (format "%s~1" (log-view-current-tag))))
     (if (and (get-buffer "*vc-log*")
 	     (with-current-buffer "*vc-log*"
 	       (file-equal-p project-root (project-root (project-current)))))
@@ -3641,6 +3642,11 @@ mutt's review view, after exiting EDITOR."
 	       (erase-buffer)
 	       (insert summary)
 	       (call-interactively #'log-edit-done)
+	       (when instant
+		 (let ((process-environment
+			(cons "EDITOR=true" process-environment)))
+		   (call-process "git" nil "*log-view-instant-fixup*" nil
+				 "rebase" "-i" "--autosquash" previous)))
 	       (when (derived-mode-p 'vc-git-log-view-mode)
 		 (revert-buffer)))
       (require 'log-edit)