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