1 ;; stgit.el: An emacs mode for StGit
3 ;; Copyright (C) 2007 David Kågedal <davidk@lysator.liu.se>
5 ;; To install: put this file on the load-path and place the following
6 ;; in your .emacs file:
10 ;; To start: `M-x stgit'
12 (when (< emacs-major-version 22)
13 (error "Emacs older than 22 is not supported by stgit.el"))
20 "Manage StGit patches for the tree in DIR."
21 (interactive "DDirectory: \n")
22 (switch-to-stgit-buffer (git-get-top-dir dir))
25 (unless (fboundp 'git-get-top-dir)
26 (defun git-get-top-dir (dir)
27 "Retrieve the top-level directory of a git tree."
28 (let ((cdup (with-output-to-string
29 (with-current-buffer standard-output
31 (unless (eq 0 (call-process "git" nil t nil
32 "rev-parse" "--show-cdup"))
33 (error "Cannot find top-level git tree for %s" dir))))))
34 (expand-file-name (concat (file-name-as-directory dir)
35 (car (split-string cdup "\n")))))))
37 (defun stgit-refresh-git-status (&optional dir)
38 "If it exists, refresh the `git-status' buffer belonging to
39 directory DIR or `default-directory'"
40 (when (and (fboundp 'git-find-status-buffer)
41 (fboundp 'git-refresh-status))
42 (let* ((top-dir (git-get-top-dir (or dir default-directory)))
43 (git-status-buffer (and top-dir (git-find-status-buffer top-dir))))
44 (when git-status-buffer
45 (with-current-buffer git-status-buffer
46 (git-refresh-status))))))
48 (defun stgit-find-buffer (dir)
49 "Return the buffer displaying StGit patches for DIR, or nil if none."
50 (setq dir (file-name-as-directory dir))
51 (let ((buffers (buffer-list)))
53 (not (with-current-buffer (car buffers)
54 (and (eq major-mode 'stgit-mode)
55 (string= default-directory dir)))))
56 (setq buffers (cdr buffers)))
57 (and buffers (car buffers))))
59 (defun switch-to-stgit-buffer (dir)
60 "Switch to a (possibly new) buffer displaying StGit patches for DIR."
61 (setq dir (file-name-as-directory dir))
62 (let ((buffer (stgit-find-buffer dir)))
63 (switch-to-buffer (or buffer
64 (create-stgit-buffer dir)))))
66 (defstruct (stgit-patch)
67 status name desc empty files-ewoc)
69 (defun stgit-patch-pp (patch)
70 (let* ((status (stgit-patch-status patch))
72 (name (stgit-patch-name patch))
73 (face (cdr (assq status stgit-patch-status-face-alist))))
79 (if (memq name stgit-marked-patches)
81 (if (memq status '(index work))
82 (insert (propertize (if (eq status 'index) "Index" "Work tree")
84 (insert (format "%-30s"
85 (propertize (symbol-name name)
87 'syntax-table (string-to-syntax "w")))
89 (if (stgit-patch-empty patch) "(empty) " "")
90 (propertize (or (stgit-patch-desc patch) "")
91 'face 'stgit-description-face)))
93 (put-text-property start (point) 'entry-type 'patch)
94 (when (memq name stgit-expanded-patches)
95 (stgit-insert-patch-files patch))
96 (put-text-property start (point) 'patch-data patch)))
98 (defun create-stgit-buffer (dir)
99 "Create a buffer for showing StGit patches.
100 Argument DIR is the repository path."
101 (let ((buf (create-file-buffer (concat dir "*stgit*")))
102 (inhibit-read-only t))
103 (with-current-buffer buf
104 (setq default-directory dir)
106 (set (make-local-variable 'stgit-ewoc)
107 (ewoc-create #'stgit-patch-pp "Branch:\n\n" "--\n" t))
108 (setq buffer-read-only t))
111 (defmacro stgit-capture-output (name &rest body)
112 "Capture StGit output and, if there was any output, show it in a window
114 Returns nil if there was no output."
115 (declare (debug ([&or stringp null] body))
117 `(let ((output-buf (get-buffer-create ,(or name "*StGit output*")))
118 (stgit-dir default-directory)
119 (inhibit-read-only t))
120 (with-current-buffer output-buf
122 (setq default-directory stgit-dir)
123 (setq buffer-read-only t))
124 (let ((standard-output output-buf))
126 (with-current-buffer output-buf
127 (set-buffer-modified-p nil)
128 (setq buffer-read-only t)
129 (if (< (point-min) (point-max))
130 (display-buffer output-buf t)))))
132 (defun stgit-make-run-args (args)
133 "Return a copy of ARGS with its elements converted to strings."
135 ;; don't use (format "%s" ...) to limit type errors
136 (cond ((stringp x) x)
137 ((integerp x) (number-to-string x))
138 ((symbolp x) (symbol-name x))
140 (error "Bad element in stgit-make-run-args args: %S" x))))
143 (defun stgit-run-silent (&rest args)
144 (setq args (stgit-make-run-args args))
145 (apply 'call-process "stg" nil standard-output nil args))
147 (defun stgit-run (&rest args)
148 (setq args (stgit-make-run-args args))
149 (let ((msgcmd (mapconcat #'identity args " ")))
150 (message "Running stg %s..." msgcmd)
151 (apply 'call-process "stg" nil standard-output nil args)
152 (message "Running stg %s...done" msgcmd)))
154 (defun stgit-run-git (&rest args)
155 (setq args (stgit-make-run-args args))
156 (let ((msgcmd (mapconcat #'identity args " ")))
157 (message "Running git %s..." msgcmd)
158 (apply 'call-process "git" nil standard-output nil args)
159 (message "Running git %s...done" msgcmd)))
161 (defun stgit-run-git-silent (&rest args)
162 (setq args (stgit-make-run-args args))
163 (apply 'call-process "git" nil standard-output nil args))
165 (defun stgit-index-empty-p ()
166 "Returns non-nil if the index contains no changes from HEAD."
167 (zerop (stgit-run-git-silent "diff-index" "--cached" "--quiet" "HEAD")))
169 (defvar stgit-index-node)
170 (defvar stgit-worktree-node)
172 (defun stgit-refresh-index ()
173 (when stgit-index-node
174 (ewoc-invalidate (car stgit-index-node) (cdr stgit-index-node))))
176 (defun stgit-refresh-worktree ()
177 (when stgit-worktree-node
178 (ewoc-invalidate (car stgit-worktree-node) (cdr stgit-worktree-node))))
180 (defun stgit-run-series-insert-index (ewoc)
181 (setq index-node (cons ewoc (ewoc-enter-last ewoc
187 worktree-node (cons ewoc (ewoc-enter-last ewoc
194 (defun stgit-run-series (ewoc)
195 (setq stgit-index-node nil
196 stgit-worktree-node nil)
197 (let ((inserted-index (not stgit-show-worktree))
202 (let ((exit-status (stgit-run-silent "series" "--description" "--empty")))
203 (goto-char (point-min))
204 (if (not (zerop exit-status))
205 (cond ((looking-at "stg series: \\(.*\\)")
206 (setq inserted-index t)
207 (ewoc-set-hf ewoc (car (ewoc-get-hf ewoc))
208 (substitute-command-keys
209 "-- not initialized; run \\[stgit-init]")))
211 (error "Error running stg: %s"
215 "\\([0 ]\\)\\([>+-]\\)\\( \\)\\([^ ]+\\) *[|#] \\(.*\\)")
216 (error "Syntax error in output from stg series"))
217 (let* ((state-str (match-string 2))
218 (state (cond ((string= state-str ">") 'top)
219 ((string= state-str "+") 'applied)
220 ((string= state-str "-") 'unapplied)))
221 (name (intern (match-string 4)))
222 (desc (match-string 5))
223 (empty (string= (match-string 1) "0")))
224 (unless inserted-index
225 (when (or (eq stgit-show-worktree-mode 'top)
226 (and (eq stgit-show-worktree-mode 'center)
227 (eq state 'unapplied)))
228 (setq inserted-index t)
229 (stgit-run-series-insert-index ewoc)))
230 (setq all-patchsyms (cons name all-patchsyms))
231 (ewoc-enter-last ewoc
238 (unless inserted-index
239 (stgit-run-series-insert-index ewoc)))
240 (setq stgit-index-node index-node
241 stgit-worktree-node worktree-node
242 stgit-marked-patches (intersection stgit-marked-patches
245 (defun stgit-reload ()
246 "Update the contents of the StGit buffer."
248 (let ((inhibit-read-only t)
249 (curline (line-number-at-pos))
250 (curpatch (stgit-patch-name-at-point))
251 (curfile (stgit-patched-file-at-point)))
252 (ewoc-filter stgit-ewoc #'(lambda (x) nil))
253 (ewoc-set-hf stgit-ewoc
257 (stgit-run-silent "branch")
258 (buffer-substring (point-min) (1- (point-max))))
259 'face 'stgit-branch-name-face)
261 (if stgit-show-worktree
264 (substitute-command-keys "--\n\"\\[stgit-toggle-worktree]\"\
265 shows the working tree\n")
266 'face 'stgit-description-face)))
267 (stgit-run-series stgit-ewoc)
269 (stgit-goto-patch curpatch (and curfile (stgit-file-file curfile)))
270 (goto-line curline)))
271 (stgit-refresh-git-status))
274 "A user interface for the StGit patch maintenance tool."
277 (defface stgit-description-face
278 '((((background dark)) (:foreground "tan"))
279 (((background light)) (:foreground "dark red")))
280 "The face used for StGit descriptions"
283 (defface stgit-branch-name-face
285 "The face used for the StGit branch name"
288 (defface stgit-top-patch-face
289 '((((background dark)) (:weight bold :foreground "yellow"))
290 (((background light)) (:weight bold :foreground "purple"))
292 "The face used for the top patch names"
295 (defface stgit-applied-patch-face
296 '((((background dark)) (:foreground "light yellow"))
297 (((background light)) (:foreground "purple"))
299 "The face used for applied patch names"
302 (defface stgit-unapplied-patch-face
303 '((((background dark)) (:foreground "gray80"))
304 (((background light)) (:foreground "orchid"))
306 "The face used for unapplied patch names"
309 (defface stgit-modified-file-face
310 '((((class color) (background light)) (:foreground "purple"))
311 (((class color) (background dark)) (:foreground "salmon")))
312 "StGit mode face used for modified file status"
315 (defface stgit-unmerged-file-face
316 '((((class color) (background light)) (:foreground "red" :bold t))
317 (((class color) (background dark)) (:foreground "red" :bold t)))
318 "StGit mode face used for unmerged file status"
321 (defface stgit-unknown-file-face
322 '((((class color) (background light)) (:foreground "goldenrod" :bold t))
323 (((class color) (background dark)) (:foreground "goldenrod" :bold t)))
324 "StGit mode face used for unknown file status"
327 (defface stgit-ignored-file-face
328 '((((class color) (background light)) (:foreground "grey60"))
329 (((class color) (background dark)) (:foreground "grey40")))
330 "StGit mode face used for ignored files")
332 (defface stgit-file-permission-face
333 '((((class color) (background light)) (:foreground "green" :bold t))
334 (((class color) (background dark)) (:foreground "green" :bold t)))
335 "StGit mode face used for permission changes."
338 (defface stgit-index-work-tree-title-face
339 '((((supports :slant italic)) :slant italic)
341 "StGit mode face used for the \"Index\" and \"Work tree\" titles"
345 (defcustom stgit-find-copies-harder
347 "Try harder to find copied files when listing patches.
349 When not nil, runs git diff-tree with the --find-copies-harder
350 flag, which reduces performance."
354 (defconst stgit-file-status-code-strings
355 (mapcar (lambda (arg)
357 (propertize (cadr arg) 'face (car (cddr arg)))))
358 '((add "Added" stgit-modified-file-face)
359 (copy "Copied" stgit-modified-file-face)
360 (delete "Deleted" stgit-modified-file-face)
361 (modify "Modified" stgit-modified-file-face)
362 (rename "Renamed" stgit-modified-file-face)
363 (mode-change "Mode change" stgit-modified-file-face)
364 (unmerged "Unmerged" stgit-unmerged-file-face)
365 (unknown "Unknown" stgit-unknown-file-face)
366 (ignore "Ignored" stgit-ignored-file-face)))
367 "Alist of code symbols to description strings")
369 (defconst stgit-patch-status-face-alist
370 '((applied . stgit-applied-patch-face)
371 (top . stgit-top-patch-face)
372 (unapplied . stgit-unapplied-patch-face)
373 (index . stgit-index-work-tree-title-face)
374 (work . stgit-index-work-tree-title-face))
375 "Alist of face to use for a given patch status")
377 (defun stgit-file-status-code-as-string (file)
378 "Return stgit status code for FILE as a string"
379 (let* ((code (assq (stgit-file-status file)
380 stgit-file-status-code-strings))
381 (score (stgit-file-cr-score file)))
384 (if (and score (/= score 100))
385 (format "%s %s" (cdr code)
386 (propertize (format "%d%%" score)
387 'face 'stgit-description-face))
390 (defun stgit-file-status-code (str &optional score)
391 "Return stgit status code from git status string"
392 (let ((code (assoc str '(("A" . add)
401 (setq code (if code (cdr code) 'unknown))
402 (when (stringp score)
403 (if (> (length score) 0)
404 (setq score (string-to-number score))
406 (if score (cons code score) code)))
408 (defconst stgit-file-type-strings
411 (#o160 . "subproject"))
412 "Alist of names of file types")
414 (defun stgit-file-type-string (type)
415 "Return string describing file type TYPE (the high bits of file permission).
416 Cf. `stgit-file-type-strings' and `stgit-file-type-change-string'."
417 (let ((type-str (assoc type stgit-file-type-strings)))
418 (or (and type-str (cdr type-str))
419 (format "unknown type %o" type))))
421 (defun stgit-file-type-change-string (old-perm new-perm)
422 "Return string describing file type change from OLD-PERM to NEW-PERM.
423 Cf. `stgit-file-type-string'."
424 (let ((old-type (lsh old-perm -9))
425 (new-type (lsh new-perm -9)))
426 (cond ((= old-type new-type) "")
427 ((zerop new-type) "")
429 (if (= new-type #o100)
431 (format " (%s)" (stgit-file-type-string new-type))))
432 (t (format " (%s -> %s)"
433 (stgit-file-type-string old-type)
434 (stgit-file-type-string new-type))))))
436 (defun stgit-file-mode-change-string (old-perm new-perm)
437 "Return string describing file mode change from OLD-PERM to NEW-PERM.
438 Cf. `stgit-file-type-change-string'."
439 (setq old-perm (logand old-perm #o777)
440 new-perm (logand new-perm #o777))
441 (if (or (= old-perm new-perm)
445 (let* ((modified (logxor old-perm new-perm))
446 (not-x-modified (logand (logxor old-perm new-perm) #o666)))
447 (cond ((zerop modified) "")
448 ((and (zerop not-x-modified)
449 (or (and (eq #o111 (logand old-perm #o111))
450 (propertize "-x" 'face 'stgit-file-permission-face))
451 (and (eq #o111 (logand new-perm #o111))
452 (propertize "+x" 'face
453 'stgit-file-permission-face)))))
454 (t (concat (propertize (format "%o" old-perm)
455 'face 'stgit-file-permission-face)
457 'face 'stgit-description-face)
458 (propertize (format "%o" new-perm)
459 'face 'stgit-file-permission-face)))))))
461 (defstruct (stgit-file)
462 old-perm new-perm copy-or-rename cr-score cr-from cr-to status file)
464 (defun stgit-describe-copy-or-rename (file)
465 (let (from to common-head common-tail
467 (propertize "->" 'face 'stgit-description-face)
470 (when stgit-abbreviate-copies-and-renames
471 (setq from (split-string (stgit-file-cr-from file) "/")
472 to (split-string (stgit-file-cr-to file) "/"))
474 (while (and from to (cdr from) (cdr to)
475 (string-equal (car from) (car to)))
476 (setq common-head (cons (car from) common-head)
479 (setq common-head (nreverse common-head)
482 (while (and from to (cdr from) (cdr to)
483 (string-equal (car from) (car to)))
484 (setq common-tail (cons (car from) common-tail)
487 (setq from (nreverse from)
490 (if (or common-head common-tail)
491 (concat (if common-head
492 (mapconcat #'identity common-head "/")
494 (if common-head "/" "")
495 (propertize "{" 'face 'stgit-description-face)
496 (mapconcat #'identity from "/")
498 (mapconcat #'identity to "/")
499 (propertize "}" 'face 'stgit-description-face)
500 (if common-tail "/" "")
502 (mapconcat #'identity common-tail "/")
504 (concat (stgit-file-cr-from file) arrow (stgit-file-cr-to file)))))
506 (defun stgit-file-pp (file)
507 (let ((status (stgit-file-status file))
508 (name (if (stgit-file-copy-or-rename file)
509 (stgit-describe-copy-or-rename file)
510 (stgit-file-file file)))
511 (mode-change (stgit-file-mode-change-string
512 (stgit-file-old-perm file)
513 (stgit-file-new-perm file)))
515 (insert (format " %-12s%1s%s%s\n"
516 (stgit-file-status-code-as-string file)
519 (propertize (stgit-file-type-change-string
520 (stgit-file-old-perm file)
521 (stgit-file-new-perm file))
522 'face 'stgit-description-face)))
523 (add-text-properties start (point)
524 (list 'entry-type 'file
527 (defun stgit-find-copies-harder-diff-arg ()
528 "Return the flag to use with `git-diff' depending on the
529 `stgit-find-copies-harder' flag."
530 (if stgit-find-copies-harder "--find-copies-harder" "-C"))
532 (defun stgit-insert-ls-files (args file-flag)
533 (let ((start (point)))
534 (apply 'stgit-run-git
535 (append '("ls-files" "--exclude-standard" "-z") args))
537 (while (looking-at "\\([^\0]*\\)\0")
538 (let ((name-len (- (match-end 0) (match-beginning 0))))
539 (insert ":0 0 0000000000000000000000000000000000000000 0000000000000000000000000000000000000000 " file-flag "\0")
540 (forward-char name-len)))))
542 (defun stgit-insert-patch-files (patch)
543 "Expand (show modification of) the patch PATCH after the line
545 (let* ((patchsym (stgit-patch-name patch))
547 (args (list "-z" (stgit-find-copies-harder-diff-arg)))
548 (ewoc (ewoc-create #'stgit-file-pp nil nil t)))
549 (set-marker-insertion-type end t)
550 (setf (stgit-patch-files-ewoc patch) ewoc)
552 (apply 'stgit-run-git
553 (cond ((eq patchsym :work)
554 `("diff-files" "-0" ,@args))
555 ((eq patchsym :index)
556 `("diff-index" ,@args "--cached" "HEAD"))
558 `("diff-tree" ,@args "-r" ,(stgit-id patchsym)))))
560 (when (and (eq patchsym :work))
561 (when stgit-show-ignored
562 (stgit-insert-ls-files '("--ignored" "--others") "I"))
563 (when stgit-show-unknown
564 (stgit-insert-ls-files '("--others") "X"))
565 (sort-regexp-fields nil ":[^\0]*\0\\([^\0]*\\)\0" "\\1"
566 (point-min) (point-max)))
568 (goto-char (point-min))
569 (unless (or (eobp) (memq patchsym '(:work :index)))
571 (while (looking-at ":\\([0-7]+\\) \\([0-7]+\\) [0-9A-Fa-f]\\{40\\} [0-9A-Fa-f]\\{40\\} ")
572 (let ((old-perm (string-to-number (match-string 1) 8))
573 (new-perm (string-to-number (match-string 2) 8)))
574 (goto-char (match-end 0))
577 "\\([CR]\\)\\([0-9]*\\)\0\\([^\0]*\\)\0\\([^\0]*\\)\0")
578 (let* ((patch-status (stgit-patch-status patch))
579 (file-subexp (if (eq patch-status 'unapplied)
582 (file (match-string file-subexp)))
587 :cr-score (string-to-number (match-string 2))
588 :cr-from (match-string 3)
589 :cr-to (match-string 4)
590 :status (stgit-file-status-code
593 ((looking-at "\\([ABD-QS-Z]\\)\0\\([^\0]*\\)\0")
601 :status (stgit-file-status-code
603 :file (match-string 2))))))
604 (goto-char (match-end 0))
605 (ewoc-enter-last ewoc file))))
607 (unless (ewoc-nth ewoc 0)
610 (propertize "<no files>"
611 'face 'stgit-description-face)
615 (defun stgit-find-file (&optional other-window)
616 (let* ((file (or (stgit-patched-file-at-point)
617 (error "No file at point")))
618 (filename (expand-file-name (stgit-file-file file))))
619 (unless (file-exists-p filename)
620 (error "File does not exist"))
621 (funcall (if other-window 'find-file-other-window 'find-file)
623 (when (eq (stgit-file-status file) 'unmerged)
626 (defun stgit-select-patch ()
627 (let ((patchname (stgit-patch-name-at-point)))
628 (if (memq patchname stgit-expanded-patches)
629 (setq stgit-expanded-patches (delq patchname stgit-expanded-patches))
630 (setq stgit-expanded-patches (cons patchname stgit-expanded-patches)))
631 (ewoc-invalidate stgit-ewoc (ewoc-locate stgit-ewoc)))
632 (move-to-column (stgit-goal-column)))
634 (defun stgit-select ()
635 "With point on a patch, toggle showing files in the patch.
637 With point on a file, open the associated file. Opens the target
638 file for (applied) copies and renames."
640 (case (get-text-property (point) 'entry-type)
642 (stgit-select-patch))
646 (error "No patch or file on line"))))
648 (defun stgit-find-file-other-window ()
649 "Open file at point in other window"
653 (defun stgit-find-file-merge ()
654 "Open file at point and merge it using `smerge-ediff'."
660 "Hide the stgit buffer."
664 (defun stgit-git-status ()
665 "Show status using `git-status'."
667 (unless (fboundp 'git-status)
668 (error "The stgit-git-status command requires git-status"))
669 (let ((dir default-directory))
670 (save-selected-window
674 (defun stgit-goal-column ()
675 "Return goal column for the current line"
676 (case (get-text-property (point) 'entry-type)
681 (defun stgit-next-line (&optional arg)
682 "Move cursor vertically down ARG lines"
685 (move-to-column (stgit-goal-column)))
687 (defun stgit-previous-line (&optional arg)
688 "Move cursor vertically up ARG lines"
691 (move-to-column (stgit-goal-column)))
693 (defun stgit-next-patch (&optional arg)
694 "Move cursor down ARG patches."
696 (ewoc-goto-next stgit-ewoc (or arg 1))
697 (move-to-column goal-column))
699 (defun stgit-previous-patch (&optional arg)
700 "Move cursor up ARG patches."
702 (ewoc-goto-prev stgit-ewoc (or arg 1))
703 (move-to-column goal-column))
705 (defvar stgit-mode-hook nil
706 "Run after `stgit-mode' is setup.")
708 (defvar stgit-mode-map nil
709 "Keymap for StGit major mode.")
711 (unless stgit-mode-map
712 (let ((diff-map (make-keymap))
713 (toggle-map (make-keymap)))
714 (suppress-keymap diff-map)
715 (mapc (lambda (arg) (define-key diff-map (car arg) (cdr arg)))
716 '(("b" . stgit-diff-base)
717 ("c" . stgit-diff-combined)
718 ("m" . stgit-find-file-merge)
719 ("o" . stgit-diff-ours)
720 ("t" . stgit-diff-theirs)))
721 (suppress-keymap toggle-map)
722 (mapc (lambda (arg) (define-key toggle-map (car arg) (cdr arg)))
723 '(("t" . stgit-toggle-worktree)
724 ("i" . stgit-toggle-ignored)
725 ("u" . stgit-toggle-unknown)))
726 (setq stgit-mode-map (make-keymap))
727 (suppress-keymap stgit-mode-map)
728 (mapc (lambda (arg) (define-key stgit-mode-map (car arg) (cdr arg)))
731 ("\d" . stgit-unmark-up)
732 ("u" . stgit-unmark-down)
735 ("\C-p" . stgit-previous-line)
736 ("\C-n" . stgit-next-line)
737 ([up] . stgit-previous-line)
738 ([down] . stgit-next-line)
739 ("p" . stgit-previous-patch)
740 ("n" . stgit-next-patch)
741 ("\M-{" . stgit-previous-patch)
742 ("\M-}" . stgit-next-patch)
743 ("s" . stgit-git-status)
744 ("g" . stgit-reload-or-repair)
745 ("r" . stgit-refresh)
746 ("\C-c\C-r" . stgit-rename)
748 ("M" . stgit-move-patches)
751 ("\C-c\C-c" . stgit-commit)
752 ("\C-c\C-u" . stgit-uncommit)
753 ("U" . stgit-revert-file)
754 ("R" . stgit-resolve-file)
755 ("\r" . stgit-select)
756 ("o" . stgit-find-file-other-window)
757 ("i" . stgit-file-toggle-index)
758 (">" . stgit-push-next)
759 ("<" . stgit-pop-next)
760 ("P" . stgit-push-or-pop)
764 ([?\C-/] . stgit-undo)
765 ("\C-_" . stgit-undo)
766 ([?\C-c ?\C-/] . stgit-redo)
767 ("\C-c\C-_" . stgit-redo)
771 ("q" . stgit-quit)))))
774 "Major mode for interacting with StGit.
777 (kill-all-local-variables)
778 (buffer-disable-undo)
779 (setq mode-name "StGit"
780 major-mode 'stgit-mode
782 (use-local-map stgit-mode-map)
783 (set (make-local-variable 'list-buffers-directory) default-directory)
784 (set (make-local-variable 'stgit-marked-patches) nil)
785 (set (make-local-variable 'stgit-expanded-patches) (list :work :index))
786 (set (make-local-variable 'stgit-show-worktree) stgit-default-show-worktree)
787 (set (make-local-variable 'stgit-index-node) nil)
788 (set (make-local-variable 'stgit-worktree-node) nil)
789 (set (make-local-variable 'parse-sexp-lookup-properties) t)
790 (set-variable 'truncate-lines 't)
791 (add-hook 'after-save-hook 'stgit-update-saved-file)
792 (run-hooks 'stgit-mode-hook))
794 (defun stgit-update-saved-file ()
795 (let* ((file (expand-file-name buffer-file-name))
796 (dir (file-name-directory file))
797 (gitdir (condition-case nil (git-get-top-dir dir)
799 (buffer (and gitdir (stgit-find-buffer gitdir))))
801 (with-current-buffer buffer
802 (stgit-refresh-worktree)))))
804 (defun stgit-add-mark (patchsym)
805 "Mark the patch PATCHSYM."
806 (setq stgit-marked-patches (cons patchsym stgit-marked-patches)))
808 (defun stgit-remove-mark (patchsym)
809 "Unmark the patch PATCHSYM."
810 (setq stgit-marked-patches (delq patchsym stgit-marked-patches)))
812 (defun stgit-clear-marks ()
813 "Unmark all patches."
814 (setq stgit-marked-patches '()))
816 (defun stgit-patch-at-point (&optional cause-error)
817 (get-text-property (point) 'patch-data))
819 (defun stgit-patch-name-at-point (&optional cause-error only-patches)
820 "Return the patch name on the current line as a symbol.
821 If CAUSE-ERROR is not nil, signal an error if none found.
822 If ONLY-PATCHES is not nil, only allow real patches, and not
824 (let ((patch (stgit-patch-at-point)))
827 (memq (stgit-patch-status patch) '(work index))
830 (stgit-patch-name patch))
832 (error "No patch on this line")))))
834 (defun stgit-patched-file-at-point ()
835 (get-text-property (point) 'file-data))
837 (defun stgit-patches-marked-or-at-point ()
838 "Return the symbols of the marked patches, or the patch on the current line."
839 (if stgit-marked-patches
841 (let ((patch (stgit-patch-name-at-point)))
846 (defun stgit-goto-patch (patchsym &optional file)
847 "Move point to the line containing patch PATCHSYM.
848 If that patch cannot be found, do nothing.
850 If the patch was found and FILE is not nil, instead move to that
851 file's line. If FILE cannot be found, stay on the line of
853 (let ((node (ewoc-nth stgit-ewoc 0)))
854 (while (and node (not (eq (stgit-patch-name (ewoc-data node))
856 (setq node (ewoc-next stgit-ewoc node)))
857 (when (and node file)
858 (let* ((file-ewoc (stgit-patch-files-ewoc (ewoc-data node)))
859 (file-node (ewoc-nth file-ewoc 0)))
860 (while (and file-node (not (equal (stgit-file-file (ewoc-data file-node)) file)))
861 (setq file-node (ewoc-next file-ewoc file-node)))
863 (ewoc-goto-node file-ewoc file-node)
864 (move-to-column (stgit-goal-column))
867 (ewoc-goto-node stgit-ewoc node)
868 (move-to-column goal-column))))
873 (stgit-capture-output nil
878 "Mark the patch under point."
880 (let* ((node (ewoc-locate stgit-ewoc))
881 (patch (ewoc-data node))
882 (name (stgit-patch-name patch)))
883 (when (eq name :work)
884 (error "Cannot mark the work tree"))
885 (when (eq name :index)
886 (error "Cannot mark the index"))
887 (stgit-add-mark (stgit-patch-name patch))
888 (ewoc-invalidate stgit-ewoc node))
891 (defun stgit-unmark-up ()
892 "Remove mark from the patch on the previous line."
894 (stgit-previous-patch)
895 (let* ((node (ewoc-locate stgit-ewoc))
896 (patch (ewoc-data node)))
897 (stgit-remove-mark (stgit-patch-name patch))
898 (ewoc-invalidate stgit-ewoc node))
899 (move-to-column (stgit-goal-column)))
901 (defun stgit-unmark-down ()
902 "Remove mark from the patch on the current line."
904 (let* ((node (ewoc-locate stgit-ewoc))
905 (patch (ewoc-data node)))
906 (stgit-remove-mark (stgit-patch-name patch))
907 (ewoc-invalidate stgit-ewoc node))
910 (defun stgit-rename (name)
911 "Rename the patch under point to NAME."
913 (read-string "Patch name: "
914 (symbol-name (stgit-patch-name-at-point t t)))))
915 (let ((old-patchsym (stgit-patch-name-at-point t t)))
916 (stgit-capture-output nil
917 (stgit-run "rename" old-patchsym name))
918 (let ((name-sym (intern name)))
919 (when (memq old-patchsym stgit-expanded-patches)
920 (setq stgit-expanded-patches
921 (cons name-sym (delq old-patchsym stgit-expanded-patches))))
922 (when (memq old-patchsym stgit-marked-patches)
923 (setq stgit-marked-patches
924 (cons name-sym (delq old-patchsym stgit-marked-patches))))
926 (stgit-goto-patch name-sym))))
928 (defun stgit-reload-or-repair (repair)
929 "Update the contents of the StGit buffer (`stgit-reload').
931 With a prefix argument, repair the StGit metadata if the branch
932 was modified with git commands (`stgit-repair')."
938 (defun stgit-repair ()
941 (stgit-capture-output nil
942 (stgit-run "repair"))
945 (defun stgit-available-branches ()
946 "Returns a list of the available stg branches"
947 (let ((output (with-output-to-string
948 (stgit-run "branch" "--list")))
951 (while (string-match "^>?\\s-+s\\s-+\\(\\S-+\\)" output start)
952 (setq result (cons (match-string 1 output) result))
953 (setq start (match-end 0)))
956 (defun stgit-branch (branch)
957 "Switch to branch BRANCH."
958 (interactive (list (completing-read "Switch to branch: "
959 (stgit-available-branches))))
960 (stgit-capture-output nil (stgit-run "branch" "--" branch))
963 (defun stgit-commit (count)
964 "Run stg commit on COUNT commits.
965 Interactively, the prefix argument is used as COUNT.
966 A negative COUNT will uncommit instead."
969 (stgit-uncommit (- count))
970 (stgit-capture-output nil (stgit-run "commit" "-n" count))
973 (defun stgit-uncommit (count)
974 "Run stg uncommit on COUNT commits.
975 Interactively, the prefix argument is used as COUNT.
976 A negative COUNT will commit instead."
979 (stgit-commit (- count))
980 (stgit-capture-output nil (stgit-run "uncommit" "-n" count))
983 (defun stgit-revert-file ()
984 "Revert the file at point, which must be in the index or the
987 (let* ((patched-file (or (stgit-patched-file-at-point)
988 (error "No file on the current line")))
989 (patch-name (stgit-patch-name-at-point))
990 (file-status (stgit-file-status patched-file))
991 (rm-file (cond ((stgit-file-copy-or-rename patched-file)
992 (stgit-file-cr-to patched-file))
993 ((eq file-status 'add)
994 (stgit-file-file patched-file))))
995 (co-file (cond ((eq file-status 'rename)
996 (stgit-file-cr-from patched-file))
997 ((not (memq file-status '(copy add)))
998 (stgit-file-file patched-file)))))
1000 (unless (memq patch-name '(:work :index))
1001 (error "No index or working tree file on this line"))
1003 (when (eq file-status 'ignore)
1004 (error "Cannot revert ignored files"))
1006 (when (eq file-status 'unknown)
1007 (error "Cannot revert unknown files"))
1009 (let ((nfiles (+ (if rm-file 1 0) (if co-file 1 0))))
1010 (when (yes-or-no-p (format "Revert %d file%s? "
1012 (if (= nfiles 1) "" "s")))
1013 (stgit-capture-output nil
1015 (stgit-run-git "rm" "-f" "-q" "--" rm-file))
1017 (stgit-run-git "checkout" "HEAD" co-file)))
1020 (defun stgit-resolve-file ()
1021 "Resolve conflict in the file at point."
1023 (let* ((patched-file (stgit-patched-file-at-point))
1024 (patch (stgit-patch-at-point))
1025 (patch-name (and patch (stgit-patch-name patch)))
1026 (status (and patched-file (stgit-file-status patched-file))))
1028 (unless (memq patch-name '(:work :index))
1029 (error "No index or working tree file on this line"))
1031 (unless (eq status 'unmerged)
1032 (error "No conflict to resolve at the current line"))
1034 (stgit-capture-output nil
1035 (stgit-move-change-to-index (stgit-file-file patched-file)))
1039 (defun stgit-push-next (npatches)
1040 "Push the first unapplied patch.
1041 With numeric prefix argument, push that many patches."
1043 (stgit-capture-output nil (stgit-run "push" "-n" npatches))
1045 (stgit-refresh-git-status))
1047 (defun stgit-pop-next (npatches)
1048 "Pop the topmost applied patch.
1049 With numeric prefix argument, pop that many patches."
1051 (stgit-capture-output nil (stgit-run "pop" "-n" npatches))
1053 (stgit-refresh-git-status))
1055 (defun stgit-applied-at-point ()
1056 "Is the patch on the current line applied?"
1059 (looking-at "[>+]")))
1061 (defun stgit-push-or-pop ()
1062 "Push or pop the patch on the current line."
1064 (let ((patchsym (stgit-patch-name-at-point t))
1065 (applied (stgit-applied-at-point)))
1066 (stgit-capture-output nil
1067 (stgit-run (if applied "pop" "push") patchsym))
1070 (defun stgit-goto ()
1071 "Go to the patch on the current line."
1073 (let ((patchsym (stgit-patch-name-at-point t)))
1074 (stgit-capture-output nil
1075 (stgit-run "goto" patchsym))
1078 (defun stgit-id (patchsym)
1079 "Return the git commit id for PATCHSYM.
1080 If PATCHSYM is a keyword, returns PATCHSYM unmodified."
1081 (if (keywordp patchsym)
1083 (let ((result (with-output-to-string
1084 (stgit-run-silent "id" patchsym))))
1085 (unless (string-match "^\\([0-9A-Fa-f]\\{40\\}\\)$" result)
1086 (error "Cannot find commit id for %s" patchsym))
1087 (match-string 1 result))))
1089 (defun stgit-show-patch (unmerged-stage ignore-whitespace)
1090 "Show the patch on the current line.
1092 UNMERGED-STAGE is the argument to `git-diff' that that selects
1093 which stage to diff against in the case of unmerged files."
1094 (let ((space-arg (when (numberp ignore-whitespace)
1095 (cond ((> ignore-whitespace 4)
1096 "--ignore-all-space")
1097 ((> ignore-whitespace 1)
1098 "--ignore-space-change"))))
1099 (patch-name (stgit-patch-name-at-point t)))
1100 (stgit-capture-output "*StGit patch*"
1101 (case (get-text-property (point) 'entry-type)
1103 (let* ((patched-file (stgit-patched-file-at-point))
1104 (patch-id (let ((id (stgit-id patch-name)))
1105 (if (and (eq id :index)
1106 (eq (stgit-file-status patched-file)
1110 (args (append (and space-arg (list space-arg))
1111 (and (stgit-file-cr-from patched-file)
1112 (list (stgit-find-copies-harder-diff-arg)))
1113 (cond ((eq patch-id :index)
1115 ((eq patch-id :work)
1116 (list unmerged-stage))
1118 (list (concat patch-id "^") patch-id)))
1120 (if (stgit-file-copy-or-rename patched-file)
1121 (list (stgit-file-cr-from patched-file)
1122 (stgit-file-cr-to patched-file))
1123 (list (stgit-file-file patched-file))))))
1124 (apply 'stgit-run-git "diff" args)))
1126 (let* ((patch-id (stgit-id patch-name)))
1127 (if (or (eq patch-id :index) (eq patch-id :work))
1128 (apply 'stgit-run-git "diff"
1129 (stgit-find-copies-harder-diff-arg)
1130 (append (and space-arg (list space-arg))
1131 (if (eq patch-id :index)
1133 (list unmerged-stage))))
1134 (let ((args (append '("show" "-O" "--patch-with-stat" "-O" "-M")
1135 (and space-arg (list "-O" space-arg))
1136 (list (stgit-patch-name-at-point)))))
1137 (apply 'stgit-run args)))))
1139 (error "No patch or file at point")))
1140 (with-current-buffer standard-output
1141 (goto-char (point-min))
1144 (defmacro stgit-define-diff (name diff-arg &optional unmerged-action)
1145 `(defun ,name (&optional ignore-whitespace)
1146 ,(format "Show the patch on the current line.
1148 %sWith a prefix argument, ignore whitespace. With a prefix argument
1149 greater than four (e.g., \\[universal-argument] \
1150 \\[universal-argument] \\[%s]), ignore all whitespace."
1152 (format "For unmerged files, %s.\n\n" unmerged-action)
1156 (stgit-show-patch ,diff-arg ignore-whitespace)))
1158 (stgit-define-diff stgit-diff
1160 (stgit-define-diff stgit-diff-ours
1162 "diff against our branch")
1163 (stgit-define-diff stgit-diff-theirs
1165 "diff against their branch")
1166 (stgit-define-diff stgit-diff-base
1168 "diff against the merge base")
1169 (stgit-define-diff stgit-diff-combined
1171 "show a combined diff")
1173 (defun stgit-move-change-to-index (file)
1174 "Copies the workspace state of FILE to index, using git add or git rm"
1175 (let ((op (if (or (file-exists-p file) (file-symlink-p file))
1176 '("add") '("rm" "-q"))))
1177 (stgit-capture-output "*git output*"
1178 (apply 'stgit-run-git (append op '("--") (list file))))))
1180 (defun stgit-remove-change-from-index (file)
1181 "Unstages the change in FILE from the index"
1182 (stgit-capture-output "*git output*"
1183 (stgit-run-git "reset" "-q" "--" file)))
1185 (defun stgit-file-toggle-index ()
1186 "Move modified file in or out of the index.
1188 Leaves the point where it is, but moves the mark to where the
1189 file ended up. You can then jump to the file with \
1190 \\[exchange-point-and-mark]."
1192 (let ((patched-file (stgit-patched-file-at-point)))
1193 (unless patched-file
1194 (error "No file on the current line"))
1195 (when (eq (stgit-file-status patched-file) 'unmerged)
1196 (error (substitute-command-keys "Use \\[stgit-resolve-file] to move an unmerged file to the index")))
1197 (when (eq (stgit-file-status patched-file) 'ignore)
1198 (error "You cannot add ignored files to the index"))
1199 (let* ((patch (stgit-patch-at-point))
1200 (patch-name (stgit-patch-name patch))
1204 ;; find the next file in the patch, or the previous one if this
1205 ;; was the last file
1206 (and (zerop (forward-line 1))
1207 (let ((f (stgit-patched-file-at-point)))
1208 (and f (setq next-file (stgit-file-file f)))))
1209 (goto-char old-point)
1211 (and (zerop (forward-line -1))
1212 (let ((f (stgit-patched-file-at-point)))
1213 (and f (setq next-file (stgit-file-file f)))))
1214 (goto-char old-point))
1216 (cond ((eq patch-name :work)
1217 (stgit-move-change-to-index (stgit-file-file patched-file)))
1218 ((eq patch-name :index)
1219 (stgit-remove-change-from-index (stgit-file-file patched-file)))
1221 (error "Can only move files in the working tree to index")))
1222 (stgit-refresh-worktree)
1223 (stgit-refresh-index)
1224 (stgit-goto-patch (if (eq patch-name :index) :work :index)
1225 (stgit-file-file patched-file))
1227 (stgit-goto-patch patch-name next-file))))
1229 (defun stgit-edit ()
1230 "Edit the patch on the current line."
1232 (let ((patchsym (stgit-patch-name-at-point t t))
1233 (edit-buf (get-buffer-create "*StGit edit*"))
1234 (dir default-directory))
1235 (log-edit 'stgit-confirm-edit t nil edit-buf)
1236 (set (make-local-variable 'stgit-edit-patchsym) patchsym)
1237 (setq default-directory dir)
1238 (let ((standard-output edit-buf))
1239 (stgit-run-silent "edit" "--save-template=-" patchsym))))
1241 (defun stgit-confirm-edit ()
1243 (let ((file (make-temp-file "stgit-edit-")))
1244 (write-region (point-min) (point-max) file)
1245 (stgit-capture-output nil
1246 (stgit-run "edit" "-f" file stgit-edit-patchsym))
1247 (with-current-buffer log-edit-parent-buffer
1250 (defun stgit-new (add-sign)
1251 "Create a new patch.
1252 With a prefix argument, include a \"Signed-off-by:\" line at the
1255 (let ((edit-buf (get-buffer-create "*StGit edit*"))
1256 (dir default-directory))
1257 (log-edit 'stgit-confirm-new t nil edit-buf)
1258 (setq default-directory dir)
1261 (let ((standard-output (current-buffer)))
1262 (stgit-run-silent "new" "--sign" "--save-template=-"))))))
1264 (defun stgit-confirm-new ()
1266 (let ((file (make-temp-file "stgit-edit-")))
1267 (write-region (point-min) (point-max) file)
1268 (stgit-capture-output nil
1269 (stgit-run "new" "-f" file))
1270 (with-current-buffer log-edit-parent-buffer
1273 (defun stgit-create-patch-name (description)
1274 "Create a patch name from a long description"
1276 (while (> (length description) 0)
1277 (cond ((string-match "\\`[a-zA-Z_-]+" description)
1278 (setq patch (downcase (concat patch
1279 (match-string 0 description))))
1280 (setq description (substring description (match-end 0))))
1281 ((string-match "\\` +" description)
1282 (setq patch (concat patch "-"))
1283 (setq description (substring description (match-end 0))))
1284 ((string-match "\\`[^a-zA-Z_-]+" description)
1285 (setq description (substring description (match-end 0))))))
1286 (cond ((= (length patch) 0)
1288 ((> (length patch) 20)
1289 (substring patch 0 20))
1292 (defun stgit-delete (patchsyms &optional spill-p)
1293 "Delete the patches in PATCHSYMS.
1294 Interactively, delete the marked patches, or the patch at point.
1296 With a prefix argument, or SPILL-P, spill the patch contents to
1297 the work tree and index."
1298 (interactive (list (stgit-patches-marked-or-at-point)
1299 current-prefix-arg))
1301 (error "No patches to delete"))
1302 (when (memq :index patchsyms)
1303 (error "Cannot delete the index"))
1304 (when (memq :work patchsyms)
1305 (error "Cannot delete the work tree"))
1307 (let ((npatches (length patchsyms)))
1308 (when (yes-or-no-p (format "Really delete %d patch%s%s? "
1310 (if (= 1 npatches) "" "es")
1312 " (spilling contents to index)"
1314 (let ((args (if spill-p
1315 (cons "--spill" patchsyms)
1317 (stgit-capture-output nil
1318 (apply 'stgit-run "delete" args))
1321 (defun stgit-move-patches-target ()
1322 "Return the patchsym indicating a target patch for
1323 `stgit-move-patches'.
1325 This is either the patch at point, or one of :top and :bottom, if
1326 the point is after or before the applied patches."
1328 (let ((patchsym (stgit-patch-name-at-point)))
1329 (cond (patchsym patchsym)
1330 ((save-excursion (re-search-backward "^>" nil t)) :top)
1333 (defun stgit-sort-patches (patchsyms)
1334 "Returns the list of patches in PATCHSYMS sorted according to
1335 their position in the patch series, bottommost first.
1337 PATCHSYMS may not contain duplicate entries."
1338 (let (sorted-patchsyms
1339 (series (with-output-to-string
1340 (with-current-buffer standard-output
1341 (stgit-run-silent "series" "--noprefix"))))
1343 (while (string-match "^\\(.+\\)" series start)
1344 (let ((patchsym (intern (match-string 1 series))))
1345 (when (memq patchsym patchsyms)
1346 (setq sorted-patchsyms (cons patchsym sorted-patchsyms))))
1347 (setq start (match-end 0)))
1348 (setq sorted-patchsyms (nreverse sorted-patchsyms))
1350 (unless (= (length patchsyms) (length sorted-patchsyms))
1351 (error "Internal error"))
1355 (defun stgit-move-patches (patchsyms target-patch)
1356 "Move the patches in PATCHSYMS to below TARGET-PATCH.
1357 If TARGET-PATCH is :bottom or :top, move the patches to the
1358 bottom or top of the stack, respectively.
1360 Interactively, move the marked patches to where the point is."
1361 (interactive (list stgit-marked-patches
1362 (stgit-move-patches-target)))
1364 (error "Need at least one patch to move"))
1366 (unless target-patch
1367 (error "Point not at a patch"))
1369 (if (eq target-patch :top)
1370 (stgit-capture-output nil
1371 (apply 'stgit-run "float" patchsyms))
1373 ;; need to have patchsyms sorted by position in the stack
1374 (let ((sorted-patchsyms (stgit-sort-patches patchsyms)))
1375 (while sorted-patchsyms
1376 (setq sorted-patchsyms
1377 (and (stgit-capture-output nil
1378 (if (eq target-patch :bottom)
1379 (stgit-run "sink" "--" (car sorted-patchsyms))
1380 (stgit-run "sink" "--to" target-patch "--"
1381 (car sorted-patchsyms))))
1382 (cdr sorted-patchsyms))))))
1385 (defun stgit-squash (patchsyms)
1386 "Squash the patches in PATCHSYMS.
1387 Interactively, squash the marked patches.
1389 Unless there are any conflicts, the patches will be merged into
1390 one patch, which will occupy the same spot in the series as the
1391 deepest patch had before the squash."
1392 (interactive (list stgit-marked-patches))
1393 (when (< (length patchsyms) 2)
1394 (error "Need at least two patches to squash"))
1395 (let ((stgit-buffer (current-buffer))
1396 (edit-buf (get-buffer-create "*StGit edit*"))
1397 (dir default-directory)
1398 (sorted-patchsyms (stgit-sort-patches patchsyms)))
1399 (log-edit 'stgit-confirm-squash t nil edit-buf)
1400 (set (make-local-variable 'stgit-patchsyms) sorted-patchsyms)
1401 (setq default-directory dir)
1402 (let ((result (let ((standard-output edit-buf))
1403 (apply 'stgit-run-silent "squash"
1404 "--save-template=-" sorted-patchsyms))))
1406 ;; stg squash may have reordered the patches or caused conflicts
1407 (with-current-buffer stgit-buffer
1410 (unless (eq 0 result)
1412 (rename-buffer "*StGit error*")
1413 (resize-temp-buffer-window)
1414 (switch-to-buffer-other-window stgit-buffer)
1415 (error "stg squash failed")))))
1417 (defun stgit-confirm-squash ()
1419 (let ((file (make-temp-file "stgit-edit-")))
1420 (write-region (point-min) (point-max) file)
1421 (stgit-capture-output nil
1422 (apply 'stgit-run "squash" "-f" file stgit-patchsyms))
1423 (with-current-buffer log-edit-parent-buffer
1425 ;; Go to first marked patch and stay there
1426 (goto-char (point-min))
1427 (re-search-forward (concat "^[>+-]\\*") nil t)
1428 (move-to-column goal-column)
1429 (let ((pos (point)))
1433 (defun stgit-help ()
1434 "Display help for the StGit mode."
1436 (describe-function 'stgit-mode))
1438 (defun stgit-undo (&optional arg)
1440 With prefix argument, run it with the --hard flag.
1442 See also `stgit-redo'."
1444 (stgit-capture-output nil
1446 (stgit-run "undo" "--hard")
1447 (stgit-run "undo")))
1450 (defun stgit-redo (&optional arg)
1452 With prefix argument, run it with the --hard flag.
1454 See also `stgit-undo'."
1456 (stgit-capture-output nil
1458 (stgit-run "redo" "--hard")
1459 (stgit-run "redo")))
1462 (defun stgit-refresh (&optional arg)
1464 If the index contains any changes, only refresh from index.
1466 With prefix argument, refresh the marked patch or the patch under point."
1468 (let ((patchargs (if arg
1469 (let ((patches (stgit-patches-marked-or-at-point)))
1470 (cond ((null patches)
1471 (error "No patch to update"))
1472 ((> (length patches) 1)
1473 (error "Too many patches selected"))
1475 (cons "-p" patches))))
1477 (unless (stgit-index-empty-p)
1478 (setq patchargs (cons "--index" patchargs)))
1479 (stgit-capture-output nil
1480 (apply 'stgit-run "refresh" patchargs))
1481 (stgit-refresh-git-status))
1484 (defcustom stgit-show-worktree-mode 'center
1485 "This variable controls where the \"Index\" and \"Work tree\"
1486 will be shown on in the buffer.
1488 It can be set to 'top (above all patches), 'center (show between
1489 applied and unapplied patches), and 'bottom (below all patches).
1491 See also `stgit-show-worktree'."
1492 :type '(radio (const :tag "above all patches (top)" top)
1493 (const :tag "between applied and unapplied patches (center)"
1495 (const :tag "below all patches (bottom)" bottom))
1498 (defcustom stgit-default-show-worktree
1500 "Set to non-nil to by default show the working tree in a new stgit buffer.
1502 This value is used as the default value for `stgit-show-worktree'."
1506 (defvar stgit-show-worktree nil
1507 "If nil, inhibit showing work tree and index in the stgit buffer.
1509 See also `stgit-show-worktree-mode'.")
1511 (defvar stgit-show-ignored nil
1512 "If nil, inhibit showing files ignored by git.")
1514 (defvar stgit-show-unknown nil
1515 "If nil, inhibit showing files not registered with git.")
1517 (defun stgit-toggle-worktree (&optional arg)
1518 "Toggle the visibility of the work tree.
1519 With arg, show the work tree if arg is positive.
1521 Its initial setting is controlled by `stgit-default-show-worktree'.
1523 `stgit-show-worktree-mode' controls where on screen the index and
1524 work tree will show up."
1526 (setq stgit-show-worktree
1529 (not stgit-show-worktree)))
1532 (defun stgit-toggle-ignored (&optional arg)
1533 "Toggle the visibility of files ignored by git in the work
1534 tree. With ARG, show these files if ARG is positive.
1536 Use \\[stgit-toggle-worktree] to show the work tree."
1538 (setq stgit-show-ignored
1541 (not stgit-show-ignored)))
1544 (defun stgit-toggle-unknown (&optional arg)
1545 "Toggle the visibility of files not registered with git in the
1546 work tree. With ARG, show these files if ARG is positive.
1548 Use \\[stgit-toggle-worktree] to show the work tree."
1550 (setq stgit-show-unknown
1553 (not stgit-show-unknown)))
1556 (defcustom stgit-abbreviate-copies-and-renames
1558 "If non-nil, abbreviate copies and renames as \"dir/{old -> new}/file\"
1559 instead of \"dir/old/file -> dir/new/file\"."