X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/51783171059194286d2baaae3298d8d628a599b0..64ada6f56d597e2fceed3333414d8d1cf891edc5:/contrib/stgit.el diff --git a/contrib/stgit.el b/contrib/stgit.el index 9ee353c..9bbc87d 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -439,14 +439,19 @@ Cf. `stgit-file-type-change-string'." (list 'entry-type 'file 'file-data file)))) +(defun stgit-find-copies-harder-diff-arg () + "Return the flag to use with `git-diff' depending on the +`stgit-expand-find-copies-harder' flag." + (if stgit-expand-find-copies-harder + "--find-copies-harder" + "-C")) + (defun stgit-insert-patch-files (patch) "Expand (show modification of) the patch PATCH after the line at point." (let* ((patchsym (stgit-patch-name patch)) (end (progn (insert "#") (prog1 (point-marker) (forward-char -1)))) - (args (list "-z" (if stgit-expand-find-copies-harder - "--find-copies-harder" - "-C"))) + (args (list "-z" (stgit-find-copies-harder-diff-arg))) (ewoc (ewoc-create #'stgit-file-pp nil nil t))) (setf (stgit-patch-files-ewoc patch) ewoc) (with-temp-buffer @@ -467,15 +472,21 @@ at point." (let ((file (cond ((looking-at "\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\0") - (make-stgit-file - :old-perm old-perm - :new-perm new-perm - :copy-or-rename t - :cr-score (string-to-number (match-string 2)) - :cr-from (match-string 3) - :cr-to (match-string 4) - :status (stgit-file-status-code (match-string 1)) - :file (match-string 3))) + (let* ((patch-status (stgit-patch-status patch)) + (file-subexp (if (eq patch-status 'unapplied) + 3 + 4)) + (file (match-string file-subexp))) + (make-stgit-file + :old-perm old-perm + :new-perm new-perm + :copy-or-rename t + :cr-score (string-to-number (match-string 2)) + :cr-from (match-string 3) + :cr-to (match-string 4) + :status (stgit-file-status-code + (match-string 1)) + :file file))) ((looking-at "\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\0") (make-stgit-file :old-perm old-perm @@ -484,7 +495,8 @@ at point." :cr-score nil :cr-from nil :cr-to nil - :status (stgit-file-status-code (match-string 1)) + :status (stgit-file-status-code + (match-string 1)) :file (match-string 2)))))) (ewoc-enter-last ewoc file)) (goto-char (match-end 0)))) @@ -677,10 +689,16 @@ Commands: (defun stgit-patch-at-point (&optional cause-error) (get-text-property (point) 'patch-data)) -(defun stgit-patch-name-at-point (&optional cause-error) +(defun stgit-patch-name-at-point (&optional cause-error only-patches) "Return the patch name on the current line as a symbol. -If CAUSE-ERROR is not nil, signal an error if none found." +If CAUSE-ERROR is not nil, signal an error if none found. +If ONLY-PATCHES is not nil, only allow real patches, and not +index or work tree." (let ((patch (stgit-patch-at-point))) + (and patch + only-patches + (memq (stgit-patch-status patch) '(work index)) + (setq patch nil)) (cond (patch (stgit-patch-name patch)) (cause-error @@ -720,7 +738,12 @@ If that patch cannot be found, do nothing." "Mark the patch under point." (interactive) (let* ((node (ewoc-locate stgit-ewoc)) - (patch (ewoc-data node))) + (patch (ewoc-data node)) + (name (stgit-patch-name patch))) + (when (eq name :work) + (error "Cannot mark the work tree")) + (when (eq name :index) + (error "Cannot mark the index")) (stgit-add-mark (stgit-patch-name patch)) (ewoc-invalidate stgit-ewoc node)) (stgit-next-patch)) @@ -746,9 +769,10 @@ If that patch cannot be found, do nothing." (defun stgit-rename (name) "Rename the patch under point to NAME." - (interactive (list (read-string "Patch name: " - (symbol-name (stgit-patch-name-at-point t))))) - (let ((old-patchsym (stgit-patch-name-at-point t))) + (interactive (list + (read-string "Patch name: " + (symbol-name (stgit-patch-name-at-point t t))))) + (let ((old-patchsym (stgit-patch-name-at-point t t))) (stgit-capture-output nil (stgit-run "rename" old-patchsym name)) (let ((name-sym (intern name))) @@ -920,9 +944,7 @@ If PATCHSYM is a keyword, returns PATCHSYM unmodified." (patch-name (stgit-patch-name-at-point)) (patch-id (stgit-id patch-name)) (args (append (and (stgit-file-cr-from patched-file) - (if stgit-expand-find-copies-harder - '("--find-copies-harder") - '("-C"))) + (list (stgit-find-copies-harder-diff-arg))) (cond ((eq patch-id :index) '("--cached")) ((eq patch-id :work) @@ -936,8 +958,15 @@ If PATCHSYM is a keyword, returns PATCHSYM unmodified." (list (stgit-file-file patched-file)))))) (apply 'stgit-run-git "diff" args))) ('patch - (stgit-run "show" "-O" "--patch-with-stat" "-O" "-M" - (stgit-patch-name-at-point))) + (let* ((patch-name (stgit-patch-name-at-point)) + (patch-id (stgit-id patch-name))) + (if (or (eq patch-id :index) (eq patch-id :work)) + (apply 'stgit-run-git "diff" + (stgit-find-copies-harder-diff-arg) + (and (eq patch-id :index) + '("--cached"))) + (stgit-run "show" "-O" "--patch-with-stat" "-O" "-M" + (stgit-patch-name-at-point))))) (t (error "No patch or file at point"))) (with-current-buffer standard-output @@ -977,7 +1006,7 @@ If PATCHSYM is a keyword, returns PATCHSYM unmodified." (defun stgit-edit () "Edit the patch on the current line." (interactive) - (let ((patchsym (stgit-patch-name-at-point t)) + (let ((patchsym (stgit-patch-name-at-point t t)) (edit-buf (get-buffer-create "*StGit edit*")) (dir default-directory)) (log-edit 'stgit-confirm-edit t nil edit-buf) @@ -1047,6 +1076,11 @@ the work tree and index." current-prefix-arg)) (unless patchsyms (error "No patches to delete")) + (when (memq :index patchsyms) + (error "Cannot delete the index")) + (when (memq :work patchsyms) + (error "Cannot delete the work tree")) + (let ((npatches (length patchsyms))) (when (yes-or-no-p (format "Really delete %d patch%s%s? " npatches @@ -1190,6 +1224,8 @@ With prefix argument, run it with the --hard flag." (defun stgit-refresh (&optional arg) "Run stg refresh. +If the index contains any changes, only refresh from index. + With prefix argument, refresh the marked patch or the patch under point." (interactive "P") (let ((patchargs (if arg @@ -1201,6 +1237,8 @@ With prefix argument, refresh the marked patch or the patch under point." (t (cons "-p" patches)))) nil))) + (unless (stgit-index-empty-p) + (setq patchargs (cons "--index" patchargs))) (stgit-capture-output nil (apply 'stgit-run "refresh" patchargs)) (stgit-refresh-git-status))