From: Gustav Hållberg Date: Thu, 29 Apr 2010 15:20:48 +0000 (+0200) Subject: stgit.el: Make ! with prefix argument prompt for git command X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/15d774abedd480f35830f16c4872afd359664103?ds=sidebyside;hp=8f489f41f8ffe6e06254cefc5b352610df06cbeb stgit.el: Make ! with prefix argument prompt for git command Signed-off-by: Gustav Hållberg --- diff --git a/contrib/stgit.el b/contrib/stgit.el index 24d4759..1bc78a2 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -2451,25 +2451,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-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))