chiark / gitweb /
Convert "stg delete" to the new infrastructure
[stgit] / contrib / stgit.el
CommitLineData
3a59f3db
KH
1;; stgit.el: An emacs mode for StGit
2;;
3;; Copyright (C) 2007 David Kågedal <davidk@lysator.liu.se>
4;;
5;; To install: put this file on the load-path and place the following
6;; in your .emacs file:
7;;
8;; (require 'stgit)
9;;
10;; To start: `M-x stgit'
11
56d81fe5
DK
12(defun stgit (dir)
13 "Manage stgit patches"
14 (interactive "DDirectory: \n")
52144ce5 15 (switch-to-stgit-buffer (git-get-top-dir dir))
56d81fe5
DK
16 (stgit-refresh))
17
52144ce5
KH
18(defun git-get-top-dir (dir)
19 "Retrieve the top-level directory of a git tree."
20 (let ((cdup (with-output-to-string
21 (with-current-buffer standard-output
22 (cd dir)
23 (unless (eq 0 (call-process "git" nil t nil
24 "rev-parse" "--show-cdup"))
25 (error "cannot find top-level git tree for %s." dir))))))
26 (expand-file-name (concat (file-name-as-directory dir)
27 (car (split-string cdup "\n"))))))
28
56d81fe5
DK
29(defun switch-to-stgit-buffer (dir)
30 "Switch to a (possibly new) buffer displaying StGit patches for DIR"
31 (setq dir (file-name-as-directory dir))
32 (let ((buffers (buffer-list)))
33 (while (and buffers
34 (not (with-current-buffer (car buffers)
35 (and (eq major-mode 'stgit-mode)
36 (string= default-directory dir)))))
37 (setq buffers (cdr buffers)))
38 (switch-to-buffer (if buffers
39 (car buffers)
40 (create-stgit-buffer dir)))))
41
42(defun create-stgit-buffer (dir)
43 "Create a buffer for showing StGit patches.
44Argument DIR is the repository path."
45 (let ((buf (create-file-buffer (concat dir "*stgit*")))
46 (inhibit-read-only t))
47 (with-current-buffer buf
48 (setq default-directory dir)
49 (stgit-mode)
50 (setq buffer-read-only t))
51 buf))
52
53(defmacro stgit-capture-output (name &rest body)
54 "Capture StGit output and show it in a window at the end"
34afb86c
DK
55 `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))
56 (stgit-dir default-directory)
57 (inhibit-read-only t))
56d81fe5 58 (with-current-buffer output-buf
34afb86c
DK
59 (erase-buffer)
60 (setq default-directory stgit-dir)
61 (setq buffer-read-only t))
56d81fe5
DK
62 (let ((standard-output output-buf))
63 ,@body)
34afb86c
DK
64 (with-current-buffer output-buf
65 (set-buffer-modified-p nil)
66 (setq buffer-read-only t)
67 (if (< (point-min) (point-max))
68 (display-buffer output-buf t)))))
56d81fe5
DK
69(put 'stgit-capture-output 'lisp-indent-function 1)
70
71(defun stgit-run (&rest args)
72 (apply 'call-process "stg" nil standard-output nil args))
73
74(defun stgit-refresh ()
75 "Update the contents of the stgit buffer"
76 (interactive)
77 (let ((inhibit-read-only t)
78 (curline (line-number-at-pos))
79 (curpatch (stgit-patch-at-point)))
80 (erase-buffer)
81 (insert "Branch: ")
82 (stgit-run "branch")
2870f8b8 83 (stgit-run "series" "--description")
6df83d42 84 (stgit-rescan)
56d81fe5
DK
85 (if curpatch
86 (stgit-goto-patch curpatch)
87 (goto-line curline))))
88
07f464e0
DK
89(defface stgit-description-face
90 '((((background dark)) (:foreground "tan"))
91 (((background light)) (:foreground "dark red")))
92 "The face used for StGit desriptions")
93
94(defface stgit-top-patch-face
95 '((((background dark)) (:weight bold :foreground "yellow"))
96 (((background light)) (:weight bold :foreground "purple"))
97 (t (:weight bold)))
98 "The face used for the top patch names")
99
100(defface stgit-applied-patch-face
101 '((((background dark)) (:foreground "light yellow"))
102 (((background light)) (:foreground "purple"))
103 (t ()))
104 "The face used for applied patch names")
105
106(defface stgit-unapplied-patch-face
107 '((((background dark)) (:foreground "gray80"))
108 (((background light)) (:foreground "orchid"))
109 (t ()))
110 "The face used for unapplied patch names")
111
6df83d42
DK
112(defun stgit-rescan ()
113 "Rescan the status buffer."
07f464e0 114 (save-excursion
6df83d42
DK
115 (let ((marked ()))
116 (goto-char (point-min))
117 (while (not (eobp))
118 (cond ((looking-at "Branch: \\(.*\\)")
119 (put-text-property (match-beginning 1) (match-end 1)
120 'face 'bold))
8ee1e4b4 121 ((looking-at "\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)")
6df83d42
DK
122 (let ((state (match-string 1))
123 (patchsym (intern (match-string 3))))
124 (put-text-property
125 (match-beginning 3) (match-end 3) 'face
126 (cond ((string= state ">") 'stgit-top-patch-face)
127 ((string= state "+") 'stgit-applied-patch-face)
128 ((string= state "-") 'stgit-unapplied-patch-face)))
129 (put-text-property (match-beginning 4) (match-end 4)
130 'face 'stgit-description-face)
131 (when (memq patchsym stgit-marked-patches)
132 (replace-match "*" nil nil nil 2)
133 (setq marked (cons patchsym marked))))))
134 (forward-line 1))
135 (setq stgit-marked-patches (nreverse marked)))))
07f464e0 136
56d81fe5
DK
137(defvar stgit-mode-hook nil
138 "Run after `stgit-mode' is setup.")
139
140(defvar stgit-mode-map nil
141 "Keymap for StGit major mode.")
142
143(unless stgit-mode-map
144 (setq stgit-mode-map (make-keymap))
145 (suppress-keymap stgit-mode-map)
6df83d42
DK
146 (define-key stgit-mode-map " " 'stgit-mark)
147 (define-key stgit-mode-map "\d" 'stgit-unmark)
0663524d
KH
148 (define-key stgit-mode-map "?" 'stgit-help)
149 (define-key stgit-mode-map "h" 'stgit-help)
9a3bb1f1
DK
150 (define-key stgit-mode-map "p" 'previous-line)
151 (define-key stgit-mode-map "n" 'next-line)
56d81fe5
DK
152 (define-key stgit-mode-map "g" 'stgit-refresh)
153 (define-key stgit-mode-map "r" 'stgit-rename)
0bca35c8 154 (define-key stgit-mode-map "e" 'stgit-edit)
ea0def18 155 (define-key stgit-mode-map "c" 'stgit-coalesce)
64c097a0 156 (define-key stgit-mode-map "N" 'stgit-new)
b4d7f9ae 157 (define-key stgit-mode-map "R" 'stgit-repair)
c4aad9a7
DK
158 (define-key stgit-mode-map "C" 'stgit-commit)
159 (define-key stgit-mode-map "U" 'stgit-uncommit)
56d81fe5 160 (define-key stgit-mode-map ">" 'stgit-push-next)
82a12e6e 161 (define-key stgit-mode-map "<" 'stgit-pop-next)
f9182fca 162 (define-key stgit-mode-map "P" 'stgit-push-or-pop)
c7adf5ef 163 (define-key stgit-mode-map "G" 'stgit-goto)
56d81fe5
DK
164 (define-key stgit-mode-map "=" 'stgit-show))
165
166(defun stgit-mode ()
167 "Major mode for interacting with StGit.
168Commands:
169\\{stgit-mode-map}"
170 (kill-all-local-variables)
171 (buffer-disable-undo)
172 (setq mode-name "StGit"
173 major-mode 'stgit-mode
174 goal-column 2)
175 (use-local-map stgit-mode-map)
176 (set (make-local-variable 'list-buffers-directory) default-directory)
6df83d42 177 (set (make-local-variable 'stgit-marked-patches) nil)
2870f8b8 178 (set-variable 'truncate-lines 't)
56d81fe5
DK
179 (run-hooks 'stgit-mode-hook))
180
6df83d42
DK
181(defun stgit-add-mark (patch)
182 (let ((patchsym (intern patch)))
183 (setq stgit-marked-patches (cons patchsym stgit-marked-patches))))
184
185(defun stgit-remove-mark (patch)
186 (let ((patchsym (intern patch)))
187 (setq stgit-marked-patches (delq patchsym stgit-marked-patches))))
188
189(defun stgit-marked-patches ()
190 "Return the names of the marked patches."
191 (mapcar 'symbol-name stgit-marked-patches))
192
56d81fe5
DK
193(defun stgit-patch-at-point ()
194 "Return the patch name on the current line"
195 (save-excursion
196 (beginning-of-line)
6df83d42 197 (if (looking-at "[>+-][ *]\\([^ ]*\\)")
07f464e0 198 (match-string-no-properties 1)
56d81fe5
DK
199 nil)))
200
201(defun stgit-goto-patch (patch)
202 "Move point to the line containing PATCH"
203 (let ((p (point)))
204 (goto-char (point-min))
6df83d42 205 (if (re-search-forward (concat "^[>+-][ *]" (regexp-quote patch) " ") nil t)
56d81fe5
DK
206 (progn (move-to-column goal-column)
207 t)
208 (goto-char p)
209 nil)))
210
6df83d42
DK
211(defun stgit-mark ()
212 "Mark the patch under point"
213 (interactive)
214 (let ((patch (stgit-patch-at-point)))
215 (stgit-add-mark patch)
216 (stgit-refresh))
217 (next-line))
218
219(defun stgit-unmark ()
220 "Mark the patch on the previous line"
221 (interactive)
222 (forward-line -1)
223 (let ((patch (stgit-patch-at-point)))
224 (stgit-remove-mark patch)
225 (stgit-refresh)))
226
56d81fe5
DK
227(defun stgit-rename (name)
228 "Rename the patch under point"
229 (interactive (list (read-string "Patch name: " (stgit-patch-at-point))))
230 (let ((old-name (stgit-patch-at-point)))
231 (unless old-name
232 (error "No patch on this line"))
233 (stgit-capture-output nil
234 (stgit-run "rename" old-name name))
235 (stgit-refresh)
236 (stgit-goto-patch name)))
237
26201d96
DK
238(defun stgit-repair ()
239 "Run stg repair"
240 (interactive)
241 (stgit-capture-output nil
242 (stgit-run "repair"))
243 (stgit-refresh))
244
c4aad9a7
DK
245(defun stgit-commit ()
246 "Run stg commit."
247 (interactive)
248 (stgit-capture-output nil (stgit-run "commit"))
249 (stgit-refresh))
250
251(defun stgit-uncommit (arg)
252 "Run stg uncommit. Numeric arg determines number of patches to uncommit."
253 (interactive "p")
254 (stgit-capture-output nil (stgit-run "uncommit" "-n" (number-to-string arg)))
255 (stgit-refresh))
256
56d81fe5 257(defun stgit-push-next ()
82a12e6e 258 "Push the first unapplied patch"
56d81fe5 259 (interactive)
82a12e6e
KH
260 (stgit-capture-output nil (stgit-run "push"))
261 (stgit-refresh))
56d81fe5 262
82a12e6e
KH
263(defun stgit-pop-next ()
264 "Pop the topmost applied patch"
56d81fe5 265 (interactive)
82a12e6e
KH
266 (stgit-capture-output nil (stgit-run "pop"))
267 (stgit-refresh))
56d81fe5 268
f9182fca
KH
269(defun stgit-applied-at-point ()
270 "Is the patch on the current line applied?"
271 (save-excursion
272 (beginning-of-line)
273 (looking-at "[>+]")))
274
275(defun stgit-push-or-pop ()
276 "Push or pop the patch on the current line"
277 (interactive)
278 (let ((patch (stgit-patch-at-point))
279 (applied (stgit-applied-at-point)))
280 (stgit-capture-output nil
281 (stgit-run (if applied "pop" "push") patch))
282 (stgit-refresh)))
283
c7adf5ef
KH
284(defun stgit-goto ()
285 "Go to the patch on the current line"
286 (interactive)
287 (let ((patch (stgit-patch-at-point)))
288 (stgit-capture-output nil
289 (stgit-run "goto" patch))
290 (stgit-refresh)))
291
56d81fe5
DK
292(defun stgit-show ()
293 "Show the patch on the current line"
294 (interactive)
295 (stgit-capture-output "*StGit patch*"
296 (stgit-run "show" (stgit-patch-at-point))
297 (with-current-buffer standard-output
298 (goto-char (point-min))
299 (diff-mode))))
0663524d 300
0bca35c8
DK
301(defun stgit-edit ()
302 "Edit the patch on the current line"
303 (interactive)
8ae7dc9d 304 (let ((patch (stgit-patch-at-point))
0780be79 305 (edit-buf (get-buffer-create "*StGit edit*"))
0bca35c8
DK
306 (dir default-directory))
307 (log-edit 'stgit-confirm-edit t nil edit-buf)
308 (set (make-local-variable 'stgit-edit-patch) patch)
309 (setq default-directory dir)
310 (let ((standard-output edit-buf))
311 (stgit-run "edit" "--save-template=-" patch))))
312
313(defun stgit-confirm-edit ()
314 (interactive)
315 (let ((file (make-temp-file "stgit-edit-")))
316 (write-region (point-min) (point-max) file)
317 (stgit-capture-output nil
318 (stgit-run "edit" "-f" file stgit-edit-patch))
319 (with-current-buffer log-edit-parent-buffer
320 (stgit-refresh))))
321
64c097a0
DK
322(defun stgit-new ()
323 "Create a new patch"
324 (interactive)
0780be79 325 (let ((edit-buf (get-buffer-create "*StGit edit*")))
64c097a0
DK
326 (log-edit 'stgit-confirm-new t nil edit-buf)))
327
328(defun stgit-confirm-new ()
329 (interactive)
27b0f9e4 330 (let ((file (make-temp-file "stgit-edit-")))
64c097a0
DK
331 (write-region (point-min) (point-max) file)
332 (stgit-capture-output nil
27b0f9e4 333 (stgit-run "new" "-f" file))
64c097a0
DK
334 (with-current-buffer log-edit-parent-buffer
335 (stgit-refresh))))
336
337(defun stgit-create-patch-name (description)
338 "Create a patch name from a long description"
339 (let ((patch ""))
340 (while (> (length description) 0)
341 (cond ((string-match "\\`[a-zA-Z_-]+" description)
342 (setq patch (downcase (concat patch (match-string 0 description))))
343 (setq description (substring description (match-end 0))))
344 ((string-match "\\` +" description)
345 (setq patch (concat patch "-"))
346 (setq description (substring description (match-end 0))))
347 ((string-match "\\`[^a-zA-Z_-]+" description)
348 (setq description (substring description (match-end 0))))))
349 (cond ((= (length patch) 0)
350 "patch")
351 ((> (length patch) 20)
352 (substring patch 0 20))
353 (t patch))))
0bca35c8 354
ea0def18
DK
355(defun stgit-coalesce (patch-names)
356 "Run stg coalesce on the named patches"
357 (interactive (list (stgit-marked-patches)))
0780be79 358 (let ((edit-buf (get-buffer-create "*StGit edit*"))
ea0def18
DK
359 (dir default-directory))
360 (log-edit 'stgit-confirm-coalesce t nil edit-buf)
361 (set (make-local-variable 'stgit-patches) patch-names)
362 (setq default-directory dir)
363 (let ((standard-output edit-buf))
364 (apply 'stgit-run "coalesce" "--save-template=-" patch-names))))
365
366(defun stgit-confirm-coalesce ()
367 (interactive)
368 (let ((file (make-temp-file "stgit-edit-")))
369 (write-region (point-min) (point-max) file)
370 (stgit-capture-output nil
371 (apply 'stgit-run "coalesce" "-f" file stgit-patches))
372 (with-current-buffer log-edit-parent-buffer
373 (stgit-refresh))))
374
0663524d
KH
375(defun stgit-help ()
376 "Display help for the StGit mode."
377 (interactive)
378 (describe-function 'stgit-mode))
3a59f3db
KH
379
380(provide 'stgit)