Commit | Line | Data |
---|---|---|
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 | ||
0f076fe6 GH |
12 | (require 'git nil t) |
13 | ||
56d81fe5 | 14 | (defun stgit (dir) |
a53347d9 | 15 | "Manage StGit patches for the tree in DIR." |
56d81fe5 | 16 | (interactive "DDirectory: \n") |
52144ce5 | 17 | (switch-to-stgit-buffer (git-get-top-dir dir)) |
1f0bf00f | 18 | (stgit-reload)) |
56d81fe5 | 19 | |
074a4fb0 GH |
20 | (unless (fboundp 'git-get-top-dir) |
21 | (defun git-get-top-dir (dir) | |
22 | "Retrieve the top-level directory of a git tree." | |
23 | (let ((cdup (with-output-to-string | |
24 | (with-current-buffer standard-output | |
25 | (cd dir) | |
26 | (unless (eq 0 (call-process "git" nil t nil | |
27 | "rev-parse" "--show-cdup")) | |
df283a8b | 28 | (error "Cannot find top-level git tree for %s" dir)))))) |
074a4fb0 GH |
29 | (expand-file-name (concat (file-name-as-directory dir) |
30 | (car (split-string cdup "\n"))))))) | |
31 | ||
32 | (defun stgit-refresh-git-status (&optional dir) | |
33 | "If it exists, refresh the `git-status' buffer belonging to | |
34 | directory DIR or `default-directory'" | |
35 | (when (and (fboundp 'git-find-status-buffer) | |
36 | (fboundp 'git-refresh-status)) | |
37 | (let* ((top-dir (git-get-top-dir (or dir default-directory))) | |
38 | (git-status-buffer (and top-dir (git-find-status-buffer top-dir)))) | |
39 | (when git-status-buffer | |
40 | (with-current-buffer git-status-buffer | |
41 | (git-refresh-status)))))) | |
52144ce5 | 42 | |
56d81fe5 | 43 | (defun switch-to-stgit-buffer (dir) |
a53347d9 | 44 | "Switch to a (possibly new) buffer displaying StGit patches for DIR." |
56d81fe5 DK |
45 | (setq dir (file-name-as-directory dir)) |
46 | (let ((buffers (buffer-list))) | |
47 | (while (and buffers | |
48 | (not (with-current-buffer (car buffers) | |
49 | (and (eq major-mode 'stgit-mode) | |
50 | (string= default-directory dir))))) | |
51 | (setq buffers (cdr buffers))) | |
52 | (switch-to-buffer (if buffers | |
53 | (car buffers) | |
54 | (create-stgit-buffer dir))))) | |
55 | ||
56 | (defun create-stgit-buffer (dir) | |
57 | "Create a buffer for showing StGit patches. | |
58 | Argument DIR is the repository path." | |
59 | (let ((buf (create-file-buffer (concat dir "*stgit*"))) | |
60 | (inhibit-read-only t)) | |
61 | (with-current-buffer buf | |
62 | (setq default-directory dir) | |
63 | (stgit-mode) | |
64 | (setq buffer-read-only t)) | |
65 | buf)) | |
66 | ||
67 | (defmacro stgit-capture-output (name &rest body) | |
a53347d9 | 68 | "Capture StGit output and show it in a window at the end." |
34afb86c DK |
69 | `(let ((output-buf (get-buffer-create ,(or name "*StGit output*"))) |
70 | (stgit-dir default-directory) | |
71 | (inhibit-read-only t)) | |
56d81fe5 | 72 | (with-current-buffer output-buf |
34afb86c DK |
73 | (erase-buffer) |
74 | (setq default-directory stgit-dir) | |
75 | (setq buffer-read-only t)) | |
56d81fe5 DK |
76 | (let ((standard-output output-buf)) |
77 | ,@body) | |
34afb86c DK |
78 | (with-current-buffer output-buf |
79 | (set-buffer-modified-p nil) | |
80 | (setq buffer-read-only t) | |
81 | (if (< (point-min) (point-max)) | |
82 | (display-buffer output-buf t))))) | |
56d81fe5 DK |
83 | (put 'stgit-capture-output 'lisp-indent-function 1) |
84 | ||
d51722b7 GH |
85 | (defun stgit-make-run-args (args) |
86 | "Return a copy of ARGS with its elements converted to strings." | |
87 | (mapcar (lambda (x) | |
88 | ;; don't use (format "%s" ...) to limit type errors | |
89 | (cond ((stringp x) x) | |
90 | ((integerp x) (number-to-string x)) | |
91 | ((symbolp x) (symbol-name x)) | |
92 | (t | |
93 | (error "Bad element in stgit-make-run-args args: %S" x)))) | |
94 | args)) | |
95 | ||
9aecd505 | 96 | (defun stgit-run-silent (&rest args) |
d51722b7 | 97 | (setq args (stgit-make-run-args args)) |
56d81fe5 DK |
98 | (apply 'call-process "stg" nil standard-output nil args)) |
99 | ||
9aecd505 | 100 | (defun stgit-run (&rest args) |
d51722b7 | 101 | (setq args (stgit-make-run-args args)) |
9aecd505 DK |
102 | (let ((msgcmd (mapconcat #'identity args " "))) |
103 | (message "Running stg %s..." msgcmd) | |
104 | (apply 'call-process "stg" nil standard-output nil args) | |
105 | (message "Running stg %s...done" msgcmd))) | |
106 | ||
378a003d | 107 | (defun stgit-run-git (&rest args) |
d51722b7 | 108 | (setq args (stgit-make-run-args args)) |
378a003d GH |
109 | (let ((msgcmd (mapconcat #'identity args " "))) |
110 | (message "Running git %s..." msgcmd) | |
111 | (apply 'call-process "git" nil standard-output nil args) | |
112 | (message "Running git %s...done" msgcmd))) | |
113 | ||
1f60181a | 114 | (defun stgit-run-git-silent (&rest args) |
d51722b7 | 115 | (setq args (stgit-make-run-args args)) |
1f60181a GH |
116 | (apply 'call-process "git" nil standard-output nil args)) |
117 | ||
1f0bf00f | 118 | (defun stgit-reload () |
a53347d9 | 119 | "Update the contents of the StGit buffer." |
56d81fe5 DK |
120 | (interactive) |
121 | (let ((inhibit-read-only t) | |
122 | (curline (line-number-at-pos)) | |
123 | (curpatch (stgit-patch-at-point))) | |
124 | (erase-buffer) | |
125 | (insert "Branch: ") | |
9aecd505 | 126 | (stgit-run-silent "branch") |
bce79a6a | 127 | (stgit-run-silent "series" "--description" "--empty") |
6df83d42 | 128 | (stgit-rescan) |
56d81fe5 DK |
129 | (if curpatch |
130 | (stgit-goto-patch curpatch) | |
074a4fb0 GH |
131 | (goto-line curline))) |
132 | (stgit-refresh-git-status)) | |
56d81fe5 | 133 | |
8f40753a GH |
134 | (defgroup stgit nil |
135 | "A user interface for the StGit patch maintenance tool." | |
136 | :group 'tools) | |
137 | ||
07f464e0 DK |
138 | (defface stgit-description-face |
139 | '((((background dark)) (:foreground "tan")) | |
140 | (((background light)) (:foreground "dark red"))) | |
8f40753a GH |
141 | "The face used for StGit descriptions" |
142 | :group 'stgit) | |
07f464e0 DK |
143 | |
144 | (defface stgit-top-patch-face | |
145 | '((((background dark)) (:weight bold :foreground "yellow")) | |
146 | (((background light)) (:weight bold :foreground "purple")) | |
147 | (t (:weight bold))) | |
8f40753a GH |
148 | "The face used for the top patch names" |
149 | :group 'stgit) | |
07f464e0 DK |
150 | |
151 | (defface stgit-applied-patch-face | |
152 | '((((background dark)) (:foreground "light yellow")) | |
153 | (((background light)) (:foreground "purple")) | |
154 | (t ())) | |
8f40753a GH |
155 | "The face used for applied patch names" |
156 | :group 'stgit) | |
07f464e0 DK |
157 | |
158 | (defface stgit-unapplied-patch-face | |
159 | '((((background dark)) (:foreground "gray80")) | |
160 | (((background light)) (:foreground "orchid")) | |
161 | (t ())) | |
8f40753a GH |
162 | "The face used for unapplied patch names" |
163 | :group 'stgit) | |
07f464e0 | 164 | |
1f60181a GH |
165 | (defface stgit-modified-file-face |
166 | '((((class color) (background light)) (:foreground "purple")) | |
167 | (((class color) (background dark)) (:foreground "salmon"))) | |
168 | "StGit mode face used for modified file status" | |
169 | :group 'stgit) | |
170 | ||
171 | (defface stgit-unmerged-file-face | |
172 | '((((class color) (background light)) (:foreground "red" :bold t)) | |
173 | (((class color) (background dark)) (:foreground "red" :bold t))) | |
174 | "StGit mode face used for unmerged file status" | |
175 | :group 'stgit) | |
176 | ||
177 | (defface stgit-unknown-file-face | |
178 | '((((class color) (background light)) (:foreground "goldenrod" :bold t)) | |
179 | (((class color) (background dark)) (:foreground "goldenrod" :bold t))) | |
180 | "StGit mode face used for unknown file status" | |
181 | :group 'stgit) | |
182 | ||
a6d9a852 GH |
183 | (defface stgit-file-permission-face |
184 | '((((class color) (background light)) (:foreground "green" :bold t)) | |
185 | (((class color) (background dark)) (:foreground "green" :bold t))) | |
186 | "StGit mode face used for permission changes." | |
187 | :group 'stgit) | |
188 | ||
1f60181a GH |
189 | (defcustom stgit-expand-find-copies-harder |
190 | nil | |
191 | "Try harder to find copied files when listing patches. | |
192 | ||
193 | When not nil, runs git diff-tree with the --find-copies-harder | |
194 | flag, which reduces performance." | |
195 | :type 'boolean | |
196 | :group 'stgit) | |
197 | ||
198 | (defconst stgit-file-status-code-strings | |
199 | (mapcar (lambda (arg) | |
200 | (cons (car arg) | |
a6d9a852 GH |
201 | (propertize (cadr arg) 'face (car (cddr arg))))) |
202 | '((add "Added" stgit-modified-file-face) | |
203 | (copy "Copied" stgit-modified-file-face) | |
204 | (delete "Deleted" stgit-modified-file-face) | |
205 | (modify "Modified" stgit-modified-file-face) | |
206 | (rename "Renamed" stgit-modified-file-face) | |
207 | (mode-change "Mode change" stgit-modified-file-face) | |
208 | (unmerged "Unmerged" stgit-unmerged-file-face) | |
209 | (unknown "Unknown" stgit-unknown-file-face))) | |
1f60181a GH |
210 | "Alist of code symbols to description strings") |
211 | ||
212 | (defun stgit-file-status-code-as-string (code) | |
213 | "Return stgit status code as string" | |
a6d9a852 GH |
214 | (let ((str (assq (if (consp code) (car code) code) |
215 | stgit-file-status-code-strings))) | |
216 | (when str | |
217 | (format "%-11s " | |
218 | (if (and str (consp code) (/= (cdr code) 100)) | |
219 | (format "%s %s" (cdr str) | |
220 | (propertize (format "%d%%" (cdr code)) | |
221 | 'face 'stgit-description-face)) | |
222 | (cdr str)))))) | |
1f60181a | 223 | |
a6d9a852 | 224 | (defun stgit-file-status-code (str &optional score) |
1f60181a GH |
225 | "Return stgit status code from git status string" |
226 | (let ((code (assoc str '(("A" . add) | |
227 | ("C" . copy) | |
228 | ("D" . delete) | |
229 | ("M" . modify) | |
230 | ("R" . rename) | |
231 | ("T" . mode-change) | |
232 | ("U" . unmerged) | |
233 | ("X" . unknown))))) | |
a6d9a852 GH |
234 | (setq code (if code (cdr code) 'unknown)) |
235 | (when (stringp score) | |
236 | (if (> (length score) 0) | |
237 | (setq score (string-to-number score)) | |
238 | (setq score nil))) | |
239 | (if score (cons code score) code))) | |
240 | ||
241 | (defconst stgit-file-type-strings | |
242 | '((#o100 . "file") | |
243 | (#o120 . "symlink") | |
244 | (#o160 . "subproject")) | |
245 | "Alist of names of file types") | |
246 | ||
247 | (defun stgit-file-type-string (type) | |
47271f41 GH |
248 | "Return string describing file type TYPE (the high bits of file permission). |
249 | Cf. `stgit-file-type-strings' and `stgit-file-type-change-string'." | |
a6d9a852 GH |
250 | (let ((type-str (assoc type stgit-file-type-strings))) |
251 | (or (and type-str (cdr type-str)) | |
252 | (format "unknown type %o" type)))) | |
253 | ||
254 | (defun stgit-file-type-change-string (old-perm new-perm) | |
47271f41 GH |
255 | "Return string describing file type change from OLD-PERM to NEW-PERM. |
256 | Cf. `stgit-file-type-string'." | |
a6d9a852 GH |
257 | (let ((old-type (lsh old-perm -9)) |
258 | (new-type (lsh new-perm -9))) | |
259 | (cond ((= old-type new-type) "") | |
260 | ((zerop new-type) "") | |
261 | ((zerop old-type) | |
262 | (if (= new-type #o100) | |
263 | "" | |
264 | (format " (%s)" (stgit-file-type-string new-type)))) | |
265 | (t (format " (%s -> %s)" | |
266 | (stgit-file-type-string old-type) | |
267 | (stgit-file-type-string new-type)))))) | |
268 | ||
269 | (defun stgit-file-mode-change-string (old-perm new-perm) | |
47271f41 GH |
270 | "Return string describing file mode change from OLD-PERM to NEW-PERM. |
271 | Cf. `stgit-file-type-change-string'." | |
a6d9a852 GH |
272 | (setq old-perm (logand old-perm #o777) |
273 | new-perm (logand new-perm #o777)) | |
274 | (if (or (= old-perm new-perm) | |
275 | (zerop old-perm) | |
276 | (zerop new-perm)) | |
277 | "" | |
278 | (let* ((modified (logxor old-perm new-perm)) | |
279 | (not-x-modified (logand (logxor old-perm new-perm) #o666))) | |
280 | (cond ((zerop modified) "") | |
281 | ((and (zerop not-x-modified) | |
282 | (or (and (eq #o111 (logand old-perm #o111)) | |
283 | (propertize "-x" 'face 'stgit-file-permission-face)) | |
284 | (and (eq #o111 (logand new-perm #o111)) | |
285 | (propertize "+x" 'face | |
286 | 'stgit-file-permission-face))))) | |
287 | (t (concat (propertize (format "%o" old-perm) | |
288 | 'face 'stgit-file-permission-face) | |
289 | (propertize " -> " | |
290 | 'face 'stgit-description-face) | |
291 | (propertize (format "%o" new-perm) | |
292 | 'face 'stgit-file-permission-face))))))) | |
1f60181a | 293 | |
378a003d | 294 | (defun stgit-expand-patch (patchsym) |
47271f41 GH |
295 | "Expand (show modification of) the patch with name PATCHSYM (a |
296 | symbol) at point. | |
297 | `stgit-expand-find-copies-harder' controls how hard to try to | |
298 | find copied files." | |
378a003d GH |
299 | (save-excursion |
300 | (forward-line) | |
1f60181a GH |
301 | (let* ((start (point)) |
302 | (result (with-output-to-string | |
303 | (stgit-run-git "diff-tree" "-r" "-z" | |
304 | (if stgit-expand-find-copies-harder | |
305 | "--find-copies-harder" | |
306 | "-C") | |
d51722b7 | 307 | (stgit-id patchsym))))) |
1f60181a | 308 | (let (mstart) |
a6d9a852 | 309 | (while (string-match "\0:\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} \\(\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\\|\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\\)" |
1f60181a | 310 | result mstart) |
a6d9a852 GH |
311 | (let ((copy-or-rename (match-string 4 result)) |
312 | (old-perm (read (format "#o%s" (match-string 1 result)))) | |
313 | (new-perm (read (format "#o%s" (match-string 2 result)))) | |
1f60181a | 314 | (line-start (point)) |
a6d9a852 GH |
315 | status |
316 | change | |
1f60181a GH |
317 | properties) |
318 | (insert " ") | |
319 | (if copy-or-rename | |
a6d9a852 GH |
320 | (let ((cr-score (match-string 5 result)) |
321 | (cr-from-file (match-string 6 result)) | |
322 | (cr-to-file (match-string 7 result))) | |
323 | (setq status (stgit-file-status-code copy-or-rename | |
324 | cr-score) | |
325 | properties (list 'stgit-old-file cr-from-file | |
326 | 'stgit-new-file cr-to-file) | |
327 | change (concat | |
328 | cr-from-file | |
329 | (propertize " -> " | |
330 | 'face 'stgit-description-face) | |
331 | cr-to-file))) | |
332 | (setq status (stgit-file-status-code (match-string 8 result)) | |
333 | properties (list 'stgit-file (match-string 9 result)) | |
334 | change (match-string 9 result))) | |
335 | ||
336 | (let ((mode-change (stgit-file-mode-change-string old-perm | |
337 | new-perm))) | |
338 | (insert (format "%-12s" (stgit-file-status-code-as-string | |
339 | status)) | |
340 | mode-change | |
341 | (if (> (length mode-change) 0) " " "") | |
342 | change | |
343 | (propertize (stgit-file-type-change-string old-perm | |
344 | new-perm) | |
345 | 'face 'stgit-description-face) | |
346 | ?\n)) | |
1f60181a GH |
347 | (add-text-properties line-start (point) properties)) |
348 | (setq mstart (match-end 0)))) | |
349 | (when (= start (point)) | |
350 | (insert " <no files>\n")) | |
d51722b7 | 351 | (put-text-property start (point) 'stgit-file-patchsym patchsym)))) |
378a003d | 352 | |
6df83d42 DK |
353 | (defun stgit-rescan () |
354 | "Rescan the status buffer." | |
07f464e0 | 355 | (save-excursion |
3a1cf814 GH |
356 | (let ((marked ()) |
357 | found-any) | |
6df83d42 DK |
358 | (goto-char (point-min)) |
359 | (while (not (eobp)) | |
360 | (cond ((looking-at "Branch: \\(.*\\)") | |
361 | (put-text-property (match-beginning 1) (match-end 1) | |
362 | 'face 'bold)) | |
bce79a6a | 363 | ((looking-at "\\([0 ]\\)\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)") |
3a1cf814 | 364 | (setq found-any t) |
bce79a6a GH |
365 | (let ((empty (match-string 1)) |
366 | (state (match-string 2)) | |
367 | (patchsym (intern (match-string 4)))) | |
6df83d42 | 368 | (put-text-property |
bce79a6a | 369 | (match-beginning 4) (match-end 4) 'face |
6df83d42 DK |
370 | (cond ((string= state ">") 'stgit-top-patch-face) |
371 | ((string= state "+") 'stgit-applied-patch-face) | |
372 | ((string= state "-") 'stgit-unapplied-patch-face))) | |
bce79a6a | 373 | (put-text-property (match-beginning 5) (match-end 5) |
6df83d42 DK |
374 | 'face 'stgit-description-face) |
375 | (when (memq patchsym stgit-marked-patches) | |
bce79a6a GH |
376 | (save-excursion |
377 | (replace-match "*" nil nil nil 3)) | |
378a003d | 378 | (setq marked (cons patchsym marked))) |
d51722b7 GH |
379 | (put-text-property (match-beginning 0) (match-end 0) |
380 | 'stgit-patchsym patchsym) | |
378a003d GH |
381 | (when (memq patchsym stgit-expanded-patches) |
382 | (stgit-expand-patch patchsym)) | |
bce79a6a GH |
383 | (when (equal "0" empty) |
384 | (save-excursion | |
385 | (goto-char (match-beginning 5)) | |
386 | (insert "(empty) "))) | |
387 | (delete-char 1) | |
378a003d | 388 | )) |
ad80ce22 DK |
389 | ((or (looking-at "stg series: Branch \".*\" not initialised") |
390 | (looking-at "stg series: .*: branch not initialized")) | |
3a1cf814 | 391 | (setq found-any t) |
1c2426dc DK |
392 | (forward-line 1) |
393 | (insert "Run M-x stgit-init to initialise"))) | |
6df83d42 | 394 | (forward-line 1)) |
3a1cf814 GH |
395 | (setq stgit-marked-patches (nreverse marked)) |
396 | (unless found-any | |
397 | (insert "\n " | |
398 | (propertize "no patches in series" | |
399 | 'face 'stgit-description-face)))))) | |
07f464e0 | 400 | |
378a003d GH |
401 | (defun stgit-select () |
402 | "Expand or collapse the current entry" | |
403 | (interactive) | |
404 | (let ((curpatch (stgit-patch-at-point))) | |
405 | (if (not curpatch) | |
406 | (let ((patched-file (stgit-patched-file-at-point))) | |
407 | (unless patched-file | |
408 | (error "No patch or file on the current line")) | |
409 | (let ((filename (expand-file-name (cdr patched-file)))) | |
410 | (unless (file-exists-p filename) | |
411 | (error "File does not exist")) | |
412 | (find-file filename))) | |
378a003d GH |
413 | (setq stgit-expanded-patches |
414 | (if (memq curpatch stgit-expanded-patches) | |
415 | (delq curpatch stgit-expanded-patches) | |
416 | (cons curpatch stgit-expanded-patches))) | |
417 | (stgit-reload)))) | |
418 | ||
419 | (defun stgit-find-file-other-window () | |
420 | "Open file at point in other window" | |
421 | (interactive) | |
422 | (let ((patched-file (stgit-patched-file-at-point))) | |
423 | (unless patched-file | |
424 | (error "No file on the current line")) | |
425 | (let ((filename (expand-file-name (cdr patched-file)))) | |
426 | (unless (file-exists-p filename) | |
427 | (error "File does not exist")) | |
428 | (find-file-other-window filename)))) | |
429 | ||
83327d53 | 430 | (defun stgit-quit () |
a53347d9 | 431 | "Hide the stgit buffer." |
83327d53 GH |
432 | (interactive) |
433 | (bury-buffer)) | |
434 | ||
0f076fe6 | 435 | (defun stgit-git-status () |
a53347d9 | 436 | "Show status using `git-status'." |
0f076fe6 GH |
437 | (interactive) |
438 | (unless (fboundp 'git-status) | |
df283a8b | 439 | (error "The stgit-git-status command requires git-status")) |
0f076fe6 GH |
440 | (let ((dir default-directory)) |
441 | (save-selected-window | |
442 | (pop-to-buffer nil) | |
443 | (git-status dir)))) | |
444 | ||
378a003d GH |
445 | (defun stgit-next-line (&optional arg try-vscroll) |
446 | "Move cursor vertically down ARG lines" | |
447 | (interactive "p\np") | |
448 | (next-line arg try-vscroll) | |
449 | (when (looking-at " \\S-") | |
450 | (forward-char 2))) | |
451 | ||
452 | (defun stgit-previous-line (&optional arg try-vscroll) | |
453 | "Move cursor vertically up ARG lines" | |
454 | (interactive "p\np") | |
455 | (previous-line arg try-vscroll) | |
456 | (when (looking-at " \\S-") | |
457 | (forward-char 2))) | |
458 | ||
459 | (defun stgit-next-patch (&optional arg) | |
460 | "Move cursor down ARG patches" | |
461 | (interactive "p") | |
462 | (unless arg | |
463 | (setq arg 1)) | |
464 | (if (< arg 0) | |
465 | (stgit-previous-patch (- arg)) | |
466 | (while (not (zerop arg)) | |
467 | (setq arg (1- arg)) | |
468 | (while (progn (stgit-next-line) | |
469 | (not (stgit-patch-at-point))))))) | |
470 | ||
471 | (defun stgit-previous-patch (&optional arg) | |
472 | "Move cursor up ARG patches" | |
473 | (interactive "p") | |
474 | (unless arg | |
475 | (setq arg 1)) | |
476 | (if (< arg 0) | |
477 | (stgit-next-patch (- arg)) | |
478 | (while (not (zerop arg)) | |
479 | (setq arg (1- arg)) | |
480 | (while (progn (stgit-previous-line) | |
481 | (not (stgit-patch-at-point))))))) | |
482 | ||
56d81fe5 DK |
483 | (defvar stgit-mode-hook nil |
484 | "Run after `stgit-mode' is setup.") | |
485 | ||
486 | (defvar stgit-mode-map nil | |
487 | "Keymap for StGit major mode.") | |
488 | ||
489 | (unless stgit-mode-map | |
490 | (setq stgit-mode-map (make-keymap)) | |
491 | (suppress-keymap stgit-mode-map) | |
022a3664 GH |
492 | (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg))) |
493 | '((" " . stgit-mark) | |
3dccdc9b | 494 | ("m" . stgit-mark) |
9b151b27 GH |
495 | ("\d" . stgit-unmark-up) |
496 | ("u" . stgit-unmark-down) | |
022a3664 GH |
497 | ("?" . stgit-help) |
498 | ("h" . stgit-help) | |
378a003d GH |
499 | ("p" . stgit-previous-line) |
500 | ("n" . stgit-next-line) | |
501 | ("\C-p" . stgit-previous-patch) | |
502 | ("\C-n" . stgit-next-patch) | |
503 | ("\M-{" . stgit-previous-patch) | |
504 | ("\M-}" . stgit-next-patch) | |
0f076fe6 | 505 | ("s" . stgit-git-status) |
022a3664 GH |
506 | ("g" . stgit-reload) |
507 | ("r" . stgit-refresh) | |
508 | ("\C-c\C-r" . stgit-rename) | |
509 | ("e" . stgit-edit) | |
510 | ("c" . stgit-coalesce) | |
511 | ("N" . stgit-new) | |
512 | ("R" . stgit-repair) | |
513 | ("C" . stgit-commit) | |
514 | ("U" . stgit-uncommit) | |
378a003d GH |
515 | ("\r" . stgit-select) |
516 | ("o" . stgit-find-file-other-window) | |
022a3664 GH |
517 | (">" . stgit-push-next) |
518 | ("<" . stgit-pop-next) | |
519 | ("P" . stgit-push-or-pop) | |
520 | ("G" . stgit-goto) | |
521 | ("=" . stgit-show) | |
522 | ("D" . stgit-delete) | |
523 | ([(control ?/)] . stgit-undo) | |
83327d53 GH |
524 | ("\C-_" . stgit-undo) |
525 | ("q" . stgit-quit)))) | |
56d81fe5 DK |
526 | |
527 | (defun stgit-mode () | |
528 | "Major mode for interacting with StGit. | |
529 | Commands: | |
530 | \\{stgit-mode-map}" | |
531 | (kill-all-local-variables) | |
532 | (buffer-disable-undo) | |
533 | (setq mode-name "StGit" | |
534 | major-mode 'stgit-mode | |
535 | goal-column 2) | |
536 | (use-local-map stgit-mode-map) | |
537 | (set (make-local-variable 'list-buffers-directory) default-directory) | |
6df83d42 | 538 | (set (make-local-variable 'stgit-marked-patches) nil) |
378a003d | 539 | (set (make-local-variable 'stgit-expanded-patches) nil) |
2870f8b8 | 540 | (set-variable 'truncate-lines 't) |
56d81fe5 DK |
541 | (run-hooks 'stgit-mode-hook)) |
542 | ||
d51722b7 GH |
543 | (defun stgit-add-mark (patchsym) |
544 | "Mark the patch PATCHSYM." | |
545 | (setq stgit-marked-patches (cons patchsym stgit-marked-patches))) | |
6df83d42 | 546 | |
d51722b7 GH |
547 | (defun stgit-remove-mark (patchsym) |
548 | "Unmark the patch PATCHSYM." | |
549 | (setq stgit-marked-patches (delq patchsym stgit-marked-patches))) | |
6df83d42 | 550 | |
e6b1fdae | 551 | (defun stgit-clear-marks () |
47271f41 | 552 | "Unmark all patches." |
e6b1fdae DK |
553 | (setq stgit-marked-patches '())) |
554 | ||
378a003d | 555 | (defun stgit-patch-at-point (&optional cause-error allow-file) |
d51722b7 | 556 | "Return the patch name on the current line as a symbol. |
378a003d GH |
557 | If CAUSE-ERROR is not nil, signal an error if none found. |
558 | If ALLOW-FILE is not nil, also handle when point is on a file of | |
559 | a patch." | |
d51722b7 GH |
560 | (or (get-text-property (point) 'stgit-patchsym) |
561 | (and allow-file | |
562 | (get-text-property (point) 'stgit-file-patchsym)) | |
563 | (when cause-error | |
564 | (error "No patch on this line")))) | |
378a003d | 565 | |
1f60181a GH |
566 | (defun stgit-patched-file-at-point (&optional both-files) |
567 | "Returns a cons of the patchsym and file name at point. For | |
568 | copies and renames, return the new file if the patch is either | |
569 | applied. If BOTH-FILES is non-nil, return a cons of the old and | |
570 | the new file names instead of just one name." | |
d51722b7 | 571 | (let ((patchsym (get-text-property (point) 'stgit-file-patchsym)) |
1f60181a GH |
572 | (file (get-text-property (point) 'stgit-file))) |
573 | (cond ((not patchsym) nil) | |
574 | (file (cons patchsym file)) | |
575 | (both-files | |
576 | (cons patchsym (cons (get-text-property (point) 'stgit-old-file) | |
577 | (get-text-property (point) 'stgit-new-file)))) | |
578 | (t | |
579 | (let ((file-sym (save-excursion | |
580 | (stgit-previous-patch) | |
d51722b7 GH |
581 | (unless (eq (stgit-patch-at-point) |
582 | patchsym) | |
1f60181a GH |
583 | (error "Cannot find the %s patch" patchsym)) |
584 | (beginning-of-line) | |
585 | (if (= (char-after) ?-) | |
586 | 'stgit-old-file | |
587 | 'stgit-new-file)))) | |
588 | (cons patchsym (get-text-property (point) file-sym))))))) | |
56d81fe5 | 589 | |
7755d7f1 | 590 | (defun stgit-patches-marked-or-at-point () |
d51722b7 | 591 | "Return the symbols of the marked patches, or the patch on the current line." |
7755d7f1 | 592 | (if stgit-marked-patches |
d51722b7 | 593 | stgit-marked-patches |
7755d7f1 KH |
594 | (let ((patch (stgit-patch-at-point))) |
595 | (if patch | |
596 | (list patch) | |
597 | '())))) | |
598 | ||
d51722b7 GH |
599 | (defun stgit-goto-patch (patchsym) |
600 | "Move point to the line containing patch PATCHSYM. | |
601 | If that patch cannot be found, return nil." | |
602 | (let ((p (text-property-any (point-min) (point-max) | |
603 | 'stgit-patchsym patchsym))) | |
604 | (when p | |
56d81fe5 | 605 | (goto-char p) |
d51722b7 | 606 | (move-to-column goal-column)))) |
56d81fe5 | 607 | |
1c2426dc | 608 | (defun stgit-init () |
a53347d9 | 609 | "Run stg init." |
1c2426dc DK |
610 | (interactive) |
611 | (stgit-capture-output nil | |
b0424080 | 612 | (stgit-run "init")) |
1f0bf00f | 613 | (stgit-reload)) |
1c2426dc | 614 | |
6df83d42 | 615 | (defun stgit-mark () |
a53347d9 | 616 | "Mark the patch under point." |
6df83d42 | 617 | (interactive) |
018fa1ac | 618 | (let ((patch (stgit-patch-at-point t))) |
6df83d42 | 619 | (stgit-add-mark patch) |
1f0bf00f | 620 | (stgit-reload)) |
378a003d | 621 | (stgit-next-patch)) |
6df83d42 | 622 | |
9b151b27 | 623 | (defun stgit-unmark-up () |
a53347d9 | 624 | "Remove mark from the patch on the previous line." |
6df83d42 | 625 | (interactive) |
378a003d | 626 | (stgit-previous-patch) |
018fa1ac | 627 | (stgit-remove-mark (stgit-patch-at-point t)) |
9b151b27 GH |
628 | (stgit-reload)) |
629 | ||
630 | (defun stgit-unmark-down () | |
a53347d9 | 631 | "Remove mark from the patch on the current line." |
9b151b27 | 632 | (interactive) |
018fa1ac | 633 | (stgit-remove-mark (stgit-patch-at-point t)) |
1288eda2 GH |
634 | (stgit-reload) |
635 | (stgit-next-patch)) | |
6df83d42 | 636 | |
56d81fe5 | 637 | (defun stgit-rename (name) |
018fa1ac | 638 | "Rename the patch under point to NAME." |
d51722b7 GH |
639 | (interactive (list (read-string "Patch name: " |
640 | (symbol-name (stgit-patch-at-point t))))) | |
641 | (let ((old-patchsym (stgit-patch-at-point t))) | |
56d81fe5 | 642 | (stgit-capture-output nil |
d51722b7 GH |
643 | (stgit-run "rename" old-patchsym name)) |
644 | (let ((name-sym (intern name))) | |
645 | (when (memq old-patchsym stgit-expanded-patches) | |
378a003d | 646 | (setq stgit-expanded-patches |
d51722b7 GH |
647 | (cons name-sym (delq old-patchsym stgit-expanded-patches)))) |
648 | (when (memq old-patchsym stgit-marked-patches) | |
378a003d | 649 | (setq stgit-marked-patches |
d51722b7 GH |
650 | (cons name-sym (delq old-patchsym stgit-marked-patches)))) |
651 | (stgit-reload) | |
652 | (stgit-goto-patch name-sym)))) | |
56d81fe5 | 653 | |
26201d96 | 654 | (defun stgit-repair () |
a53347d9 | 655 | "Run stg repair." |
26201d96 DK |
656 | (interactive) |
657 | (stgit-capture-output nil | |
b0424080 | 658 | (stgit-run "repair")) |
1f0bf00f | 659 | (stgit-reload)) |
26201d96 | 660 | |
c4aad9a7 DK |
661 | (defun stgit-commit () |
662 | "Run stg commit." | |
663 | (interactive) | |
664 | (stgit-capture-output nil (stgit-run "commit")) | |
1f0bf00f | 665 | (stgit-reload)) |
c4aad9a7 DK |
666 | |
667 | (defun stgit-uncommit (arg) | |
668 | "Run stg uncommit. Numeric arg determines number of patches to uncommit." | |
669 | (interactive "p") | |
d51722b7 | 670 | (stgit-capture-output nil (stgit-run "uncommit" "-n" arg)) |
1f0bf00f | 671 | (stgit-reload)) |
c4aad9a7 | 672 | |
0b661144 DK |
673 | (defun stgit-push-next (npatches) |
674 | "Push the first unapplied patch. | |
675 | With numeric prefix argument, push that many patches." | |
676 | (interactive "p") | |
d51722b7 | 677 | (stgit-capture-output nil (stgit-run "push" "-n" npatches)) |
074a4fb0 GH |
678 | (stgit-reload) |
679 | (stgit-refresh-git-status)) | |
56d81fe5 | 680 | |
0b661144 DK |
681 | (defun stgit-pop-next (npatches) |
682 | "Pop the topmost applied patch. | |
683 | With numeric prefix argument, pop that many patches." | |
684 | (interactive "p") | |
d51722b7 | 685 | (stgit-capture-output nil (stgit-run "pop" "-n" npatches)) |
074a4fb0 GH |
686 | (stgit-reload) |
687 | (stgit-refresh-git-status)) | |
56d81fe5 | 688 | |
f9182fca KH |
689 | (defun stgit-applied-at-point () |
690 | "Is the patch on the current line applied?" | |
691 | (save-excursion | |
692 | (beginning-of-line) | |
693 | (looking-at "[>+]"))) | |
694 | ||
695 | (defun stgit-push-or-pop () | |
a53347d9 | 696 | "Push or pop the patch on the current line." |
f9182fca | 697 | (interactive) |
d51722b7 | 698 | (let ((patchsym (stgit-patch-at-point t)) |
f9182fca KH |
699 | (applied (stgit-applied-at-point))) |
700 | (stgit-capture-output nil | |
d51722b7 | 701 | (stgit-run (if applied "pop" "push") patchsym)) |
1f0bf00f | 702 | (stgit-reload))) |
f9182fca | 703 | |
c7adf5ef | 704 | (defun stgit-goto () |
a53347d9 | 705 | "Go to the patch on the current line." |
c7adf5ef | 706 | (interactive) |
d51722b7 | 707 | (let ((patchsym (stgit-patch-at-point t))) |
c7adf5ef | 708 | (stgit-capture-output nil |
d51722b7 | 709 | (stgit-run "goto" patchsym)) |
1f0bf00f | 710 | (stgit-reload))) |
c7adf5ef | 711 | |
d51722b7 GH |
712 | (defun stgit-id (patchsym) |
713 | "Return the git commit id for PATCHSYM." | |
378a003d | 714 | (let ((result (with-output-to-string |
d51722b7 | 715 | (stgit-run-silent "id" patchsym)))) |
378a003d | 716 | (unless (string-match "^\\([0-9A-Fa-f]\\{40\\}\\)$" result) |
d51722b7 | 717 | (error "Cannot find commit id for %s" patchsym)) |
378a003d GH |
718 | (match-string 1 result))) |
719 | ||
56d81fe5 | 720 | (defun stgit-show () |
a53347d9 | 721 | "Show the patch on the current line." |
56d81fe5 DK |
722 | (interactive) |
723 | (stgit-capture-output "*StGit patch*" | |
d51722b7 GH |
724 | (let ((patchsym (stgit-patch-at-point))) |
725 | (if (not patchsym) | |
1f60181a | 726 | (let ((patched-file (stgit-patched-file-at-point t))) |
378a003d GH |
727 | (unless patched-file |
728 | (error "No patch or file at point")) | |
d51722b7 | 729 | (let ((id (stgit-id (car patched-file)))) |
5f1b0013 GH |
730 | (if (consp (cdr patched-file)) |
731 | ;; two files (copy or rename) | |
732 | (stgit-run-git "diff" "-C" "-C" (concat id "^") id "--" | |
733 | (cadr patched-file) (cddr patched-file)) | |
734 | ;; just one file | |
735 | (stgit-run-git "diff" (concat id "^") id "--" | |
736 | (cdr patched-file))))) | |
b557489f | 737 | (stgit-run "show" "-O" "--patch-with-stat" patchsym)) |
5f1b0013 GH |
738 | (with-current-buffer standard-output |
739 | (goto-char (point-min)) | |
740 | (diff-mode))))) | |
0663524d | 741 | |
0bca35c8 | 742 | (defun stgit-edit () |
a53347d9 | 743 | "Edit the patch on the current line." |
0bca35c8 | 744 | (interactive) |
d51722b7 | 745 | (let ((patchsym (stgit-patch-at-point t)) |
0780be79 | 746 | (edit-buf (get-buffer-create "*StGit edit*")) |
0bca35c8 DK |
747 | (dir default-directory)) |
748 | (log-edit 'stgit-confirm-edit t nil edit-buf) | |
d51722b7 | 749 | (set (make-local-variable 'stgit-edit-patchsym) patchsym) |
0bca35c8 DK |
750 | (setq default-directory dir) |
751 | (let ((standard-output edit-buf)) | |
d51722b7 | 752 | (stgit-run-silent "edit" "--save-template=-" patchsym)))) |
0bca35c8 DK |
753 | |
754 | (defun stgit-confirm-edit () | |
755 | (interactive) | |
756 | (let ((file (make-temp-file "stgit-edit-"))) | |
757 | (write-region (point-min) (point-max) file) | |
758 | (stgit-capture-output nil | |
d51722b7 | 759 | (stgit-run "edit" "-f" file stgit-edit-patchsym)) |
0bca35c8 | 760 | (with-current-buffer log-edit-parent-buffer |
1f0bf00f | 761 | (stgit-reload)))) |
0bca35c8 | 762 | |
aa04f831 GH |
763 | (defun stgit-new (add-sign) |
764 | "Create a new patch. | |
765 | With a prefix argument, include a \"Signed-off-by:\" line at the | |
766 | end of the patch." | |
767 | (interactive "P") | |
c5d45b92 GH |
768 | (let ((edit-buf (get-buffer-create "*StGit edit*")) |
769 | (dir default-directory)) | |
770 | (log-edit 'stgit-confirm-new t nil edit-buf) | |
aa04f831 GH |
771 | (setq default-directory dir) |
772 | (when add-sign | |
773 | (save-excursion | |
774 | (let ((standard-output (current-buffer))) | |
775 | (stgit-run-silent "new" "--sign" "--save-template=-")))))) | |
64c097a0 DK |
776 | |
777 | (defun stgit-confirm-new () | |
778 | (interactive) | |
27b0f9e4 | 779 | (let ((file (make-temp-file "stgit-edit-"))) |
64c097a0 DK |
780 | (write-region (point-min) (point-max) file) |
781 | (stgit-capture-output nil | |
27b0f9e4 | 782 | (stgit-run "new" "-f" file)) |
64c097a0 | 783 | (with-current-buffer log-edit-parent-buffer |
1f0bf00f | 784 | (stgit-reload)))) |
64c097a0 DK |
785 | |
786 | (defun stgit-create-patch-name (description) | |
787 | "Create a patch name from a long description" | |
788 | (let ((patch "")) | |
789 | (while (> (length description) 0) | |
790 | (cond ((string-match "\\`[a-zA-Z_-]+" description) | |
8439f657 GH |
791 | (setq patch (downcase (concat patch |
792 | (match-string 0 description)))) | |
64c097a0 DK |
793 | (setq description (substring description (match-end 0)))) |
794 | ((string-match "\\` +" description) | |
795 | (setq patch (concat patch "-")) | |
796 | (setq description (substring description (match-end 0)))) | |
797 | ((string-match "\\`[^a-zA-Z_-]+" description) | |
798 | (setq description (substring description (match-end 0)))))) | |
799 | (cond ((= (length patch) 0) | |
800 | "patch") | |
801 | ((> (length patch) 20) | |
802 | (substring patch 0 20)) | |
803 | (t patch)))) | |
0bca35c8 | 804 | |
d51722b7 GH |
805 | (defun stgit-delete (patchsyms) |
806 | "Delete the patches in PATCHSYMS. | |
807 | Interactively, delete the marked patches, or the patch at point." | |
7755d7f1 | 808 | (interactive (list (stgit-patches-marked-or-at-point))) |
d51722b7 GH |
809 | (let ((npatches (length patchsyms))) |
810 | (if (zerop npatches) | |
811 | (error "No patches to delete") | |
812 | (when (yes-or-no-p (format "Really delete %d patch%s? " | |
813 | npatches | |
814 | (if (= 1 npatches) "" "es"))) | |
815 | (stgit-capture-output nil | |
816 | (apply 'stgit-run "delete" patchsyms)) | |
817 | (stgit-reload))))) | |
818 | ||
819 | (defun stgit-coalesce (patchsyms) | |
820 | "Coalesce the patches in PATCHSYMS. | |
821 | Interactively, coalesce the marked patches." | |
822 | (interactive (list stgit-marked-patches)) | |
823 | (when (< (length patchsyms) 2) | |
824 | (error "Need at least two patches to coalesce")) | |
0780be79 | 825 | (let ((edit-buf (get-buffer-create "*StGit edit*")) |
ea0def18 DK |
826 | (dir default-directory)) |
827 | (log-edit 'stgit-confirm-coalesce t nil edit-buf) | |
d51722b7 | 828 | (set (make-local-variable 'stgit-patchsyms) patchsyms) |
ea0def18 DK |
829 | (setq default-directory dir) |
830 | (let ((standard-output edit-buf)) | |
d51722b7 | 831 | (apply 'stgit-run-silent "coalesce" "--save-template=-" patchsyms)))) |
ea0def18 DK |
832 | |
833 | (defun stgit-confirm-coalesce () | |
834 | (interactive) | |
835 | (let ((file (make-temp-file "stgit-edit-"))) | |
836 | (write-region (point-min) (point-max) file) | |
837 | (stgit-capture-output nil | |
d51722b7 | 838 | (apply 'stgit-run "coalesce" "-f" file stgit-patchsyms)) |
ea0def18 | 839 | (with-current-buffer log-edit-parent-buffer |
e6b1fdae DK |
840 | (stgit-clear-marks) |
841 | ;; Go to first marked patch and stay there | |
842 | (goto-char (point-min)) | |
843 | (re-search-forward (concat "^[>+-]\\*") nil t) | |
844 | (move-to-column goal-column) | |
845 | (let ((pos (point))) | |
1f0bf00f | 846 | (stgit-reload) |
e6b1fdae | 847 | (goto-char pos))))) |
ea0def18 | 848 | |
0663524d KH |
849 | (defun stgit-help () |
850 | "Display help for the StGit mode." | |
851 | (interactive) | |
852 | (describe-function 'stgit-mode)) | |
3a59f3db | 853 | |
83e51dbf DK |
854 | (defun stgit-undo (&optional arg) |
855 | "Run stg undo. | |
856 | With prefix argument, run it with the --hard flag." | |
857 | (interactive "P") | |
858 | (stgit-capture-output nil | |
859 | (if arg | |
860 | (stgit-run "undo" "--hard") | |
861 | (stgit-run "undo"))) | |
1f0bf00f | 862 | (stgit-reload)) |
83e51dbf | 863 | |
4d73c4d8 DK |
864 | (defun stgit-refresh (&optional arg) |
865 | "Run stg refresh. | |
a53347d9 | 866 | With prefix argument, refresh the marked patch or the patch under point." |
4d73c4d8 DK |
867 | (interactive "P") |
868 | (let ((patchargs (if arg | |
b0424080 GH |
869 | (let ((patches (stgit-patches-marked-or-at-point))) |
870 | (cond ((null patches) | |
df283a8b | 871 | (error "No patch to update")) |
b0424080 | 872 | ((> (length patches) 1) |
df283a8b | 873 | (error "Too many patches selected")) |
b0424080 GH |
874 | (t |
875 | (cons "-p" patches)))) | |
876 | nil))) | |
4d73c4d8 | 877 | (stgit-capture-output nil |
074a4fb0 GH |
878 | (apply 'stgit-run "refresh" patchargs)) |
879 | (stgit-refresh-git-status)) | |
4d73c4d8 DK |
880 | (stgit-reload)) |
881 | ||
3a59f3db | 882 | (provide 'stgit) |