stgit.el: Fix showing diff in file that has been both copied and modified

[stgit] / contrib / stgit.el

diff --git a/contrib/stgit.el b/contrib/stgit.el
index 24d4759..564714b 100644 (file)
--- a/contrib/stgit.el
+++ b/contrib/stgit.el
@@ -2016,6 +2016,8 @@ which stage to diff against in the case of unmerged files."
                                      (list unmerged-stage))
                                     (t
                                      (list (concat patch-id "^") patch-id)))
                                      (list unmerged-stage))
                                     (t
                                      (list (concat patch-id "^") patch-id)))

+                              (and (eq (stgit-file->status patched-file) 'copy)
+                                   '("--diff-filter=C"))

                               '("--")
                               (if (stgit-file->copy-or-rename patched-file)
                                   (list (stgit-file->cr-from patched-file)
                               '("--")
                               (if (stgit-file->copy-or-rename patched-file)
                                   (list (stgit-file->cr-from patched-file)


@@ -2451,25 +2453,29 @@ deepest patch had before the squash."
       (unless at-pmark
         (goto-char old-point)))))
 
       (unless at-pmark
         (goto-char old-point)))))
 

-(defun stgit-execute ()
+(defun stgit-execute (&optional git-mode)

   "Prompt for an stg command to execute in a shell.
 
 The names of any marked patches or the patch at point are
 inserted in the command to be executed.
 
   "Prompt for an stg command to execute in a shell.
 
 The names of any marked patches or the patch at point are
 inserted in the command to be executed.
 

+With a prefix argument, or if GIT-MODE is non-nil, insert SHA1
+sums of the marked patches instead, and prompt for a git command.
+

 If the command ends in an ampersand, run it asynchronously.
 
 When the command has finished, reload the stgit buffer."
 If the command ends in an ampersand, run it asynchronously.
 
 When the command has finished, reload the stgit buffer."

-  (interactive)
+  (interactive "P")

   (stgit-assert-mode)
   (let* ((patches (stgit-sort-patches
                    (stgit-patches-marked-or-at-point nil 'allow-committed)))
          (patch-names (mapcar 'symbol-name patches))
          (hyphens (find-if (lambda (s) (string-match "^-" s)) patch-names))
          (defaultcmd (if patches
   (stgit-assert-mode)
   (let* ((patches (stgit-sort-patches
                    (stgit-patches-marked-or-at-point nil 'allow-committed)))
          (patch-names (mapcar 'symbol-name patches))
          (hyphens (find-if (lambda (s) (string-match "^-" s)) patch-names))
          (defaultcmd (if patches

-                         (concat "stg  "
+                         (concat (if git-mode "git" "stg") "  "

                                  (and hyphens "-- ")
                                  (and hyphens "-- ")

-                                 (mapconcat 'identity patch-names " "))
+                                 (mapconcat (if git-mode 'stgit-id 'identity)
+                                            patch-names " "))

                        "stg "))
          (cmd (read-from-minibuffer "Shell command: " (cons defaultcmd 5)
                                     nil nil 'shell-command-history))
                        "stg "))
          (cmd (read-from-minibuffer "Shell command: " (cons defaultcmd 5)
                                     nil nil 'shell-command-history))