stgit.el: Rename stgit-expand-find-copies-harder to stgit-find-copies-harder
[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
0f076fe6 12(require 'git nil t)
50d88c67 13(require 'cl)
98230edd 14(require 'ewoc)
0f076fe6 15
56d81fe5 16(defun stgit (dir)
a53347d9 17 "Manage StGit patches for the tree in DIR."
56d81fe5 18 (interactive "DDirectory: \n")
52144ce5 19 (switch-to-stgit-buffer (git-get-top-dir dir))
1f0bf00f 20 (stgit-reload))
56d81fe5 21
074a4fb0
GH
22(unless (fboundp 'git-get-top-dir)
23 (defun git-get-top-dir (dir)
24 "Retrieve the top-level directory of a git tree."
25 (let ((cdup (with-output-to-string
26 (with-current-buffer standard-output
27 (cd dir)
28 (unless (eq 0 (call-process "git" nil t nil
29 "rev-parse" "--show-cdup"))
df283a8b 30 (error "Cannot find top-level git tree for %s" dir))))))
074a4fb0
GH
31 (expand-file-name (concat (file-name-as-directory dir)
32 (car (split-string cdup "\n")))))))
33
34(defun stgit-refresh-git-status (&optional dir)
35 "If it exists, refresh the `git-status' buffer belonging to
36directory DIR or `default-directory'"
37 (when (and (fboundp 'git-find-status-buffer)
38 (fboundp 'git-refresh-status))
39 (let* ((top-dir (git-get-top-dir (or dir default-directory)))
40 (git-status-buffer (and top-dir (git-find-status-buffer top-dir))))
41 (when git-status-buffer
42 (with-current-buffer git-status-buffer
43 (git-refresh-status))))))
52144ce5 44
b894e680
DK
45(defun stgit-find-buffer (dir)
46 "Return the buffer displaying StGit patches for DIR, or nil if none."
56d81fe5
DK
47 (setq dir (file-name-as-directory dir))
48 (let ((buffers (buffer-list)))
49 (while (and buffers
50 (not (with-current-buffer (car buffers)
51 (and (eq major-mode 'stgit-mode)
52 (string= default-directory dir)))))
53 (setq buffers (cdr buffers)))
b894e680
DK
54 (and buffers (car buffers))))
55
56(defun switch-to-stgit-buffer (dir)
57 "Switch to a (possibly new) buffer displaying StGit patches for DIR."
58 (setq dir (file-name-as-directory dir))
59 (let ((buffer (stgit-find-buffer dir)))
60 (switch-to-buffer (or buffer
61 (create-stgit-buffer dir)))))
62
2c862b07 63(defstruct (stgit-patch)
3164eec6 64 status name desc empty files-ewoc)
56d81fe5 65
98230edd 66(defun stgit-patch-pp (patch)
9153ce3a
GH
67 (let* ((status (stgit-patch-status patch))
68 (start (point))
69 (name (stgit-patch-name patch))
70 (face (cdr (assq status stgit-patch-status-face-alist))))
71 (insert (case status
72 ('applied "+")
73 ('top ">")
74 ('unapplied "-")
75 (t " "))
76 (if (memq name stgit-marked-patches)
77 "*" " "))
78 (if (memq status '(index work))
79 (insert (propertize (if (eq status 'index) "Index" "Work tree")
80 'face face))
81 (insert (format "%-30s"
82 (propertize (symbol-name name) 'face face))
83 " "
84 (if (stgit-patch-empty patch) "(empty) " "")
85 (propertize (or (stgit-patch-desc patch) "")
86 'face 'stgit-description-face)))
4f7ff561 87 (insert "\n")
f9b82d36 88 (put-text-property start (point) 'entry-type 'patch)
98230edd 89 (when (memq name stgit-expanded-patches)
0de6881a 90 (stgit-insert-patch-files patch))
98230edd
DK
91 (put-text-property start (point) 'patch-data patch)))
92
56d81fe5
DK
93(defun create-stgit-buffer (dir)
94 "Create a buffer for showing StGit patches.
95Argument DIR is the repository path."
96 (let ((buf (create-file-buffer (concat dir "*stgit*")))
97 (inhibit-read-only t))
98 (with-current-buffer buf
99 (setq default-directory dir)
100 (stgit-mode)
98230edd 101 (set (make-local-variable 'stgit-ewoc)
4f7ff561 102 (ewoc-create #'stgit-patch-pp "Branch:\n\n" "--\n" t))
56d81fe5
DK
103 (setq buffer-read-only t))
104 buf))
105
106(defmacro stgit-capture-output (name &rest body)
e558a4ab
GH
107 "Capture StGit output and, if there was any output, show it in a window
108at the end.
109Returns nil if there was no output."
94baef5a
DK
110 (declare (debug ([&or stringp null] body))
111 (indent 1))
34afb86c
DK
112 `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))
113 (stgit-dir default-directory)
114 (inhibit-read-only t))
56d81fe5 115 (with-current-buffer output-buf
34afb86c
DK
116 (erase-buffer)
117 (setq default-directory stgit-dir)
118 (setq buffer-read-only t))
56d81fe5
DK
119 (let ((standard-output output-buf))
120 ,@body)
34afb86c
DK
121 (with-current-buffer output-buf
122 (set-buffer-modified-p nil)
123 (setq buffer-read-only t)
124 (if (< (point-min) (point-max))
125 (display-buffer output-buf t)))))
56d81fe5 126
d51722b7
GH
127(defun stgit-make-run-args (args)
128 "Return a copy of ARGS with its elements converted to strings."
129 (mapcar (lambda (x)
130 ;; don't use (format "%s" ...) to limit type errors
131 (cond ((stringp x) x)
132 ((integerp x) (number-to-string x))
133 ((symbolp x) (symbol-name x))
134 (t
135 (error "Bad element in stgit-make-run-args args: %S" x))))
136 args))
137
9aecd505 138(defun stgit-run-silent (&rest args)
d51722b7 139 (setq args (stgit-make-run-args args))
56d81fe5
DK
140 (apply 'call-process "stg" nil standard-output nil args))
141
9aecd505 142(defun stgit-run (&rest args)
d51722b7 143 (setq args (stgit-make-run-args args))
9aecd505
DK
144 (let ((msgcmd (mapconcat #'identity args " ")))
145 (message "Running stg %s..." msgcmd)
146 (apply 'call-process "stg" nil standard-output nil args)
147 (message "Running stg %s...done" msgcmd)))
148
378a003d 149(defun stgit-run-git (&rest args)
d51722b7 150 (setq args (stgit-make-run-args args))
378a003d
GH
151 (let ((msgcmd (mapconcat #'identity args " ")))
152 (message "Running git %s..." msgcmd)
153 (apply 'call-process "git" nil standard-output nil args)
154 (message "Running git %s...done" msgcmd)))
155
1f60181a 156(defun stgit-run-git-silent (&rest args)
d51722b7 157 (setq args (stgit-make-run-args args))
1f60181a
GH
158 (apply 'call-process "git" nil standard-output nil args))
159
b894e680
DK
160(defun stgit-index-empty-p ()
161 "Returns non-nil if the index contains no changes from HEAD."
162 (zerop (stgit-run-git-silent "diff-index" "--cached" "--quiet" "HEAD")))
163
2ecb05c8
GH
164(defvar stgit-index-node)
165(defvar stgit-worktree-node)
210a2a52
DK
166
167(defun stgit-refresh-index ()
168 (when stgit-index-node
169 (ewoc-invalidate (car stgit-index-node) (cdr stgit-index-node))))
170
171(defun stgit-refresh-worktree ()
172 (when stgit-worktree-node
173 (ewoc-invalidate (car stgit-worktree-node) (cdr stgit-worktree-node))))
174
8f702de4
GH
175(defun stgit-run-series-insert-index (ewoc)
176 (setq index-node (cons ewoc (ewoc-enter-last ewoc
177 (make-stgit-patch
178 :status 'index
179 :name :index
180 :desc nil
181 :empty nil)))
182 worktree-node (cons ewoc (ewoc-enter-last ewoc
183 (make-stgit-patch
184 :status 'work
185 :name :work
186 :desc nil
187 :empty nil)))))
188
98230edd 189(defun stgit-run-series (ewoc)
8f702de4
GH
190 (setq stgit-index-node nil
191 stgit-worktree-node nil)
192 (let ((inserted-index (not stgit-show-worktree))
193 index-node
03fc3b26
GH
194 worktree-node
195 all-patchsyms)
98230edd
DK
196 (with-temp-buffer
197 (let ((exit-status (stgit-run-silent "series" "--description" "--empty")))
198 (goto-char (point-min))
199 (if (not (zerop exit-status))
200 (cond ((looking-at "stg series: \\(.*\\)")
8f702de4 201 (setq inserted-index t)
98230edd 202 (ewoc-set-hf ewoc (car (ewoc-get-hf ewoc))
8f702de4
GH
203 (substitute-command-keys
204 "-- not initialized; run \\[stgit-init]")))
98230edd
DK
205 ((looking-at ".*")
206 (error "Error running stg: %s"
207 (match-string 0))))
208 (while (not (eobp))
209 (unless (looking-at
210 "\\([0 ]\\)\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)")
211 (error "Syntax error in output from stg series"))
212 (let* ((state-str (match-string 2))
213 (state (cond ((string= state-str ">") 'top)
214 ((string= state-str "+") 'applied)
8f702de4
GH
215 ((string= state-str "-") 'unapplied)))
216 (name (intern (match-string 4)))
217 (desc (match-string 5))
218 (empty (string= (match-string 1) "0")))
219 (unless inserted-index
220 (when (or (eq stgit-show-worktree-mode 'top)
221 (and (eq stgit-show-worktree-mode 'center)
222 (eq state 'unapplied)))
223 (setq inserted-index t)
224 (stgit-run-series-insert-index ewoc)))
03fc3b26 225 (setq all-patchsyms (cons name all-patchsyms))
98230edd
DK
226 (ewoc-enter-last ewoc
227 (make-stgit-patch
228 :status state
8f702de4
GH
229 :name name
230 :desc desc
231 :empty empty)))
232 (forward-line 1))))
233 (unless inserted-index
234 (stgit-run-series-insert-index ewoc)))
235 (setq stgit-index-node index-node
03fc3b26
GH
236 stgit-worktree-node worktree-node
237 stgit-marked-patches (intersection stgit-marked-patches
238 all-patchsyms))))
98230edd 239
1f0bf00f 240(defun stgit-reload ()
a53347d9 241 "Update the contents of the StGit buffer."
56d81fe5
DK
242 (interactive)
243 (let ((inhibit-read-only t)
244 (curline (line-number-at-pos))
a9089e68
GH
245 (curpatch (stgit-patch-name-at-point))
246 (curfile (stgit-patched-file-at-point)))
98230edd
DK
247 (ewoc-filter stgit-ewoc #'(lambda (x) nil))
248 (ewoc-set-hf stgit-ewoc
249 (concat "Branch: "
250 (propertize
251 (with-temp-buffer
252 (stgit-run-silent "branch")
253 (buffer-substring (point-min) (1- (point-max))))
4f292066 254 'face 'stgit-branch-name-face)
4f7ff561 255 "\n\n")
ce3b6130
DK
256 (if stgit-show-worktree
257 "--"
258 (propertize
259 (substitute-command-keys "--\n\"\\[stgit-toggle-worktree]\"\
260 shows the working tree\n")
261 'face 'stgit-description-face)))
98230edd 262 (stgit-run-series stgit-ewoc)
56d81fe5 263 (if curpatch
a9089e68 264 (stgit-goto-patch curpatch (and curfile (stgit-file-file curfile)))
074a4fb0
GH
265 (goto-line curline)))
266 (stgit-refresh-git-status))
56d81fe5 267
8f40753a
GH
268(defgroup stgit nil
269 "A user interface for the StGit patch maintenance tool."
270 :group 'tools)
271
07f464e0
DK
272(defface stgit-description-face
273 '((((background dark)) (:foreground "tan"))
274 (((background light)) (:foreground "dark red")))
8f40753a
GH
275 "The face used for StGit descriptions"
276 :group 'stgit)
4f292066
GH
277
278(defface stgit-branch-name-face
279 '((t :inherit bold))
280 "The face used for the StGit branch name"
281 :group 'stgit)
07f464e0
DK
282
283(defface stgit-top-patch-face
284 '((((background dark)) (:weight bold :foreground "yellow"))
285 (((background light)) (:weight bold :foreground "purple"))
286 (t (:weight bold)))
8f40753a
GH
287 "The face used for the top patch names"
288 :group 'stgit)
07f464e0
DK
289
290(defface stgit-applied-patch-face
291 '((((background dark)) (:foreground "light yellow"))
292 (((background light)) (:foreground "purple"))
293 (t ()))
8f40753a
GH
294 "The face used for applied patch names"
295 :group 'stgit)
07f464e0
DK
296
297(defface stgit-unapplied-patch-face
298 '((((background dark)) (:foreground "gray80"))
299 (((background light)) (:foreground "orchid"))
300 (t ()))
8f40753a
GH
301 "The face used for unapplied patch names"
302 :group 'stgit)
07f464e0 303
1f60181a
GH
304(defface stgit-modified-file-face
305 '((((class color) (background light)) (:foreground "purple"))
306 (((class color) (background dark)) (:foreground "salmon")))
307 "StGit mode face used for modified file status"
308 :group 'stgit)
309
310(defface stgit-unmerged-file-face
311 '((((class color) (background light)) (:foreground "red" :bold t))
312 (((class color) (background dark)) (:foreground "red" :bold t)))
313 "StGit mode face used for unmerged file status"
314 :group 'stgit)
315
316(defface stgit-unknown-file-face
317 '((((class color) (background light)) (:foreground "goldenrod" :bold t))
318 (((class color) (background dark)) (:foreground "goldenrod" :bold t)))
319 "StGit mode face used for unknown file status"
320 :group 'stgit)
321
d9473917
GH
322(defface stgit-ignored-file-face
323 '((((class color) (background light)) (:foreground "grey60"))
324 (((class color) (background dark)) (:foreground "grey40")))
325 "StGit mode face used for ignored files")
326
a6d9a852
GH
327(defface stgit-file-permission-face
328 '((((class color) (background light)) (:foreground "green" :bold t))
329 (((class color) (background dark)) (:foreground "green" :bold t)))
330 "StGit mode face used for permission changes."
331 :group 'stgit)
332
46a273fd
GH
333(defface stgit-index-work-tree-title-face
334 '((((supports :slant italic)) :slant italic)
335 (t :inherit bold))
336 "StGit mode face used for the \"Index\" and \"Work tree\" titles"
337 :group 'stgit)
338
339
b6df231c 340(defcustom stgit-find-copies-harder
1f60181a
GH
341 nil
342 "Try harder to find copied files when listing patches.
343
344When not nil, runs git diff-tree with the --find-copies-harder
345flag, which reduces performance."
346 :type 'boolean
347 :group 'stgit)
348
349(defconst stgit-file-status-code-strings
350 (mapcar (lambda (arg)
351 (cons (car arg)
a6d9a852
GH
352 (propertize (cadr arg) 'face (car (cddr arg)))))
353 '((add "Added" stgit-modified-file-face)
354 (copy "Copied" stgit-modified-file-face)
355 (delete "Deleted" stgit-modified-file-face)
356 (modify "Modified" stgit-modified-file-face)
357 (rename "Renamed" stgit-modified-file-face)
358 (mode-change "Mode change" stgit-modified-file-face)
359 (unmerged "Unmerged" stgit-unmerged-file-face)
d9473917
GH
360 (unknown "Unknown" stgit-unknown-file-face)
361 (ignore "Ignored" stgit-ignored-file-face)))
1f60181a
GH
362 "Alist of code symbols to description strings")
363
000f337c
GH
364(defconst stgit-patch-status-face-alist
365 '((applied . stgit-applied-patch-face)
366 (top . stgit-top-patch-face)
367 (unapplied . stgit-unapplied-patch-face)
9153ce3a
GH
368 (index . stgit-index-work-tree-title-face)
369 (work . stgit-index-work-tree-title-face))
000f337c
GH
370 "Alist of face to use for a given patch status")
371
3164eec6
DK
372(defun stgit-file-status-code-as-string (file)
373 "Return stgit status code for FILE as a string"
374 (let* ((code (assq (stgit-file-status file)
375 stgit-file-status-code-strings))
376 (score (stgit-file-cr-score file)))
377 (when code
a6d9a852 378 (format "%-11s "
3164eec6
DK
379 (if (and score (/= score 100))
380 (format "%s %s" (cdr code)
381 (propertize (format "%d%%" score)
a6d9a852 382 'face 'stgit-description-face))
3164eec6 383 (cdr code))))))
1f60181a 384
a6d9a852 385(defun stgit-file-status-code (str &optional score)
1f60181a
GH
386 "Return stgit status code from git status string"
387 (let ((code (assoc str '(("A" . add)
388 ("C" . copy)
389 ("D" . delete)
d9473917 390 ("I" . ignore)
1f60181a
GH
391 ("M" . modify)
392 ("R" . rename)
393 ("T" . mode-change)
394 ("U" . unmerged)
395 ("X" . unknown)))))
a6d9a852
GH
396 (setq code (if code (cdr code) 'unknown))
397 (when (stringp score)
398 (if (> (length score) 0)
399 (setq score (string-to-number score))
400 (setq score nil)))
401 (if score (cons code score) code)))
402
403(defconst stgit-file-type-strings
404 '((#o100 . "file")
405 (#o120 . "symlink")
406 (#o160 . "subproject"))
407 "Alist of names of file types")
408
409(defun stgit-file-type-string (type)
47271f41
GH
410 "Return string describing file type TYPE (the high bits of file permission).
411Cf. `stgit-file-type-strings' and `stgit-file-type-change-string'."
a6d9a852
GH
412 (let ((type-str (assoc type stgit-file-type-strings)))
413 (or (and type-str (cdr type-str))
414 (format "unknown type %o" type))))
415
416(defun stgit-file-type-change-string (old-perm new-perm)
47271f41
GH
417 "Return string describing file type change from OLD-PERM to NEW-PERM.
418Cf. `stgit-file-type-string'."
a6d9a852
GH
419 (let ((old-type (lsh old-perm -9))
420 (new-type (lsh new-perm -9)))
421 (cond ((= old-type new-type) "")
422 ((zerop new-type) "")
423 ((zerop old-type)
424 (if (= new-type #o100)
425 ""
426 (format " (%s)" (stgit-file-type-string new-type))))
427 (t (format " (%s -> %s)"
428 (stgit-file-type-string old-type)
429 (stgit-file-type-string new-type))))))
430
431(defun stgit-file-mode-change-string (old-perm new-perm)
47271f41
GH
432 "Return string describing file mode change from OLD-PERM to NEW-PERM.
433Cf. `stgit-file-type-change-string'."
a6d9a852
GH
434 (setq old-perm (logand old-perm #o777)
435 new-perm (logand new-perm #o777))
436 (if (or (= old-perm new-perm)
437 (zerop old-perm)
438 (zerop new-perm))
439 ""
440 (let* ((modified (logxor old-perm new-perm))
441 (not-x-modified (logand (logxor old-perm new-perm) #o666)))
442 (cond ((zerop modified) "")
443 ((and (zerop not-x-modified)
444 (or (and (eq #o111 (logand old-perm #o111))
445 (propertize "-x" 'face 'stgit-file-permission-face))
446 (and (eq #o111 (logand new-perm #o111))
447 (propertize "+x" 'face
448 'stgit-file-permission-face)))))
449 (t (concat (propertize (format "%o" old-perm)
450 'face 'stgit-file-permission-face)
451 (propertize " -> "
452 'face 'stgit-description-face)
453 (propertize (format "%o" new-perm)
454 'face 'stgit-file-permission-face)))))))
1f60181a 455
0de6881a
DK
456(defstruct (stgit-file)
457 old-perm new-perm copy-or-rename cr-score cr-from cr-to status file)
458
3164eec6 459(defun stgit-file-pp (file)
0de6881a
DK
460 (let ((status (stgit-file-status file))
461 (name (if (stgit-file-copy-or-rename file)
462 (concat (stgit-file-cr-from file)
463 (propertize " -> "
464 'face 'stgit-description-face)
465 (stgit-file-cr-to file))
466 (stgit-file-file file)))
467 (mode-change (stgit-file-mode-change-string
468 (stgit-file-old-perm file)
469 (stgit-file-new-perm file)))
470 (start (point)))
3164eec6
DK
471 (insert (format " %-12s%1s%s%s\n"
472 (stgit-file-status-code-as-string file)
98230edd 473 mode-change
0de6881a
DK
474 name
475 (propertize (stgit-file-type-change-string
476 (stgit-file-old-perm file)
477 (stgit-file-new-perm file))
98230edd 478 'face 'stgit-description-face)))
0de6881a 479 (add-text-properties start (point)
3164eec6
DK
480 (list 'entry-type 'file
481 'file-data file))))
0de6881a 482
7567401c
GH
483(defun stgit-find-copies-harder-diff-arg ()
484 "Return the flag to use with `git-diff' depending on the
b6df231c
GH
485`stgit-find-copies-harder' flag."
486 (if stgit-find-copies-harder "--find-copies-harder" "-C"))
7567401c 487
d9473917
GH
488(defun stgit-insert-ls-files (args file-flag)
489 (let ((start (point)))
490 (apply 'stgit-run-git
491 (append '("ls-files" "--exclude-standard" "-z") args))
492 (goto-char start)
493 (while (looking-at "\\([^\0]*\\)\0")
494 (let ((name-len (- (match-end 0) (match-beginning 0))))
495 (insert ":0 0 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 " file-flag "\0")
496 (forward-char name-len)))))
497
0de6881a 498(defun stgit-insert-patch-files (patch)
88134ff7
GH
499 "Expand (show modification of) the patch PATCH after the line
500at point."
3164eec6 501 (let* ((patchsym (stgit-patch-name patch))
0434bec1
GH
502 (end (point-marker))
503 (args (list "-z" (stgit-find-copies-harder-diff-arg)))
504 (ewoc (ewoc-create #'stgit-file-pp nil nil t)))
505 (set-marker-insertion-type end t)
3164eec6 506 (setf (stgit-patch-files-ewoc patch) ewoc)
0de6881a 507 (with-temp-buffer
b894e680
DK
508 (apply 'stgit-run-git
509 (cond ((eq patchsym :work)
510 `("diff-files" ,@args))
511 ((eq patchsym :index)
512 `("diff-index" ,@args "--cached" "HEAD"))
513 (t
514 `("diff-tree" ,@args "-r" ,(stgit-id patchsym)))))
d9473917
GH
515
516 (when (and (eq patchsym :work))
517 (when stgit-show-ignored
518 (stgit-insert-ls-files '("--ignored" "--others") "I"))
519 (when stgit-show-unknown
520 (stgit-insert-ls-files '("--others") "X"))
521 (sort-regexp-fields nil ":[^\0]*\0\\([^\0]*\\)\0" "\\1"
522 (point-min) (point-max)))
523
0de6881a 524 (goto-char (point-min))
b894e680
DK
525 (unless (or (eobp) (memq patchsym '(:work :index)))
526 (forward-char 41))
0de6881a
DK
527 (while (looking-at ":\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} ")
528 (let ((old-perm (string-to-number (match-string 1) 8))
529 (new-perm (string-to-number (match-string 2) 8)))
530 (goto-char (match-end 0))
531 (let ((file
532 (cond ((looking-at
533 "\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\0")
027e1370
GH
534 (let* ((patch-status (stgit-patch-status patch))
535 (file-subexp (if (eq patch-status 'unapplied)
536 3
537 4))
538 (file (match-string file-subexp)))
539 (make-stgit-file
540 :old-perm old-perm
541 :new-perm new-perm
542 :copy-or-rename t
543 :cr-score (string-to-number (match-string 2))
544 :cr-from (match-string 3)
545 :cr-to (match-string 4)
546 :status (stgit-file-status-code
547 (match-string 1))
548 :file file)))
0de6881a
DK
549 ((looking-at "\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\0")
550 (make-stgit-file
551 :old-perm old-perm
552 :new-perm new-perm
553 :copy-or-rename nil
554 :cr-score nil
555 :cr-from nil
556 :cr-to nil
027e1370
GH
557 :status (stgit-file-status-code
558 (match-string 1))
0de6881a 559 :file (match-string 2))))))
3164eec6
DK
560 (ewoc-enter-last ewoc file))
561 (goto-char (match-end 0))))
562 (unless (ewoc-nth ewoc 0)
000f337c
GH
563 (ewoc-set-hf ewoc ""
564 (concat " "
565 (propertize "<no files>"
566 'face 'stgit-description-face)
567 "\n"))))
0434bec1 568 (goto-char end)))
07f464e0 569
acc5652f 570(defun stgit-select-file ()
3164eec6
DK
571 (let ((filename (expand-file-name
572 (stgit-file-file (stgit-patched-file-at-point)))))
0de6881a
DK
573 (unless (file-exists-p filename)
574 (error "File does not exist"))
575 (find-file filename)))
acc5652f 576
50d88c67 577(defun stgit-select-patch ()
98230edd
DK
578 (let ((patchname (stgit-patch-name-at-point)))
579 (if (memq patchname stgit-expanded-patches)
580 (setq stgit-expanded-patches (delq patchname stgit-expanded-patches))
581 (setq stgit-expanded-patches (cons patchname stgit-expanded-patches)))
582 (ewoc-invalidate stgit-ewoc (ewoc-locate stgit-ewoc)))
583 (move-to-column (stgit-goal-column)))
acc5652f 584
378a003d 585(defun stgit-select ()
da01a29b
GH
586 "With point on a patch, toggle showing files in the patch.
587
588With point on a file, open the associated file. Opens the target
589file for (applied) copies and renames."
378a003d 590 (interactive)
50d88c67
DK
591 (case (get-text-property (point) 'entry-type)
592 ('patch
593 (stgit-select-patch))
594 ('file
595 (stgit-select-file))
596 (t
597 (error "No patch or file on line"))))
378a003d
GH
598
599(defun stgit-find-file-other-window ()
600 "Open file at point in other window"
601 (interactive)
602 (let ((patched-file (stgit-patched-file-at-point)))
603 (unless patched-file
604 (error "No file on the current line"))
3164eec6 605 (let ((filename (expand-file-name (stgit-file-file patched-file))))
378a003d
GH
606 (unless (file-exists-p filename)
607 (error "File does not exist"))
608 (find-file-other-window filename))))
609
83327d53 610(defun stgit-quit ()
a53347d9 611 "Hide the stgit buffer."
83327d53
GH
612 (interactive)
613 (bury-buffer))
614
0f076fe6 615(defun stgit-git-status ()
a53347d9 616 "Show status using `git-status'."
0f076fe6
GH
617 (interactive)
618 (unless (fboundp 'git-status)
df283a8b 619 (error "The stgit-git-status command requires git-status"))
0f076fe6
GH
620 (let ((dir default-directory))
621 (save-selected-window
622 (pop-to-buffer nil)
623 (git-status dir))))
624
58f72f16
GH
625(defun stgit-goal-column ()
626 "Return goal column for the current line"
50d88c67
DK
627 (case (get-text-property (point) 'entry-type)
628 ('patch 2)
629 ('file 4)
630 (t 0)))
58f72f16
GH
631
632(defun stgit-next-line (&optional arg)
378a003d 633 "Move cursor vertically down ARG lines"
58f72f16
GH
634 (interactive "p")
635 (next-line arg)
636 (move-to-column (stgit-goal-column)))
378a003d 637
58f72f16 638(defun stgit-previous-line (&optional arg)
378a003d 639 "Move cursor vertically up ARG lines"
58f72f16
GH
640 (interactive "p")
641 (previous-line arg)
642 (move-to-column (stgit-goal-column)))
378a003d
GH
643
644(defun stgit-next-patch (&optional arg)
98230edd 645 "Move cursor down ARG patches."
378a003d 646 (interactive "p")
98230edd
DK
647 (ewoc-goto-next stgit-ewoc (or arg 1))
648 (move-to-column goal-column))
378a003d
GH
649
650(defun stgit-previous-patch (&optional arg)
98230edd 651 "Move cursor up ARG patches."
378a003d 652 (interactive "p")
98230edd
DK
653 (ewoc-goto-prev stgit-ewoc (or arg 1))
654 (move-to-column goal-column))
378a003d 655
56d81fe5
DK
656(defvar stgit-mode-hook nil
657 "Run after `stgit-mode' is setup.")
658
659(defvar stgit-mode-map nil
660 "Keymap for StGit major mode.")
661
662(unless stgit-mode-map
ce3b6130
DK
663 (let ((toggle-map (make-keymap)))
664 (suppress-keymap toggle-map)
665 (mapc (lambda (arg) (define-key toggle-map (car arg) (cdr arg)))
d9473917
GH
666 '(("t" . stgit-toggle-worktree)
667 ("i" . stgit-toggle-ignored)
668 ("u" . stgit-toggle-unknown)))
ce3b6130
DK
669 (setq stgit-mode-map (make-keymap))
670 (suppress-keymap stgit-mode-map)
671 (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg)))
672 `((" " . stgit-mark)
673 ("m" . stgit-mark)
674 ("\d" . stgit-unmark-up)
675 ("u" . stgit-unmark-down)
676 ("?" . stgit-help)
677 ("h" . stgit-help)
678 ("\C-p" . stgit-previous-line)
679 ("\C-n" . stgit-next-line)
680 ([up] . stgit-previous-line)
681 ([down] . stgit-next-line)
682 ("p" . stgit-previous-patch)
683 ("n" . stgit-next-patch)
684 ("\M-{" . stgit-previous-patch)
685 ("\M-}" . stgit-next-patch)
686 ("s" . stgit-git-status)
408fa7cb 687 ("g" . stgit-reload-or-repair)
ce3b6130
DK
688 ("r" . stgit-refresh)
689 ("\C-c\C-r" . stgit-rename)
690 ("e" . stgit-edit)
691 ("M" . stgit-move-patches)
692 ("S" . stgit-squash)
693 ("N" . stgit-new)
e9fdd4ea
GH
694 ("\C-c\C-c" . stgit-commit)
695 ("\C-c\C-u" . stgit-uncommit)
3959a095 696 ("U" . stgit-revert-file)
51783171 697 ("R" . stgit-resolve-file)
ce3b6130
DK
698 ("\r" . stgit-select)
699 ("o" . stgit-find-file-other-window)
700 ("i" . stgit-file-toggle-index)
701 (">" . stgit-push-next)
702 ("<" . stgit-pop-next)
703 ("P" . stgit-push-or-pop)
704 ("G" . stgit-goto)
705 ("=" . stgit-show)
706 ("D" . stgit-delete)
707 ([(control ?/)] . stgit-undo)
708 ("\C-_" . stgit-undo)
709 ("B" . stgit-branch)
710 ("t" . ,toggle-map)
711 ("q" . stgit-quit)))))
56d81fe5
DK
712
713(defun stgit-mode ()
714 "Major mode for interacting with StGit.
715Commands:
716\\{stgit-mode-map}"
717 (kill-all-local-variables)
718 (buffer-disable-undo)
719 (setq mode-name "StGit"
720 major-mode 'stgit-mode
721 goal-column 2)
722 (use-local-map stgit-mode-map)
723 (set (make-local-variable 'list-buffers-directory) default-directory)
6df83d42 724 (set (make-local-variable 'stgit-marked-patches) nil)
6467d976 725 (set (make-local-variable 'stgit-expanded-patches) (list :work :index))
ce3b6130 726 (set (make-local-variable 'stgit-show-worktree) stgit-default-show-worktree)
2ecb05c8
GH
727 (set (make-local-variable 'stgit-index-node) nil)
728 (set (make-local-variable 'stgit-worktree-node) nil)
2870f8b8 729 (set-variable 'truncate-lines 't)
b894e680 730 (add-hook 'after-save-hook 'stgit-update-saved-file)
56d81fe5
DK
731 (run-hooks 'stgit-mode-hook))
732
b894e680
DK
733(defun stgit-update-saved-file ()
734 (let* ((file (expand-file-name buffer-file-name))
735 (dir (file-name-directory file))
736 (gitdir (condition-case nil (git-get-top-dir dir)
737 (error nil)))
738 (buffer (and gitdir (stgit-find-buffer gitdir))))
739 (when buffer
740 (with-current-buffer buffer
210a2a52 741 (stgit-refresh-worktree)))))
b894e680 742
d51722b7
GH
743(defun stgit-add-mark (patchsym)
744 "Mark the patch PATCHSYM."
8036afdd 745 (setq stgit-marked-patches (cons patchsym stgit-marked-patches)))
6df83d42 746
d51722b7
GH
747(defun stgit-remove-mark (patchsym)
748 "Unmark the patch PATCHSYM."
8036afdd 749 (setq stgit-marked-patches (delq patchsym stgit-marked-patches)))
6df83d42 750
e6b1fdae 751(defun stgit-clear-marks ()
47271f41 752 "Unmark all patches."
e6b1fdae
DK
753 (setq stgit-marked-patches '()))
754
735cb7ec 755(defun stgit-patch-at-point (&optional cause-error)
2c862b07
DK
756 (get-text-property (point) 'patch-data))
757
64ada6f5 758(defun stgit-patch-name-at-point (&optional cause-error only-patches)
d51722b7 759 "Return the patch name on the current line as a symbol.
64ada6f5
GH
760If CAUSE-ERROR is not nil, signal an error if none found.
761If ONLY-PATCHES is not nil, only allow real patches, and not
762index or work tree."
2c862b07 763 (let ((patch (stgit-patch-at-point)))
64ada6f5
GH
764 (and patch
765 only-patches
766 (memq (stgit-patch-status patch) '(work index))
767 (setq patch nil))
2c862b07
DK
768 (cond (patch
769 (stgit-patch-name patch))
770 (cause-error
771 (error "No patch on this line")))))
378a003d 772
3164eec6
DK
773(defun stgit-patched-file-at-point ()
774 (get-text-property (point) 'file-data))
56d81fe5 775
7755d7f1 776(defun stgit-patches-marked-or-at-point ()
d51722b7 777 "Return the symbols of the marked patches, or the patch on the current line."
7755d7f1 778 (if stgit-marked-patches
d51722b7 779 stgit-marked-patches
2c862b07 780 (let ((patch (stgit-patch-name-at-point)))
7755d7f1
KH
781 (if patch
782 (list patch)
783 '()))))
784
a9089e68 785(defun stgit-goto-patch (patchsym &optional file)
d51722b7 786 "Move point to the line containing patch PATCHSYM.
a9089e68
GH
787If that patch cannot be found, do nothing.
788
789If the patch was found and FILE is not nil, instead move to that
790file's line. If FILE cannot be found, stay on the line of
791PATCHSYM."
f9b82d36
DK
792 (let ((node (ewoc-nth stgit-ewoc 0)))
793 (while (and node (not (eq (stgit-patch-name (ewoc-data node))
794 patchsym)))
795 (setq node (ewoc-next stgit-ewoc node)))
a9089e68
GH
796 (when (and node file)
797 (let* ((file-ewoc (stgit-patch-files-ewoc (ewoc-data node)))
798 (file-node (ewoc-nth file-ewoc 0)))
799 (while (and file-node (not (equal (stgit-file-file (ewoc-data file-node)) file)))
800 (setq file-node (ewoc-next file-ewoc file-node)))
801 (when file-node
802 (ewoc-goto-node file-ewoc file-node)
803 (move-to-column (stgit-goal-column))
804 (setq node nil))))
f9b82d36
DK
805 (when node
806 (ewoc-goto-node stgit-ewoc node)
d51722b7 807 (move-to-column goal-column))))
56d81fe5 808
1c2426dc 809(defun stgit-init ()
a53347d9 810 "Run stg init."
1c2426dc
DK
811 (interactive)
812 (stgit-capture-output nil
b0424080 813 (stgit-run "init"))
1f0bf00f 814 (stgit-reload))
1c2426dc 815
6df83d42 816(defun stgit-mark ()
a53347d9 817 "Mark the patch under point."
6df83d42 818 (interactive)
8036afdd 819 (let* ((node (ewoc-locate stgit-ewoc))
64ada6f5
GH
820 (patch (ewoc-data node))
821 (name (stgit-patch-name patch)))
822 (when (eq name :work)
823 (error "Cannot mark the work tree"))
824 (when (eq name :index)
825 (error "Cannot mark the index"))
8036afdd
DK
826 (stgit-add-mark (stgit-patch-name patch))
827 (ewoc-invalidate stgit-ewoc node))
378a003d 828 (stgit-next-patch))
6df83d42 829
9b151b27 830(defun stgit-unmark-up ()
a53347d9 831 "Remove mark from the patch on the previous line."
6df83d42 832 (interactive)
378a003d 833 (stgit-previous-patch)
8036afdd
DK
834 (let* ((node (ewoc-locate stgit-ewoc))
835 (patch (ewoc-data node)))
836 (stgit-remove-mark (stgit-patch-name patch))
837 (ewoc-invalidate stgit-ewoc node))
838 (move-to-column (stgit-goal-column)))
9b151b27
GH
839
840(defun stgit-unmark-down ()
a53347d9 841 "Remove mark from the patch on the current line."
9b151b27 842 (interactive)
8036afdd
DK
843 (let* ((node (ewoc-locate stgit-ewoc))
844 (patch (ewoc-data node)))
845 (stgit-remove-mark (stgit-patch-name patch))
846 (ewoc-invalidate stgit-ewoc node))
1288eda2 847 (stgit-next-patch))
6df83d42 848
56d81fe5 849(defun stgit-rename (name)
018fa1ac 850 "Rename the patch under point to NAME."
64ada6f5
GH
851 (interactive (list
852 (read-string "Patch name: "
853 (symbol-name (stgit-patch-name-at-point t t)))))
854 (let ((old-patchsym (stgit-patch-name-at-point t t)))
56d81fe5 855 (stgit-capture-output nil
d51722b7
GH
856 (stgit-run "rename" old-patchsym name))
857 (let ((name-sym (intern name)))
858 (when (memq old-patchsym stgit-expanded-patches)
378a003d 859 (setq stgit-expanded-patches
d51722b7
GH
860 (cons name-sym (delq old-patchsym stgit-expanded-patches))))
861 (when (memq old-patchsym stgit-marked-patches)
378a003d 862 (setq stgit-marked-patches
d51722b7
GH
863 (cons name-sym (delq old-patchsym stgit-marked-patches))))
864 (stgit-reload)
865 (stgit-goto-patch name-sym))))
56d81fe5 866
408fa7cb
GH
867(defun stgit-reload-or-repair (repair)
868 "Update the contents of the StGit buffer (`stgit-reload').
869
870With a prefix argument, repair the StGit metadata if the branch
871was modified with git commands (`stgit-repair')."
872 (interactive "P")
873 (if repair
874 (stgit-repair)
875 (stgit-reload)))
876
26201d96 877(defun stgit-repair ()
a53347d9 878 "Run stg repair."
26201d96
DK
879 (interactive)
880 (stgit-capture-output nil
b0424080 881 (stgit-run "repair"))
1f0bf00f 882 (stgit-reload))
26201d96 883
adeef6bc
GH
884(defun stgit-available-branches ()
885 "Returns a list of the available stg branches"
886 (let ((output (with-output-to-string
887 (stgit-run "branch" "--list")))
888 (start 0)
889 result)
890 (while (string-match "^>?\\s-+s\\s-+\\(\\S-+\\)" output start)
891 (setq result (cons (match-string 1 output) result))
892 (setq start (match-end 0)))
893 result))
894
895(defun stgit-branch (branch)
896 "Switch to branch BRANCH."
897 (interactive (list (completing-read "Switch to branch: "
898 (stgit-available-branches))))
899 (stgit-capture-output nil (stgit-run "branch" "--" branch))
900 (stgit-reload))
901
41c1c59c
GH
902(defun stgit-commit (count)
903 "Run stg commit on COUNT commits.
e552cb5f
GH
904Interactively, the prefix argument is used as COUNT.
905A negative COUNT will uncommit instead."
41c1c59c 906 (interactive "p")
e552cb5f
GH
907 (if (< count 0)
908 (stgit-uncommit (- count))
909 (stgit-capture-output nil (stgit-run "commit" "-n" count))
910 (stgit-reload)))
911
912(defun stgit-uncommit (count)
913 "Run stg uncommit on COUNT commits.
914Interactively, the prefix argument is used as COUNT.
915A negative COUNT will commit instead."
916 (interactive "p")
917 (if (< count 0)
918 (stgit-commit (- count))
919 (stgit-capture-output nil (stgit-run "uncommit" "-n" count))
920 (stgit-reload)))
c4aad9a7 921
3959a095
GH
922(defun stgit-revert-file ()
923 "Revert the file at point, which must be in the index or the
924working tree."
925 (interactive)
926 (let* ((patched-file (or (stgit-patched-file-at-point)
927 (error "No file on the current line")))
928 (patch-name (stgit-patch-name-at-point))
929 (file-status (stgit-file-status patched-file))
930 (rm-file (cond ((stgit-file-copy-or-rename patched-file)
931 (stgit-file-cr-to patched-file))
932 ((eq file-status 'add)
933 (stgit-file-file patched-file))))
934 (co-file (cond ((eq file-status 'rename)
935 (stgit-file-cr-from patched-file))
936 ((not (memq file-status '(copy add)))
937 (stgit-file-file patched-file)))))
938
939 (unless (memq patch-name '(:work :index))
940 (error "No index or working tree file on this line"))
941
d9473917
GH
942 (when (eq file-status 'ignore)
943 (error "Cannot revert ignored files"))
944
945 (when (eq file-status 'unknown)
946 (error "Cannot revert unknown files"))
947
3959a095
GH
948 (let ((nfiles (+ (if rm-file 1 0) (if co-file 1 0))))
949 (when (yes-or-no-p (format "Revert %d file%s? "
950 nfiles
951 (if (= nfiles 1) "" "s")))
952 (stgit-capture-output nil
953 (when rm-file
954 (stgit-run-git "rm" "-f" "-q" "--" rm-file))
955 (when co-file
956 (stgit-run-git "checkout" "HEAD" co-file)))
957 (stgit-reload)))))
958
51783171
GH
959(defun stgit-resolve-file ()
960 "Resolve conflict in the file at point."
961 (interactive)
962 (let* ((patched-file (stgit-patched-file-at-point))
963 (patch (stgit-patch-at-point))
964 (patch-name (and patch (stgit-patch-name patch)))
965 (status (and patched-file (stgit-file-status patched-file))))
966
967 (unless (memq patch-name '(:work :index))
968 (error "No index or working tree file on this line"))
969
970 (unless (eq status 'unmerged)
971 (error "No conflict to resolve at the current line"))
972
973 (stgit-capture-output nil
974 (stgit-move-change-to-index (stgit-file-file patched-file)))
975
976 (stgit-reload)))
977
0b661144
DK
978(defun stgit-push-next (npatches)
979 "Push the first unapplied patch.
980With numeric prefix argument, push that many patches."
981 (interactive "p")
d51722b7 982 (stgit-capture-output nil (stgit-run "push" "-n" npatches))
074a4fb0
GH
983 (stgit-reload)
984 (stgit-refresh-git-status))
56d81fe5 985
0b661144
DK
986(defun stgit-pop-next (npatches)
987 "Pop the topmost applied patch.
988With numeric prefix argument, pop that many patches."
989 (interactive "p")
d51722b7 990 (stgit-capture-output nil (stgit-run "pop" "-n" npatches))
074a4fb0
GH
991 (stgit-reload)
992 (stgit-refresh-git-status))
56d81fe5 993
f9182fca
KH
994(defun stgit-applied-at-point ()
995 "Is the patch on the current line applied?"
996 (save-excursion
997 (beginning-of-line)
998 (looking-at "[>+]")))
999
1000(defun stgit-push-or-pop ()
a53347d9 1001 "Push or pop the patch on the current line."
f9182fca 1002 (interactive)
2c862b07 1003 (let ((patchsym (stgit-patch-name-at-point t))
f9182fca
KH
1004 (applied (stgit-applied-at-point)))
1005 (stgit-capture-output nil
d51722b7 1006 (stgit-run (if applied "pop" "push") patchsym))
1f0bf00f 1007 (stgit-reload)))
f9182fca 1008
c7adf5ef 1009(defun stgit-goto ()
a53347d9 1010 "Go to the patch on the current line."
c7adf5ef 1011 (interactive)
2c862b07 1012 (let ((patchsym (stgit-patch-name-at-point t)))
c7adf5ef 1013 (stgit-capture-output nil
d51722b7 1014 (stgit-run "goto" patchsym))
1f0bf00f 1015 (stgit-reload)))
c7adf5ef 1016
d51722b7 1017(defun stgit-id (patchsym)
50d88c67
DK
1018 "Return the git commit id for PATCHSYM.
1019If PATCHSYM is a keyword, returns PATCHSYM unmodified."
1020 (if (keywordp patchsym)
1021 patchsym
1022 (let ((result (with-output-to-string
1023 (stgit-run-silent "id" patchsym))))
1024 (unless (string-match "^\\([0-9A-Fa-f]\\{40\\}\\)$" result)
1025 (error "Cannot find commit id for %s" patchsym))
1026 (match-string 1 result))))
378a003d 1027
56d81fe5 1028(defun stgit-show ()
a53347d9 1029 "Show the patch on the current line."
56d81fe5
DK
1030 (interactive)
1031 (stgit-capture-output "*StGit patch*"
50d88c67
DK
1032 (case (get-text-property (point) 'entry-type)
1033 ('file
3164eec6
DK
1034 (let* ((patched-file (stgit-patched-file-at-point))
1035 (patch-name (stgit-patch-name-at-point))
1036 (patch-id (stgit-id patch-name))
1037 (args (append (and (stgit-file-cr-from patched-file)
7567401c 1038 (list (stgit-find-copies-harder-diff-arg)))
b894e680
DK
1039 (cond ((eq patch-id :index)
1040 '("--cached"))
1041 ((eq patch-id :work)
1042 nil)
1043 (t
1044 (list (concat patch-id "^") patch-id)))
3164eec6
DK
1045 '("--")
1046 (if (stgit-file-copy-or-rename patched-file)
1047 (list (stgit-file-cr-from patched-file)
1048 (stgit-file-cr-to patched-file))
1049 (list (stgit-file-file patched-file))))))
1050 (apply 'stgit-run-git "diff" args)))
50d88c67 1051 ('patch
4713c50e
GH
1052 (let* ((patch-name (stgit-patch-name-at-point))
1053 (patch-id (stgit-id patch-name)))
1054 (if (or (eq patch-id :index) (eq patch-id :work))
1055 (apply 'stgit-run-git "diff"
1056 (stgit-find-copies-harder-diff-arg)
1057 (and (eq patch-id :index)
1058 '("--cached")))
1059 (stgit-run "show" "-O" "--patch-with-stat" "-O" "-M"
1060 (stgit-patch-name-at-point)))))
50d88c67
DK
1061 (t
1062 (error "No patch or file at point")))
1063 (with-current-buffer standard-output
1064 (goto-char (point-min))
1065 (diff-mode))))
0663524d 1066
fd9fe574 1067(defun stgit-move-change-to-index (file)
37cb5766 1068 "Copies the workspace state of FILE to index, using git add or git rm"
306b37a6
GH
1069 (let ((op (if (or (file-exists-p file) (file-symlink-p file))
1070 '("add") '("rm" "-q"))))
37cb5766 1071 (stgit-capture-output "*git output*"
5115dea0 1072 (apply 'stgit-run-git (append op '("--") (list file))))))
37cb5766 1073
fd9fe574 1074(defun stgit-remove-change-from-index (file)
37cb5766
DK
1075 "Unstages the change in FILE from the index"
1076 (stgit-capture-output "*git output*"
1077 (stgit-run-git "reset" "-q" "--" file)))
1078
1079(defun stgit-file-toggle-index ()
a9089e68
GH
1080 "Move modified file in or out of the index.
1081
1082Leaves the point where it is, but moves the mark to where the
1083file ended up. You can then jump to the file with \
1084\\[exchange-point-and-mark]."
37cb5766
DK
1085 (interactive)
1086 (let ((patched-file (stgit-patched-file-at-point)))
1087 (unless patched-file
1088 (error "No file on the current line"))
51783171
GH
1089 (when (eq (stgit-file-status patched-file) 'unmerged)
1090 (error (substitute-command-keys "Use \\[stgit-resolve-file] to move an unmerged file to the index")))
d9473917
GH
1091 (when (eq (stgit-file-status patched-file) 'ignore)
1092 (error "You cannot add ignored files to the index"))
a9089e68
GH
1093 (let* ((patch (stgit-patch-at-point))
1094 (patch-name (stgit-patch-name patch))
1095 (old-point (point))
1096 next-file)
1097
1098 ;; find the next file in the patch, or the previous one if this
1099 ;; was the last file
1100 (and (zerop (forward-line 1))
1101 (let ((f (stgit-patched-file-at-point)))
1102 (and f (setq next-file (stgit-file-file f)))))
1103 (goto-char old-point)
1104 (unless next-file
1105 (and (zerop (forward-line -1))
1106 (let ((f (stgit-patched-file-at-point)))
1107 (and f (setq next-file (stgit-file-file f)))))
1108 (goto-char old-point))
1109
37cb5766 1110 (cond ((eq patch-name :work)
fd9fe574 1111 (stgit-move-change-to-index (stgit-file-file patched-file)))
37cb5766 1112 ((eq patch-name :index)
fd9fe574 1113 (stgit-remove-change-from-index (stgit-file-file patched-file)))
37cb5766 1114 (t
a9089e68
GH
1115 (error "Can only move files in the working tree to index")))
1116 (stgit-refresh-worktree)
1117 (stgit-refresh-index)
1118 (stgit-goto-patch (if (eq patch-name :index) :work :index)
1119 (stgit-file-file patched-file))
1120 (push-mark nil t t)
1121 (stgit-goto-patch patch-name next-file))))
37cb5766 1122
0bca35c8 1123(defun stgit-edit ()
a53347d9 1124 "Edit the patch on the current line."
0bca35c8 1125 (interactive)
64ada6f5 1126 (let ((patchsym (stgit-patch-name-at-point t t))
0780be79 1127 (edit-buf (get-buffer-create "*StGit edit*"))
0bca35c8
DK
1128 (dir default-directory))
1129 (log-edit 'stgit-confirm-edit t nil edit-buf)
d51722b7 1130 (set (make-local-variable 'stgit-edit-patchsym) patchsym)
0bca35c8
DK
1131 (setq default-directory dir)
1132 (let ((standard-output edit-buf))
d51722b7 1133 (stgit-run-silent "edit" "--save-template=-" patchsym))))
0bca35c8
DK
1134
1135(defun stgit-confirm-edit ()
1136 (interactive)
1137 (let ((file (make-temp-file "stgit-edit-")))
1138 (write-region (point-min) (point-max) file)
1139 (stgit-capture-output nil
d51722b7 1140 (stgit-run "edit" "-f" file stgit-edit-patchsym))
0bca35c8 1141 (with-current-buffer log-edit-parent-buffer
1f0bf00f 1142 (stgit-reload))))
0bca35c8 1143
aa04f831
GH
1144(defun stgit-new (add-sign)
1145 "Create a new patch.
1146With a prefix argument, include a \"Signed-off-by:\" line at the
1147end of the patch."
1148 (interactive "P")
c5d45b92
GH
1149 (let ((edit-buf (get-buffer-create "*StGit edit*"))
1150 (dir default-directory))
1151 (log-edit 'stgit-confirm-new t nil edit-buf)
aa04f831
GH
1152 (setq default-directory dir)
1153 (when add-sign
1154 (save-excursion
1155 (let ((standard-output (current-buffer)))
1156 (stgit-run-silent "new" "--sign" "--save-template=-"))))))
64c097a0
DK
1157
1158(defun stgit-confirm-new ()
1159 (interactive)
27b0f9e4 1160 (let ((file (make-temp-file "stgit-edit-")))
64c097a0
DK
1161 (write-region (point-min) (point-max) file)
1162 (stgit-capture-output nil
27b0f9e4 1163 (stgit-run "new" "-f" file))
64c097a0 1164 (with-current-buffer log-edit-parent-buffer
1f0bf00f 1165 (stgit-reload))))
64c097a0
DK
1166
1167(defun stgit-create-patch-name (description)
1168 "Create a patch name from a long description"
1169 (let ((patch ""))
1170 (while (> (length description) 0)
1171 (cond ((string-match "\\`[a-zA-Z_-]+" description)
8439f657
GH
1172 (setq patch (downcase (concat patch
1173 (match-string 0 description))))
64c097a0
DK
1174 (setq description (substring description (match-end 0))))
1175 ((string-match "\\` +" description)
1176 (setq patch (concat patch "-"))
1177 (setq description (substring description (match-end 0))))
1178 ((string-match "\\`[^a-zA-Z_-]+" description)
1179 (setq description (substring description (match-end 0))))))
1180 (cond ((= (length patch) 0)
1181 "patch")
1182 ((> (length patch) 20)
1183 (substring patch 0 20))
1184 (t patch))))
0bca35c8 1185
9008e45b 1186(defun stgit-delete (patchsyms &optional spill-p)
d51722b7 1187 "Delete the patches in PATCHSYMS.
9008e45b
GH
1188Interactively, delete the marked patches, or the patch at point.
1189
1190With a prefix argument, or SPILL-P, spill the patch contents to
1191the work tree and index."
1192 (interactive (list (stgit-patches-marked-or-at-point)
1193 current-prefix-arg))
e7231e4f
GH
1194 (unless patchsyms
1195 (error "No patches to delete"))
64ada6f5
GH
1196 (when (memq :index patchsyms)
1197 (error "Cannot delete the index"))
1198 (when (memq :work patchsyms)
1199 (error "Cannot delete the work tree"))
1200
d51722b7 1201 (let ((npatches (length patchsyms)))
9008e45b 1202 (when (yes-or-no-p (format "Really delete %d patch%s%s? "
e7231e4f 1203 npatches
9008e45b
GH
1204 (if (= 1 npatches) "" "es")
1205 (if spill-p
1206 " (spilling contents to index)"
1207 "")))
1208 (let ((args (if spill-p
1209 (cons "--spill" patchsyms)
1210 patchsyms)))
1211 (stgit-capture-output nil
1212 (apply 'stgit-run "delete" args))
1213 (stgit-reload)))))
d51722b7 1214
7cc45294
GH
1215(defun stgit-move-patches-target ()
1216 "Return the patchsym indicating a target patch for
1217`stgit-move-patches'.
1218
1219This is either the patch at point, or one of :top and :bottom, if
1220the point is after or before the applied patches."
1221
2c862b07 1222 (let ((patchsym (stgit-patch-name-at-point)))
7cc45294
GH
1223 (cond (patchsym patchsym)
1224 ((save-excursion (re-search-backward "^>" nil t)) :top)
1225 (t :bottom))))
1226
95369f6c
GH
1227(defun stgit-sort-patches (patchsyms)
1228 "Returns the list of patches in PATCHSYMS sorted according to
1229their position in the patch series, bottommost first.
1230
1231PATCHSYMS may not contain duplicate entries."
1232 (let (sorted-patchsyms
1233 (series (with-output-to-string
1234 (with-current-buffer standard-output
1235 (stgit-run-silent "series" "--noprefix"))))
1236 start)
1237 (while (string-match "^\\(.+\\)" series start)
1238 (let ((patchsym (intern (match-string 1 series))))
1239 (when (memq patchsym patchsyms)
1240 (setq sorted-patchsyms (cons patchsym sorted-patchsyms))))
1241 (setq start (match-end 0)))
1242 (setq sorted-patchsyms (nreverse sorted-patchsyms))
1243
1244 (unless (= (length patchsyms) (length sorted-patchsyms))
1245 (error "Internal error"))
1246
1247 sorted-patchsyms))
1248
7cc45294
GH
1249(defun stgit-move-patches (patchsyms target-patch)
1250 "Move the patches in PATCHSYMS to below TARGET-PATCH.
1251If TARGET-PATCH is :bottom or :top, move the patches to the
1252bottom or top of the stack, respectively.
1253
1254Interactively, move the marked patches to where the point is."
1255 (interactive (list stgit-marked-patches
1256 (stgit-move-patches-target)))
1257 (unless patchsyms
1258 (error "Need at least one patch to move"))
1259
1260 (unless target-patch
1261 (error "Point not at a patch"))
1262
1263 (if (eq target-patch :top)
1264 (stgit-capture-output nil
1265 (apply 'stgit-run "float" patchsyms))
1266
1267 ;; need to have patchsyms sorted by position in the stack
95369f6c 1268 (let ((sorted-patchsyms (stgit-sort-patches patchsyms)))
7cc45294
GH
1269 (while sorted-patchsyms
1270 (setq sorted-patchsyms
1271 (and (stgit-capture-output nil
1272 (if (eq target-patch :bottom)
1273 (stgit-run "sink" "--" (car sorted-patchsyms))
1274 (stgit-run "sink" "--to" target-patch "--"
1275 (car sorted-patchsyms))))
1276 (cdr sorted-patchsyms))))))
1277 (stgit-reload))
1278
594aa463
KH
1279(defun stgit-squash (patchsyms)
1280 "Squash the patches in PATCHSYMS.
693d179b
GH
1281Interactively, squash the marked patches.
1282
1283Unless there are any conflicts, the patches will be merged into
1284one patch, which will occupy the same spot in the series as the
1285deepest patch had before the squash."
d51722b7
GH
1286 (interactive (list stgit-marked-patches))
1287 (when (< (length patchsyms) 2)
594aa463 1288 (error "Need at least two patches to squash"))
32d7545d
GH
1289 (let ((stgit-buffer (current-buffer))
1290 (edit-buf (get-buffer-create "*StGit edit*"))
693d179b
GH
1291 (dir default-directory)
1292 (sorted-patchsyms (stgit-sort-patches patchsyms)))
594aa463 1293 (log-edit 'stgit-confirm-squash t nil edit-buf)
693d179b 1294 (set (make-local-variable 'stgit-patchsyms) sorted-patchsyms)
ea0def18 1295 (setq default-directory dir)
32d7545d
GH
1296 (let ((result (let ((standard-output edit-buf))
1297 (apply 'stgit-run-silent "squash"
1298 "--save-template=-" sorted-patchsyms))))
1299
1300 ;; stg squash may have reordered the patches or caused conflicts
1301 (with-current-buffer stgit-buffer
1302 (stgit-reload))
1303
1304 (unless (eq 0 result)
1305 (fundamental-mode)
1306 (rename-buffer "*StGit error*")
1307 (resize-temp-buffer-window)
1308 (switch-to-buffer-other-window stgit-buffer)
1309 (error "stg squash failed")))))
ea0def18 1310
594aa463 1311(defun stgit-confirm-squash ()
ea0def18
DK
1312 (interactive)
1313 (let ((file (make-temp-file "stgit-edit-")))
1314 (write-region (point-min) (point-max) file)
1315 (stgit-capture-output nil
594aa463 1316 (apply 'stgit-run "squash" "-f" file stgit-patchsyms))
ea0def18 1317 (with-current-buffer log-edit-parent-buffer
e6b1fdae
DK
1318 (stgit-clear-marks)
1319 ;; Go to first marked patch and stay there
1320 (goto-char (point-min))
1321 (re-search-forward (concat "^[>+-]\\*") nil t)
1322 (move-to-column goal-column)
1323 (let ((pos (point)))
1f0bf00f 1324 (stgit-reload)
e6b1fdae 1325 (goto-char pos)))))
ea0def18 1326
0663524d
KH
1327(defun stgit-help ()
1328 "Display help for the StGit mode."
1329 (interactive)
1330 (describe-function 'stgit-mode))
3a59f3db 1331
83e51dbf
DK
1332(defun stgit-undo (&optional arg)
1333 "Run stg undo.
1334With prefix argument, run it with the --hard flag."
1335 (interactive "P")
1336 (stgit-capture-output nil
1337 (if arg
1338 (stgit-run "undo" "--hard")
1339 (stgit-run "undo")))
1f0bf00f 1340 (stgit-reload))
83e51dbf 1341
4d73c4d8
DK
1342(defun stgit-refresh (&optional arg)
1343 "Run stg refresh.
36a4eacd
GH
1344If the index contains any changes, only refresh from index.
1345
a53347d9 1346With prefix argument, refresh the marked patch or the patch under point."
4d73c4d8
DK
1347 (interactive "P")
1348 (let ((patchargs (if arg
b0424080
GH
1349 (let ((patches (stgit-patches-marked-or-at-point)))
1350 (cond ((null patches)
df283a8b 1351 (error "No patch to update"))
b0424080 1352 ((> (length patches) 1)
df283a8b 1353 (error "Too many patches selected"))
b0424080
GH
1354 (t
1355 (cons "-p" patches))))
1356 nil)))
36a4eacd
GH
1357 (unless (stgit-index-empty-p)
1358 (setq patchargs (cons "--index" patchargs)))
4d73c4d8 1359 (stgit-capture-output nil
074a4fb0
GH
1360 (apply 'stgit-run "refresh" patchargs))
1361 (stgit-refresh-git-status))
4d73c4d8
DK
1362 (stgit-reload))
1363
8f702de4
GH
1364(defcustom stgit-show-worktree-mode 'center
1365 "This variable controls where the \"Index\" and \"Work tree\"
1366will be shown on in the buffer.
1367
1368It can be set to 'top (above all patches), 'center (show between
1369applied and unapplied patches), and 'bottom (below all patches).
1370
1371See also `stgit-show-worktree'."
1372 :type '(radio (const :tag "above all patches (top)" top)
1373 (const :tag "between applied and unapplied patches (center)"
1374 center)
1375 (const :tag "below all patches (bottom)" bottom))
1376 :group 'stgit)
1377
ce3b6130
DK
1378(defcustom stgit-default-show-worktree
1379 nil
1380 "Set to non-nil to by default show the working tree in a new stgit buffer.
1381
1382This value is used as the default value for `stgit-show-worktree'."
1383 :type 'boolean
1384 :group 'stgit)
1385
1386(defvar stgit-show-worktree nil
8f702de4 1387 "If nil, inhibit showing work tree and index in the stgit buffer.
ce3b6130 1388
8f702de4 1389See also `stgit-show-worktree-mode'.")
ce3b6130 1390
d9473917
GH
1391(defvar stgit-show-ignored nil
1392 "If nil, inhibit showing files ignored by git.")
1393
1394(defvar stgit-show-unknown nil
1395 "If nil, inhibit showing files not registered with git.")
1396
ce3b6130
DK
1397(defun stgit-toggle-worktree (&optional arg)
1398 "Toggle the visibility of the work tree.
1399With arg, show the work tree if arg is positive.
1400
8f702de4
GH
1401Its initial setting is controlled by `stgit-default-show-worktree'.
1402
1403`stgit-show-worktree-mode' controls where on screen the index and
1404work tree will show up."
ce3b6130
DK
1405 (interactive)
1406 (setq stgit-show-worktree
1407 (if (numberp arg)
1408 (> arg 0)
1409 (not stgit-show-worktree)))
1410 (stgit-reload))
1411
d9473917
GH
1412(defun stgit-toggle-ignored (&optional arg)
1413 "Toggle the visibility of files ignored by git in the work
1414tree. With ARG, show these files if ARG is positive.
1415
1416Use \\[stgit-toggle-worktree] to show the work tree."
1417 (interactive)
1418 (setq stgit-show-ignored
1419 (if (numberp arg)
1420 (> arg 0)
1421 (not stgit-show-ignored)))
1422 (stgit-reload))
1423
1424(defun stgit-toggle-unknown (&optional arg)
1425 "Toggle the visibility of files not registered with git in the
1426work tree. With ARG, show these files if ARG is positive.
1427
1428Use \\[stgit-toggle-worktree] to show the work tree."
1429 (interactive)
1430 (setq stgit-show-unknown
1431 (if (numberp arg)
1432 (> arg 0)
1433 (not stgit-show-unknown)))
1434 (stgit-reload))
1435
3a59f3db 1436(provide 'stgit)