stgit.el: Add stgit-new-and-refresh command

This creates a new patch and fills it with the current changes,
i.e. it is the same as the "N" command followed by "r".

Signed-off-by: David Kågedal <david@virtutech.com>
Signed-off-by: Gustav Hållberg <gustav@virtutech.com>

diff --git a/contrib/stgit.el b/contrib/stgit.el
index c96b7ffac56bce6f62c6a8b136331c009358aa38..7f64a51c986c003aefd913d936413901d3b58560 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -793,6 +793,7 @@ (unless stgit-mode-map
             ("M" .        stgit-move-patches)
             ("S" .        stgit-squash)
             ("N" .        stgit-new)
             ("M" .        stgit-move-patches)
             ("S" .        stgit-squash)
             ("N" .        stgit-new)

+            ("c" .        stgit-new-and-refresh)

             ("\C-c\C-c" . stgit-commit)
             ("\C-c\C-u" . stgit-uncommit)
             ("U" .        stgit-revert-file)
             ("\C-c\C-c" . stgit-commit)
             ("\C-c\C-u" . stgit-uncommit)
             ("U" .        stgit-revert-file)


@@ -851,6 +852,7 @@ (defun stgit-mode ()
 \\[stgit-diff] Show the patch log and diff
 
 \\[stgit-new]  Create a new, empty patch
 \\[stgit-diff] Show the patch log and diff
 
 \\[stgit-new]  Create a new, empty patch

+\\[stgit-new-and-refresh]      Create a new patch from index or work tree

 \\[stgit-rename]       Rename patch
 \\[stgit-edit] Edit patch description
 \\[stgit-delete]       Delete patch(es)
 \\[stgit-rename]       Rename patch
 \\[stgit-edit] Edit patch description
 \\[stgit-delete]       Delete patch(es)


@@ -1413,7 +1415,7 @@ (defun stgit-confirm-edit ()
     (with-current-buffer log-edit-parent-buffer
       (stgit-reload))))
 
     (with-current-buffer log-edit-parent-buffer
       (stgit-reload))))
 

-(defun stgit-new (add-sign)
+(defun stgit-new (add-sign &optional refresh)

   "Create a new patch.
 With a prefix argument, include a \"Signed-off-by:\" line at the
 end of the patch."
   "Create a new patch.
 With a prefix argument, include a \"Signed-off-by:\" line at the
 end of the patch."


@@ -1422,6 +1424,7 @@ (defun stgit-new (add-sign)
         (dir default-directory))
     (log-edit 'stgit-confirm-new t nil edit-buf)
     (setq default-directory dir)
         (dir default-directory))
     (log-edit 'stgit-confirm-new t nil edit-buf)
     (setq default-directory dir)

+    (set (make-local-variable 'stgit-refresh-after-new) refresh)

     (when add-sign
       (save-excursion
         (let ((standard-output (current-buffer)))
     (when add-sign
       (save-excursion
         (let ((standard-output (current-buffer)))


@@ -1429,12 +1432,25 @@ (defun stgit-new (add-sign)
 
 (defun stgit-confirm-new ()
   (interactive)
 
 (defun stgit-confirm-new ()
   (interactive)

-  (let ((file (make-temp-file "stgit-edit-")))
+  (let ((file (make-temp-file "stgit-edit-"))
+        (refresh stgit-refresh-after-new))

     (write-region (point-min) (point-max) file)
     (stgit-capture-output nil
       (stgit-run "new" "-f" file))
     (with-current-buffer log-edit-parent-buffer
     (write-region (point-min) (point-max) file)
     (stgit-capture-output nil
       (stgit-run "new" "-f" file))
     (with-current-buffer log-edit-parent-buffer

-      (stgit-reload))))
+      (if refresh
+          (stgit-refresh)
+        (stgit-reload)))))
+
+(defun stgit-new-and-refresh (add-sign)
+  "Create a new patch and refresh it with the current changes.
+
+With a prefix argument, include a \"Signed-off-by:\" line at the
+end of the patch.
+
+This works just like running `stgit-new' followed by `stgit-refresh'."
+  (interactive "P")
+  (stgit-new add-sign t))

 
 (defun stgit-create-patch-name (description)
   "Create a patch name from a long description"
 
 (defun stgit-create-patch-name (description)
   "Create a patch name from a long description"