Signed-off-by: David Kågedal <davidk@xxxxxxxxxxxxxx> Signed-off-by: Karl Hasselström <kha@xxxxxxxxxxx> --- contrib/stgit.el | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) create mode 100644 contrib/stgit.el diff --git a/contrib/stgit.el b/contrib/stgit.el new file mode 100644 index 0000000..1bdc0a5 --- /dev/null +++ b/contrib/stgit.el @@ -0,0 +1,141 @@ +(defun stgit (dir) + "Manage stgit patches" + (interactive "DDirectory: \n") + (switch-to-stgit-buffer dir) + (stgit-refresh)) + +(defun switch-to-stgit-buffer (dir) + "Switch to a (possibly new) buffer displaying StGit patches for DIR" + (setq dir (file-name-as-directory dir)) + (let ((buffers (buffer-list))) + (while (and buffers + (not (with-current-buffer (car buffers) + (and (eq major-mode 'stgit-mode) + (string= default-directory dir))))) + (setq buffers (cdr buffers))) + (switch-to-buffer (if buffers + (car buffers) + (create-stgit-buffer dir))))) + +(defun create-stgit-buffer (dir) + "Create a buffer for showing StGit patches. +Argument DIR is the repository path." + (let ((buf (create-file-buffer (concat dir "*stgit*"))) + (inhibit-read-only t)) + (with-current-buffer buf + (setq default-directory dir) + (stgit-mode) + (setq buffer-read-only t)) + buf)) + +(defmacro stgit-capture-output (name &rest body) + "Capture StGit output and show it in a window at the end" + `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))) + (with-current-buffer output-buf + (erase-buffer)) + (let ((standard-output output-buf)) + ,@body) + (if (with-current-buffer output-buf (< (point-min) (point-max))) + (display-buffer output-buf t)))) +(put 'stgit-capture-output 'lisp-indent-function 1) + +(defun stgit-run (&rest args) + (apply 'call-process "stg" nil standard-output nil args)) + +(defun stgit-refresh () + "Update the contents of the stgit buffer" + (interactive) + (let ((inhibit-read-only t) + (curline (line-number-at-pos)) + (curpatch (stgit-patch-at-point))) + (erase-buffer) + (insert "Branch: ") + (stgit-run "branch") + (stgit-run "series") + (if curpatch + (stgit-goto-patch curpatch) + (goto-line curline)))) + +(defvar stgit-mode-hook nil + "Run after `stgit-mode' is setup.") + +(defvar stgit-mode-map nil + "Keymap for StGit major mode.") + +(unless stgit-mode-map + (setq stgit-mode-map (make-keymap)) + (suppress-keymap stgit-mode-map) + (define-key stgit-mode-map "g" 'stgit-refresh) + (define-key stgit-mode-map "r" 'stgit-rename) + (define-key stgit-mode-map ">" 'stgit-push-next) + (define-key stgit-mode-map "<" 'stgit-pop) + (define-key stgit-mode-map "=" 'stgit-show)) + +(defun stgit-mode () + "Major mode for interacting with StGit. +Commands: +\\{stgit-mode-map}" + (kill-all-local-variables) + (buffer-disable-undo) + (setq mode-name "StGit" + major-mode 'stgit-mode + goal-column 2) + (use-local-map stgit-mode-map) + (set (make-local-variable 'list-buffers-directory) default-directory) + (run-hooks 'stgit-mode-hook)) + +(defun stgit-patch-at-point () + "Return the patch name on the current line" + (save-excursion + (beginning-of-line) + (if (looking-at "[>+-] \\(.*\\)") + (match-string 1) + nil))) + +(defun stgit-goto-patch (patch) + "Move point to the line containing PATCH" + (let ((p (point))) + (goto-char (point-min)) + (if (re-search-forward (concat "[>+-] " (regexp-quote patch) "$") nil t) + (progn (move-to-column goal-column) + t) + (goto-char p) + nil))) + +(defun stgit-rename (name) + "Rename the patch under point" + (interactive (list (read-string "Patch name: " (stgit-patch-at-point)))) + (let ((old-name (stgit-patch-at-point))) + (unless old-name + (error "No patch on this line")) + (stgit-capture-output nil + (stgit-run "rename" old-name name)) + (stgit-refresh) + (stgit-goto-patch name))) + +(defun stgit-push-next () + "Push the patch on the line after pos" + (interactive) + (forward-line 1) + (let ((patch (stgit-patch-at-point))) + (stgit-capture-output nil + (stgit-run "push" patch)) + (stgit-refresh))) + +(defun stgit-pop () + "Pop the patch on the current line" + (interactive) + (let ((patch (stgit-patch-at-point))) + (stgit-capture-output nil + (stgit-run "pop" patch)) + (stgit-refresh) + (previous-line))) + +(defun stgit-show () + "Show the patch on the current line" + (interactive) + (stgit-capture-output "*StGit patch*" + (stgit-run "show" (stgit-patch-at-point)) + (with-current-buffer standard-output + (goto-char (point-min)) + (diff-mode)))) - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html