X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/1d08786602b0a01a6334d5385bc1741bd2ec4974..0f076fe6b1a561a3a84a2f5938110118944577a2:/contrib/stgit.el diff --git a/contrib/stgit.el b/contrib/stgit.el index 721ca2d..220e159 100644 --- a/contrib/stgit.el +++ b/contrib/stgit.el @@ -9,6 +9,8 @@ ;; ;; To start: `M-x stgit' +(require 'git nil t) + (defun stgit (dir) "Manage stgit patches" (interactive "DDirectory: \n") @@ -68,9 +70,15 @@ Argument DIR is the repository path." (display-buffer output-buf t))))) (put 'stgit-capture-output 'lisp-indent-function 1) -(defun stgit-run (&rest args) +(defun stgit-run-silent (&rest args) (apply 'call-process "stg" nil standard-output nil args)) +(defun stgit-run (&rest args) + (let ((msgcmd (mapconcat #'identity args " "))) + (message "Running stg %s..." msgcmd) + (apply 'call-process "stg" nil standard-output nil args) + (message "Running stg %s...done" msgcmd))) + (defun stgit-reload () "Update the contents of the stgit buffer" (interactive) @@ -79,8 +87,8 @@ Argument DIR is the repository path." (curpatch (stgit-patch-at-point))) (erase-buffer) (insert "Branch: ") - (stgit-run "branch") - (stgit-run "series" "--description") + (stgit-run-silent "branch") + (stgit-run-silent "series" "--description") (stgit-rescan) (if curpatch (stgit-goto-patch curpatch) @@ -138,6 +146,21 @@ Argument DIR is the repository path." (forward-line 1)) (setq stgit-marked-patches (nreverse marked))))) +(defun stgit-quit () + "Hide the stgit buffer" + (interactive) + (bury-buffer)) + +(defun stgit-git-status () + "Show status using `git-status'" + (interactive) + (unless (fboundp 'git-status) + (error "stgit-git-status requires git-status")) + (let ((dir default-directory)) + (save-selected-window + (pop-to-buffer nil) + (git-status dir)))) + (defvar stgit-mode-hook nil "Run after `stgit-mode' is setup.") @@ -147,28 +170,34 @@ Argument DIR is the repository path." (unless stgit-mode-map (setq stgit-mode-map (make-keymap)) (suppress-keymap stgit-mode-map) - (define-key stgit-mode-map " " 'stgit-mark) - (define-key stgit-mode-map "\d" 'stgit-unmark) - (define-key stgit-mode-map "?" 'stgit-help) - (define-key stgit-mode-map "h" 'stgit-help) - (define-key stgit-mode-map "p" 'previous-line) - (define-key stgit-mode-map "n" 'next-line) - (define-key stgit-mode-map "g" 'stgit-reload) - (define-key stgit-mode-map "\C-c\C-r" 'stgit-rename) - (define-key stgit-mode-map "e" 'stgit-edit) - (define-key stgit-mode-map "c" 'stgit-coalesce) - (define-key stgit-mode-map "N" 'stgit-new) - (define-key stgit-mode-map "R" 'stgit-repair) - (define-key stgit-mode-map "C" 'stgit-commit) - (define-key stgit-mode-map "U" 'stgit-uncommit) - (define-key stgit-mode-map ">" 'stgit-push-next) - (define-key stgit-mode-map "<" 'stgit-pop-next) - (define-key stgit-mode-map "P" 'stgit-push-or-pop) - (define-key stgit-mode-map "G" 'stgit-goto) - (define-key stgit-mode-map "=" 'stgit-show) - (define-key stgit-mode-map "D" 'stgit-delete) - (define-key stgit-mode-map [(control ?/)] 'stgit-undo) - (define-key stgit-mode-map "\C-_" 'stgit-undo)) + (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg))) + '((" " . stgit-mark) + ("m" . stgit-mark) + ("\d" . stgit-unmark-up) + ("u" . stgit-unmark-down) + ("?" . stgit-help) + ("h" . stgit-help) + ("p" . previous-line) + ("n" . next-line) + ("s" . stgit-git-status) + ("g" . stgit-reload) + ("r" . stgit-refresh) + ("\C-c\C-r" . stgit-rename) + ("e" . stgit-edit) + ("c" . stgit-coalesce) + ("N" . stgit-new) + ("R" . stgit-repair) + ("C" . stgit-commit) + ("U" . stgit-uncommit) + (">" . stgit-push-next) + ("<" . stgit-pop-next) + ("P" . stgit-push-or-pop) + ("G" . stgit-goto) + ("=" . stgit-show) + ("D" . stgit-delete) + ([(control ?/)] . stgit-undo) + ("\C-_" . stgit-undo) + ("q" . stgit-quit)))) (defun stgit-mode () "Major mode for interacting with StGit. @@ -231,7 +260,7 @@ Commands: "Run stg init" (interactive) (stgit-capture-output nil - (stgit-run "init")) + (stgit-run "init")) (stgit-reload)) (defun stgit-mark () @@ -242,13 +271,19 @@ Commands: (stgit-reload)) (next-line)) -(defun stgit-unmark () - "Mark the patch on the previous line" +(defun stgit-unmark-up () + "Remove mark from the patch on the previous line" (interactive) (forward-line -1) - (let ((patch (stgit-patch-at-point))) - (stgit-remove-mark patch) - (stgit-reload))) + (stgit-remove-mark (stgit-patch-at-point)) + (stgit-reload)) + +(defun stgit-unmark-down () + "Remove mark from the patch on the current line" + (interactive) + (stgit-remove-mark (stgit-patch-at-point)) + (forward-line) + (stgit-reload)) (defun stgit-rename (name) "Rename the patch under point" @@ -265,7 +300,7 @@ Commands: "Run stg repair" (interactive) (stgit-capture-output nil - (stgit-run "repair")) + (stgit-run "repair")) (stgit-reload)) (defun stgit-commit () @@ -307,7 +342,7 @@ With numeric prefix argument, pop that many patches." (let ((patch (stgit-patch-at-point)) (applied (stgit-applied-at-point))) (stgit-capture-output nil - (stgit-run (if applied "pop" "push") patch)) + (stgit-run (if applied "pop" "push") patch)) (stgit-reload))) (defun stgit-goto () @@ -315,7 +350,7 @@ With numeric prefix argument, pop that many patches." (interactive) (let ((patch (stgit-patch-at-point))) (stgit-capture-output nil - (stgit-run "goto" patch)) + (stgit-run "goto" patch)) (stgit-reload))) (defun stgit-show () @@ -337,7 +372,7 @@ With numeric prefix argument, pop that many patches." (set (make-local-variable 'stgit-edit-patch) patch) (setq default-directory dir) (let ((standard-output edit-buf)) - (stgit-run "edit" "--save-template=-" patch)))) + (stgit-run-silent "edit" "--save-template=-" patch)))) (defun stgit-confirm-edit () (interactive) @@ -401,7 +436,7 @@ With numeric prefix argument, pop that many patches." (set (make-local-variable 'stgit-patches) patch-names) (setq default-directory dir) (let ((standard-output edit-buf)) - (apply 'stgit-run "coalesce" "--save-template=-" patch-names)))) + (apply 'stgit-run-silent "coalesce" "--save-template=-" patch-names)))) (defun stgit-confirm-coalesce () (interactive) @@ -434,4 +469,21 @@ With prefix argument, run it with the --hard flag." (stgit-run "undo"))) (stgit-reload)) +(defun stgit-refresh (&optional arg) + "Run stg refresh. +With prefix argument, refresh the patch under point." + (interactive "P") + (let ((patchargs (if arg + (let ((patches (stgit-patches-marked-or-at-point))) + (cond ((null patches) + (error "no patch to update")) + ((> (length patches) 1) + (error "too many patches selected")) + (t + (cons "-p" patches)))) + nil))) + (stgit-capture-output nil + (apply 'stgit-run "refresh" patchargs))) + (stgit-reload)) + (provide 'stgit)