X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1b47104494b3f0371ece396a00bda59adbd3ffd9..de8efe1efc4a495eca0614aa9f6c1910d5838f99:/contrib/stgit.el diff --git a/contrib/stgit.el b/contrib/stgit.el index 11f370e..487b891 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -603,14 +603,20 @@ using (make-hash-table :test 'equal)." (stgit-run-silent "branch")) 0 -1)) -(defun stgit-reload () - "Update the contents of the StGit buffer." +(defun stgit-reload (&optional description) + "Update the contents of the StGit buffer. + +If DESCRIPTION is non-nil, it is displayed as a status message +during the operation." (interactive) (stgit-assert-mode) + (when description + (message "%s..." description)) (let ((inhibit-read-only t) (curline (line-number-at-pos)) (curpatch (stgit-patch-name-at-point)) - (curfile (stgit-patched-file-at-point))) + (curfile (stgit-patched-file-at-point)) + (stgit-inhibit-messages description)) (ewoc-filter stgit-ewoc #'(lambda (x) nil)) (ewoc-set-hf stgit-ewoc (concat "Branch: " @@ -629,8 +635,10 @@ using (make-hash-table :test 'equal)." (and curfile (stgit-file->file curfile)))) (goto-char (point-min)) (forward-line (1- curline)) - (move-to-column (stgit-goal-column)))) - (stgit-refresh-git-status)) + (move-to-column (stgit-goal-column))) + (stgit-refresh-git-status)) + (when description + (message "%s...done" description))) (defconst stgit-file-status-code-strings (mapcar (lambda (arg) @@ -2008,6 +2016,8 @@ which stage to diff against in the case of unmerged files." (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) @@ -2023,7 +2033,8 @@ which stage to diff against in the case of unmerged files." (if (eq patch-id :index) '("--cached") (list unmerged-stage)))) - (let ((args (append '("show" "-O" "--patch-with-stat" "-O" "-M") + (let ((args (append '("show" "-O" "--patch-with-stat") + `("-O" ,(stgit-find-copies-harder-diff-arg)) (and space-arg (list "-O" space-arg)) '("--") (list (stgit-patch-name-at-point))))) @@ -2086,10 +2097,12 @@ greater than four (e.g., \\[universal-argument] \ (error "Can only show diff range for applied patches")) (stgit-capture-output (format "*StGit diff %s..%s*" first-patch second-patch) - (apply 'stgit-run-git (append '("diff" "--patch-with-stat") - (and whitespace-arg (list whitespace-arg)) - (list (format "%s^" (stgit-id first-patch)) - (stgit-id second-patch)))) + (apply 'stgit-run-git + "diff" "--patch-with-stat" + (stgit-find-copies-harder-diff-arg) + (append (and whitespace-arg (list whitespace-arg)) + (list (format "%s^" (stgit-id first-patch)) + (stgit-id second-patch)))) (with-current-buffer standard-output (goto-char (point-min)) (diff-mode))))) @@ -2443,24 +2456,29 @@ deepest patch had before the squash." (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. +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." - (interactive) + (interactive "P") (stgit-assert-mode) - (let* ((patches (stgit-patches-marked-or-at-point nil 'allow-committed)) + (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 "-- ") - (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)) @@ -2563,7 +2581,7 @@ See also `stgit-show-worktree-mode'.") (defvar stgit-committed-count nil "The number of recent commits to show.") -(defmacro stgit-define-toggle-view (sym help) +(defmacro stgit-define-toggle-view (sym desc help) (declare (indent 1)) (let* ((name (symbol-name sym)) (fun (intern (concat "stgit-toggle-" name))) @@ -2577,9 +2595,10 @@ See also `stgit-show-worktree-mode'.") (setq ,flag (if arg (> (prefix-numeric-value arg) 0) (not ,flag))) - (stgit-reload)))) + (stgit-reload (format "%s %s" (if ,flag "Showing" "Hiding") ,desc))))) (stgit-define-toggle-view worktree + "work tree and index" "Toggle the visibility of the work tree. With ARG, show the work tree if ARG is positive. @@ -2589,6 +2608,7 @@ Its initial setting is controlled by `stgit-default-show-worktree'. work tree will show up.") (stgit-define-toggle-view ignored + "ignored files" "Toggle the visibility of files ignored by git in the work tree. With ARG, show these files if ARG is positive. @@ -2597,6 +2617,7 @@ Its initial setting is controlled by `stgit-default-show-ignored'. Use \\[stgit-toggle-worktree] to show the work tree.") (stgit-define-toggle-view unknown + "unknown files" "Toggle the visibility of files not registered with git in the work tree. With ARG, show these files if ARG is positive. @@ -2605,12 +2626,14 @@ Its initial setting is controlled by `stgit-default-show-unknown'. Use \\[stgit-toggle-worktree] to show the work tree.") (stgit-define-toggle-view patch-names + "patch names" "Toggle the visibility of patch names. With ARG, show patch names if ARG is positive. The initial setting is controlled by `stgit-default-show-patch-names'.") (stgit-define-toggle-view svn + "subversion revisions" "Toggle showing subversion information from git svn. With ARG, show svn information if ARG is positive. @@ -2629,6 +2652,10 @@ The initial setting is controlled by `stgit-default-show-committed'." (let ((n (prefix-numeric-value arg))) (setq stgit-show-committed (> n 0)) (setq stgit-committed-count n))) - (stgit-reload)) + (stgit-reload (format "%s historical commits" + (if (and stgit-show-committed + (> stgit-committed-count 0)) + "Showing" + "Hiding")))) (provide 'stgit)