git.el: Support for incremental status updates.
[git/git.git] / contrib / emacs / git.el
CommitLineData
711fc8f6
AJ
1;;; git.el --- A user interface for git
2
d55552f6 3;; Copyright (C) 2005, 2006, 2007 Alexandre Julliard <julliard@winehq.org>
711fc8f6
AJ
4
5;; Version: 1.0
6
7;; This program is free software; you can redistribute it and/or
8;; modify it under the terms of the GNU General Public License as
9;; published by the Free Software Foundation; either version 2 of
10;; the License, or (at your option) any later version.
11;;
12;; This program is distributed in the hope that it will be
13;; useful, but WITHOUT ANY WARRANTY; without even the implied
14;; warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
15;; PURPOSE. See the GNU General Public License for more details.
16;;
17;; You should have received a copy of the GNU General Public
18;; License along with this program; if not, write to the Free
19;; Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
20;; MA 02111-1307 USA
21
22;;; Commentary:
23
24;; This file contains an interface for the git version control
25;; system. It provides easy access to the most frequently used git
26;; commands. The user interface is as far as possible identical to
27;; that of the PCL-CVS mode.
28;;
29;; To install: put this file on the load-path and place the following
30;; in your .emacs file:
31;;
32;; (require 'git)
33;;
34;; To start: `M-x git-status'
35;;
36;; TODO
37;; - portability to XEmacs
38;; - better handling of subprocess errors
39;; - hook into file save (after-save-hook)
40;; - diff against other branch
41;; - renaming files from the status buffer
711fc8f6
AJ
42;; - creating tags
43;; - fetch/pull
44;; - switching branches
45;; - revlist browser
46;; - git-show-branch browser
711fc8f6
AJ
47;; - menus
48;;
49
50(eval-when-compile (require 'cl))
51(require 'ewoc)
9fa77a51 52(require 'log-edit)
711fc8f6
AJ
53
54
a79656e6 55;;;; Customizations
711fc8f6
AJ
56;;;; ------------------------------------------------------------
57
a79656e6 58(defgroup git nil
5df52584
AJ
59 "A user interface for the git versioning system."
60 :group 'tools)
a79656e6
AJ
61
62(defcustom git-committer-name nil
63 "User name to use for commits.
1b3a6674
JN
64The default is to fall back to the repository config,
65then to `add-log-full-name' and then to `user-full-name'."
a79656e6
AJ
66 :group 'git
67 :type '(choice (const :tag "Default" nil)
68 (string :tag "Name")))
69
70(defcustom git-committer-email nil
71 "Email address to use for commits.
1b3a6674
JN
72The default is to fall back to the git repository config,
73then to `add-log-mailing-address' and then to `user-mail-address'."
a79656e6
AJ
74 :group 'git
75 :type '(choice (const :tag "Default" nil)
76 (string :tag "Email")))
77
14b4f2db 78(defcustom git-commits-coding-system nil
a79656e6
AJ
79 "Default coding system for the log message of git commits."
80 :group 'git
14b4f2db
AJ
81 :type '(choice (const :tag "From repository config" nil)
82 (coding-system)))
a79656e6
AJ
83
84(defcustom git-append-signed-off-by nil
85 "Whether to append a Signed-off-by line to the commit message before editing."
86 :group 'git
87 :type 'boolean)
88
73389f12
AJ
89(defcustom git-reuse-status-buffer t
90 "Whether `git-status' should try to reuse an existing buffer
91if there is already one that displays the same directory."
92 :group 'git
93 :type 'boolean)
94
a79656e6
AJ
95(defcustom git-per-dir-ignore-file ".gitignore"
96 "Name of the per-directory ignore file."
97 :group 'git
98 :type 'string)
99
1b3a6674 100
711fc8f6
AJ
101(defface git-status-face
102 '((((class color) (background light)) (:foreground "purple")))
a79656e6
AJ
103 "Git mode face used to highlight added and modified files."
104 :group 'git)
711fc8f6
AJ
105
106(defface git-unmerged-face
107 '((((class color) (background light)) (:foreground "red" :bold t)))
a79656e6
AJ
108 "Git mode face used to highlight unmerged files."
109 :group 'git)
711fc8f6
AJ
110
111(defface git-unknown-face
112 '((((class color) (background light)) (:foreground "goldenrod" :bold t)))
a79656e6
AJ
113 "Git mode face used to highlight unknown files."
114 :group 'git)
711fc8f6
AJ
115
116(defface git-uptodate-face
117 '((((class color) (background light)) (:foreground "grey60")))
a79656e6
AJ
118 "Git mode face used to highlight up-to-date files."
119 :group 'git)
711fc8f6
AJ
120
121(defface git-ignored-face
122 '((((class color) (background light)) (:foreground "grey60")))
a79656e6
AJ
123 "Git mode face used to highlight ignored files."
124 :group 'git)
711fc8f6
AJ
125
126(defface git-mark-face
127 '((((class color) (background light)) (:foreground "red" :bold t)))
a79656e6
AJ
128 "Git mode face used for the file marks."
129 :group 'git)
711fc8f6
AJ
130
131(defface git-header-face
132 '((((class color) (background light)) (:foreground "blue")))
a79656e6
AJ
133 "Git mode face used for commit headers."
134 :group 'git)
711fc8f6
AJ
135
136(defface git-separator-face
137 '((((class color) (background light)) (:foreground "brown")))
a79656e6
AJ
138 "Git mode face used for commit separator."
139 :group 'git)
711fc8f6
AJ
140
141(defface git-permission-face
142 '((((class color) (background light)) (:foreground "green" :bold t)))
a79656e6
AJ
143 "Git mode face used for permission changes."
144 :group 'git)
711fc8f6
AJ
145
146
147;;;; Utilities
148;;;; ------------------------------------------------------------
149
a79656e6
AJ
150(defconst git-log-msg-separator "--- log message follows this line ---")
151
9fa77a51
AJ
152(defvar git-log-edit-font-lock-keywords
153 `(("^\\(Author:\\|Date:\\|Parent:\\|Signed-off-by:\\)\\(.*\\)$"
154 (1 font-lock-keyword-face)
155 (2 font-lock-function-name-face))
156 (,(concat "^\\(" (regexp-quote git-log-msg-separator) "\\)$")
157 (1 font-lock-comment-face))))
158
711fc8f6
AJ
159(defun git-get-env-strings (env)
160 "Build a list of NAME=VALUE strings from a list of environment strings."
161 (mapcar (lambda (entry) (concat (car entry) "=" (cdr entry))) env))
162
163(defun git-call-process-env (buffer env &rest args)
164 "Wrapper for call-process that sets environment strings."
165 (if env
166 (apply #'call-process "env" nil buffer nil
167 (append (git-get-env-strings env) (list "git") args))
168 (apply #'call-process "git" nil buffer nil args)))
169
9de83169 170(defun git-call-process-env-string (env &rest args)
1b3a6674
JN
171 "Wrapper for call-process that sets environment strings,
172and returns the process output as a string."
9de83169
AJ
173 (with-temp-buffer
174 (and (eq 0 (apply #' git-call-process-env t env args))
175 (buffer-string))))
176
711fc8f6
AJ
177(defun git-run-process-region (buffer start end program args)
178 "Run a git process with a buffer region as input."
179 (let ((output-buffer (current-buffer))
180 (dir default-directory))
181 (with-current-buffer buffer
182 (cd dir)
183 (apply #'call-process-region start end program
184 nil (list output-buffer nil) nil args))))
185
186(defun git-run-command-buffer (buffer-name &rest args)
187 "Run a git command, sending the output to a buffer named BUFFER-NAME."
188 (let ((dir default-directory)
189 (buffer (get-buffer-create buffer-name)))
190 (message "Running git %s..." (car args))
191 (with-current-buffer buffer
192 (let ((default-directory dir)
193 (buffer-read-only nil))
194 (erase-buffer)
195 (apply #'git-call-process-env buffer nil args)))
196 (message "Running git %s...done" (car args))
197 buffer))
198
199(defun git-run-command (buffer env &rest args)
200 (message "Running git %s..." (car args))
201 (apply #'git-call-process-env buffer env args)
202 (message "Running git %s...done" (car args)))
203
204(defun git-run-command-region (buffer start end env &rest args)
205 "Run a git command with specified buffer region as input."
206 (message "Running git %s..." (car args))
207 (unless (eq 0 (if env
208 (git-run-process-region
209 buffer start end "env"
210 (append (git-get-env-strings env) (list "git") args))
211 (git-run-process-region
212 buffer start end "git" args)))
213 (error "Failed to run \"git %s\":\n%s" (mapconcat (lambda (x) x) args " ") (buffer-string)))
214 (message "Running git %s...done" (car args)))
215
d55552f6
AJ
216(defun git-run-hook (hook env &rest args)
217 "Run a git hook and display its output if any."
218 (let ((dir default-directory)
219 (hook-name (expand-file-name (concat ".git/hooks/" hook))))
220 (or (not (file-executable-p hook-name))
221 (let (status (buffer (get-buffer-create "*Git Hook Output*")))
222 (with-current-buffer buffer
223 (erase-buffer)
224 (cd dir)
225 (setq status
226 (if env
227 (apply #'call-process "env" nil (list buffer t) nil
228 (append (git-get-env-strings env) (list hook-name) args))
229 (apply #'call-process hook-name nil (list buffer t) nil args))))
230 (display-message-or-buffer buffer)
231 (eq 0 status)))))
232
711fc8f6
AJ
233(defun git-get-string-sha1 (string)
234 "Read a SHA1 from the specified string."
9de83169
AJ
235 (and string
236 (string-match "[0-9a-f]\\{40\\}" string)
237 (match-string 0 string)))
711fc8f6
AJ
238
239(defun git-get-committer-name ()
240 "Return the name to use as GIT_COMMITTER_NAME."
241 ; copied from log-edit
242 (or git-committer-name
e0d10e1c 243 (git-config "user.name")
711fc8f6
AJ
244 (and (boundp 'add-log-full-name) add-log-full-name)
245 (and (fboundp 'user-full-name) (user-full-name))
246 (and (boundp 'user-full-name) user-full-name)))
247
248(defun git-get-committer-email ()
249 "Return the email address to use as GIT_COMMITTER_EMAIL."
250 ; copied from log-edit
251 (or git-committer-email
e0d10e1c 252 (git-config "user.email")
711fc8f6
AJ
253 (and (boundp 'add-log-mailing-address) add-log-mailing-address)
254 (and (fboundp 'user-mail-address) (user-mail-address))
255 (and (boundp 'user-mail-address) user-mail-address)))
256
14b4f2db
AJ
257(defun git-get-commits-coding-system ()
258 "Return the coding system to use for commits."
259 (let ((repo-config (git-config "i18n.commitencoding")))
260 (or git-commits-coding-system
261 (and repo-config
262 (fboundp 'locale-charset-to-coding-system)
263 (locale-charset-to-coding-system repo-config))
264 'utf-8)))
265
b704e589
AJ
266(defun git-get-logoutput-coding-system ()
267 "Return the coding system used for git-log output."
268 (let ((repo-config (or (git-config "i18n.logoutputencoding")
269 (git-config "i18n.commitencoding"))))
270 (or git-commits-coding-system
271 (and repo-config
272 (fboundp 'locale-charset-to-coding-system)
273 (locale-charset-to-coding-system repo-config))
274 'utf-8)))
275
711fc8f6
AJ
276(defun git-escape-file-name (name)
277 "Escape a file name if necessary."
278 (if (string-match "[\n\t\"\\]" name)
279 (concat "\""
280 (mapconcat (lambda (c)
281 (case c
282 (?\n "\\n")
283 (?\t "\\t")
284 (?\\ "\\\\")
285 (?\" "\\\"")
286 (t (char-to-string c))))
287 name "")
288 "\"")
289 name))
290
291(defun git-get-top-dir (dir)
292 "Retrieve the top-level directory of a git tree."
293 (let ((cdup (with-output-to-string
294 (with-current-buffer standard-output
295 (cd dir)
296 (unless (eq 0 (call-process "git" nil t nil "rev-parse" "--show-cdup"))
297 (error "cannot find top-level git tree for %s." dir))))))
298 (expand-file-name (concat (file-name-as-directory dir)
299 (car (split-string cdup "\n"))))))
300
301;stolen from pcl-cvs
302(defun git-append-to-ignore (file)
303 "Add a file name to the ignore file in its directory."
304 (let* ((fullname (expand-file-name file))
305 (dir (file-name-directory fullname))
b23761d9
AJ
306 (name (file-name-nondirectory fullname))
307 (ignore-name (expand-file-name git-per-dir-ignore-file dir))
308 (created (not (file-exists-p ignore-name))))
711fc8f6 309 (save-window-excursion
b23761d9 310 (set-buffer (find-file-noselect ignore-name))
711fc8f6
AJ
311 (goto-char (point-max))
312 (unless (zerop (current-column)) (insert "\n"))
9f56a7fd 313 (insert "/" name "\n")
711fc8f6 314 (sort-lines nil (point-min) (point-max))
b23761d9
AJ
315 (save-buffer))
316 (when created
93c22eeb
AJ
317 (git-run-command nil nil "update-index" "--add" "--" (file-relative-name ignore-name)))
318 (git-update-status-files (list (file-relative-name ignore-name)) 'unknown)))
711fc8f6 319
03d311ed
AJ
320; propertize definition for XEmacs, stolen from erc-compat
321(eval-when-compile
322 (unless (fboundp 'propertize)
323 (defun propertize (string &rest props)
324 (let ((string (copy-sequence string)))
325 (while props
326 (put-text-property 0 (length string) (nth 0 props) (nth 1 props) string)
327 (setq props (cddr props)))
328 string))))
711fc8f6
AJ
329
330;;;; Wrappers for basic git commands
331;;;; ------------------------------------------------------------
332
333(defun git-rev-parse (rev)
334 "Parse a revision name and return its SHA1."
335 (git-get-string-sha1
9de83169 336 (git-call-process-env-string nil "rev-parse" rev)))
711fc8f6 337
e0d10e1c 338(defun git-config (key)
75a8180d 339 "Retrieve the value associated to KEY in the git repository config file."
e0d10e1c 340 (let ((str (git-call-process-env-string nil "config" key)))
75a8180d
AJ
341 (and str (car (split-string str "\n")))))
342
711fc8f6
AJ
343(defun git-symbolic-ref (ref)
344 "Wrapper for the git-symbolic-ref command."
9de83169
AJ
345 (let ((str (git-call-process-env-string nil "symbolic-ref" ref)))
346 (and str (car (split-string str "\n")))))
711fc8f6 347
413689d3 348(defun git-update-ref (ref newval &optional oldval reason)
711fc8f6 349 "Update a reference by calling git-update-ref."
413689d3
AJ
350 (let ((args (and oldval (list oldval))))
351 (push newval args)
352 (push ref args)
353 (when reason
354 (push reason args)
355 (push "-m" args))
356 (eq 0 (apply #'git-call-process-env nil nil "update-ref" args))))
711fc8f6
AJ
357
358(defun git-read-tree (tree &optional index-file)
359 "Read a tree into the index file."
360 (apply #'git-call-process-env nil
361 (if index-file `(("GIT_INDEX_FILE" . ,index-file)) nil)
362 "read-tree" (if tree (list tree))))
363
364(defun git-write-tree (&optional index-file)
365 "Call git-write-tree and return the resulting tree SHA1 as a string."
366 (git-get-string-sha1
9de83169 367 (git-call-process-env-string (and index-file `(("GIT_INDEX_FILE" . ,index-file))) "write-tree")))
711fc8f6
AJ
368
369(defun git-commit-tree (buffer tree head)
370 "Call git-commit-tree with buffer as input and return the resulting commit SHA1."
371 (let ((author-name (git-get-committer-name))
372 (author-email (git-get-committer-email))
413689d3 373 (subject "commit (initial): ")
14b4f2db 374 author-date log-start log-end args coding-system-for-write)
711fc8f6 375 (when head
413689d3 376 (setq subject "commit: ")
711fc8f6
AJ
377 (push "-p" args)
378 (push head args))
379 (with-current-buffer buffer
380 (goto-char (point-min))
381 (if
a79656e6 382 (setq log-start (re-search-forward (concat "^" (regexp-quote git-log-msg-separator) "\n") nil t))
711fc8f6
AJ
383 (save-restriction
384 (narrow-to-region (point-min) log-start)
385 (goto-char (point-min))
386 (when (re-search-forward "^Author: +\\(.*?\\) *<\\(.*\\)> *$" nil t)
387 (setq author-name (match-string 1)
388 author-email (match-string 2)))
389 (goto-char (point-min))
390 (when (re-search-forward "^Date: +\\(.*\\)$" nil t)
391 (setq author-date (match-string 1)))
392 (goto-char (point-min))
393 (while (re-search-forward "^Parent: +\\([0-9a-f]+\\)" nil t)
394 (unless (string-equal head (match-string 1))
413689d3 395 (setq subject "commit (merge): ")
711fc8f6
AJ
396 (push "-p" args)
397 (push (match-string 1) args))))
398 (setq log-start (point-min)))
14b4f2db 399 (setq log-end (point-max))
413689d3
AJ
400 (goto-char log-start)
401 (when (re-search-forward ".*$" nil t)
402 (setq subject (concat subject (match-string 0))))
14b4f2db 403 (setq coding-system-for-write buffer-file-coding-system))
413689d3
AJ
404 (let ((commit
405 (git-get-string-sha1
406 (with-output-to-string
407 (with-current-buffer standard-output
408 (let ((env `(("GIT_AUTHOR_NAME" . ,author-name)
409 ("GIT_AUTHOR_EMAIL" . ,author-email)
410 ("GIT_COMMITTER_NAME" . ,(git-get-committer-name))
411 ("GIT_COMMITTER_EMAIL" . ,(git-get-committer-email)))))
412 (when author-date (push `("GIT_AUTHOR_DATE" . ,author-date) env))
413 (apply #'git-run-command-region
414 buffer log-start log-end env
415 "commit-tree" tree (nreverse args))))))))
416 (and (git-update-ref "HEAD" commit head subject)
417 commit))))
711fc8f6
AJ
418
419(defun git-empty-db-p ()
420 "Check if the git db is empty (no commit done yet)."
421 (not (eq 0 (call-process "git" nil nil nil "rev-parse" "--verify" "HEAD"))))
422
423(defun git-get-merge-heads ()
424 "Retrieve the merge heads from the MERGE_HEAD file if present."
425 (let (heads)
426 (when (file-readable-p ".git/MERGE_HEAD")
427 (with-temp-buffer
428 (insert-file-contents ".git/MERGE_HEAD" nil nil nil t)
429 (goto-char (point-min))
430 (while (re-search-forward "[0-9a-f]\\{40\\}" nil t)
431 (push (match-string 0) heads))))
432 (nreverse heads)))
433
b704e589
AJ
434(defun git-get-commit-description (commit)
435 "Get a one-line description of COMMIT."
436 (let ((coding-system-for-read (git-get-logoutput-coding-system)))
437 (let ((descr (git-call-process-env-string nil "log" "--max-count=1" "--pretty=oneline" commit)))
438 (if (and descr (string-match "\\`\\([0-9a-f]\\{40\\}\\) *\\(.*\\)$" descr))
439 (concat (substring (match-string 1 descr) 0 10) " - " (match-string 2 descr))
440 descr))))
441
711fc8f6
AJ
442;;;; File info structure
443;;;; ------------------------------------------------------------
444
445; fileinfo structure stolen from pcl-cvs
446(defstruct (git-fileinfo
447 (:copier nil)
448 (:constructor git-create-fileinfo (state name &optional old-perm new-perm rename-state orig-name marked))
449 (:conc-name git-fileinfo->))
450 marked ;; t/nil
451 state ;; current state
452 name ;; file name
453 old-perm new-perm ;; permission flags
454 rename-state ;; rename or copy state
455 orig-name ;; original name for renames or copies
456 needs-refresh) ;; whether file needs to be refreshed
457
458(defvar git-status nil)
459
460(defun git-clear-status (status)
461 "Remove everything from the status list."
462 (ewoc-filter status (lambda (info) nil)))
463
464(defun git-set-files-state (files state)
465 "Set the state of a list of files."
466 (dolist (info files)
467 (unless (eq (git-fileinfo->state info) state)
468 (setf (git-fileinfo->state info) state)
469 (setf (git-fileinfo->rename-state info) nil)
470 (setf (git-fileinfo->orig-name info) nil)
471 (setf (git-fileinfo->needs-refresh info) t))))
472
473(defun git-state-code (code)
474 "Convert from a string to a added/deleted/modified state."
475 (case (string-to-char code)
476 (?M 'modified)
477 (?? 'unknown)
478 (?A 'added)
479 (?D 'deleted)
480 (?U 'unmerged)
481 (t nil)))
482
483(defun git-status-code-as-string (code)
484 "Format a git status code as string."
485 (case code
486 ('modified (propertize "Modified" 'face 'git-status-face))
487 ('unknown (propertize "Unknown " 'face 'git-unknown-face))
488 ('added (propertize "Added " 'face 'git-status-face))
489 ('deleted (propertize "Deleted " 'face 'git-status-face))
490 ('unmerged (propertize "Unmerged" 'face 'git-unmerged-face))
491 ('uptodate (propertize "Uptodate" 'face 'git-uptodate-face))
492 ('ignored (propertize "Ignored " 'face 'git-ignored-face))
493 (t "? ")))
494
495(defun git-rename-as-string (info)
496 "Return a string describing the copy or rename associated with INFO, or an empty string if none."
497 (let ((state (git-fileinfo->rename-state info)))
498 (if state
499 (propertize
500 (concat " ("
501 (if (eq state 'copy) "copied from "
c530c5aa
AJ
502 (if (eq (git-fileinfo->state info) 'added) "renamed from "
503 "renamed to "))
711fc8f6
AJ
504 (git-escape-file-name (git-fileinfo->orig-name info))
505 ")") 'face 'git-status-face)
506 "")))
507
508(defun git-permissions-as-string (old-perm new-perm)
509 "Format a permission change as string."
510 (propertize
511 (if (or (not old-perm)
512 (not new-perm)
18e3e99e 513 (eq 0 (logand ?\111 (logxor old-perm new-perm))))
711fc8f6 514 " "
18e3e99e 515 (if (eq 0 (logand ?\111 old-perm)) "+x" "-x"))
711fc8f6
AJ
516 'face 'git-permission-face))
517
518(defun git-fileinfo-prettyprint (info)
519 "Pretty-printer for the git-fileinfo structure."
03d311ed
AJ
520 (insert (concat " " (if (git-fileinfo->marked info) (propertize "*" 'face 'git-mark-face) " ")
521 " " (git-status-code-as-string (git-fileinfo->state info))
522 " " (git-permissions-as-string (git-fileinfo->old-perm info) (git-fileinfo->new-perm info))
523 " " (git-escape-file-name (git-fileinfo->name info))
711fc8f6
AJ
524 (git-rename-as-string info))))
525
93c22eeb
AJ
526(defun git-insert-fileinfo (status info &optional refresh)
527 "Insert INFO in the status buffer, optionally refreshing an existing one."
528 (let ((node (and refresh
529 (git-find-status-file status (git-fileinfo->name info)))))
530 (setf (git-fileinfo->needs-refresh info) t)
531 (when node ;preserve the marked flag
532 (setf (git-fileinfo->marked info) (git-fileinfo->marked (ewoc-data node))))
533 (if node (ewoc-set-data node info) (ewoc-enter-last status info))))
534
535(defun git-run-diff-index (status files)
536 "Run git-diff-index on FILES and parse the results into STATUS.
537Return the list of files that haven't been handled."
538 (let ((refresh files))
539 (with-temp-buffer
540 (apply #'git-run-command t nil "diff-index" "-z" "-M" "HEAD" "--" files)
541 (goto-char (point-min))
542 (while (re-search-forward
543 ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMU]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0"
544 nil t 1)
545 (let ((old-perm (string-to-number (match-string 1) 8))
546 (new-perm (string-to-number (match-string 2) 8))
547 (state (or (match-string 4) (match-string 6)))
548 (name (or (match-string 5) (match-string 7)))
549 (new-name (match-string 8)))
550 (if new-name ; copy or rename
551 (if (eq ?C (string-to-char state))
552 (git-insert-fileinfo status (git-create-fileinfo 'added new-name old-perm new-perm 'copy name) refresh)
553 (git-insert-fileinfo status (git-create-fileinfo 'deleted name 0 0 'rename new-name) refresh)
554 (git-insert-fileinfo status (git-create-fileinfo 'added new-name old-perm new-perm 'rename name)) refresh)
555 (git-insert-fileinfo status (git-create-fileinfo (git-state-code state) name old-perm new-perm) refresh))
556 (setq files (delete name files))
557 (when new-name (setq files (delete new-name files)))))))
558 files)
711fc8f6
AJ
559
560(defun git-find-status-file (status file)
561 "Find a given file in the status ewoc and return its node."
562 (let ((node (ewoc-nth status 0)))
563 (while (and node (not (string= file (git-fileinfo->name (ewoc-data node)))))
564 (setq node (ewoc-next status node)))
565 node))
566
93c22eeb
AJ
567(defun git-run-ls-files (status files default-state &rest options)
568 "Run git-ls-files on FILES and parse the results into STATUS.
569Return the list of files that haven't been handled."
570 (let ((refresh files))
571 (with-temp-buffer
572 (apply #'git-run-command t nil "ls-files" "-z" "-t" (append options (list "--") files))
573 (goto-char (point-min))
574 (while (re-search-forward "\\([HMRCK?]\\) \\([^\0]*\\)\0" nil t 1)
575 (let ((state (match-string 1))
576 (name (match-string 2)))
577 (git-insert-fileinfo status (git-create-fileinfo (or (git-state-code state) default-state) name) refresh)
578 (setq files (delete name files))))))
579 files)
580
581(defun git-run-ls-unmerged (status files)
582 "Run git-ls-files -u on FILES and parse the results into STATUS."
583 (with-temp-buffer
584 (apply #'git-run-command t nil "ls-files" "-z" "-u" "--" files)
585 (goto-char (point-min))
586 (let (unmerged-files)
587 (while (re-search-forward "[0-7]\\{6\\} [0-9a-f]\\{40\\} [123]\t\\([^\0]+\\)\0" nil t)
588 (let ((node (git-find-status-file status (match-string 1))))
589 (when node (push (ewoc-data node) unmerged-files))))
590 (git-set-files-state unmerged-files 'unmerged))))
591
592(defun git-update-status-files (files &optional default-state)
593 "Update the status of FILES from the index."
711fc8f6 594 (unless git-status (error "Not in git-status buffer."))
93c22eeb
AJ
595 (let* ((status git-status)
596 (remaining-files
597 (if (git-empty-db-p) ; we need some special handling for an empty db
598 (git-run-ls-files status files 'added "-c")
599 (git-run-diff-index status files))))
600 (git-run-ls-unmerged status files)
601 (when (and (or (not files) remaining-files)
602 (file-readable-p ".git/info/exclude"))
603 (setq remaining-files (git-run-ls-files status remaining-files
604 'unknown "-o" "--exclude-from=.git/info/exclude"
605 (concat "--exclude-per-directory=" git-per-dir-ignore-file))))
606 ; mark remaining files with the default state (or remove them if nil)
607 (when remaining-files
608 (if default-state
609 (ewoc-map (lambda (info)
610 (when (member (git-fileinfo->name info) remaining-files)
611 (git-set-files-state (list info) default-state))
612 nil)
613 status)
614 (ewoc-filter status
615 (lambda (info files)
616 (not (member (git-fileinfo->name info) files)))
617 remaining-files)))
618 (git-refresh-files)
619 (git-refresh-ewoc-hf status)))
711fc8f6
AJ
620
621(defun git-marked-files ()
622 "Return a list of all marked files, or if none a list containing just the file at cursor position."
623 (unless git-status (error "Not in git-status buffer."))
624 (or (ewoc-collect git-status (lambda (info) (git-fileinfo->marked info)))
625 (list (ewoc-data (ewoc-locate git-status)))))
626
627(defun git-marked-files-state (&rest states)
628 "Return marked files that are in the specified states."
629 (let ((files (git-marked-files))
630 result)
631 (dolist (info files)
632 (when (memq (git-fileinfo->state info) states)
633 (push info result)))
634 result))
635
636(defun git-refresh-files ()
637 "Refresh all files that need it and clear the needs-refresh flag."
638 (unless git-status (error "Not in git-status buffer."))
639 (ewoc-map
640 (lambda (info)
641 (let ((refresh (git-fileinfo->needs-refresh info)))
642 (setf (git-fileinfo->needs-refresh info) nil)
643 refresh))
644 git-status)
645 ; move back to goal column
646 (when goal-column (move-to-column goal-column)))
647
648(defun git-refresh-ewoc-hf (status)
649 "Refresh the ewoc header and footer."
650 (let ((branch (git-symbolic-ref "HEAD"))
651 (head (if (git-empty-db-p) "Nothing committed yet"
b704e589 652 (git-get-commit-description "HEAD")))
711fc8f6
AJ
653 (merge-heads (git-get-merge-heads)))
654 (ewoc-set-hf status
655 (format "Directory: %s\nBranch: %s\nHead: %s%s\n"
656 default-directory
657 (if (string-match "^refs/heads/" branch)
658 (substring branch (match-end 0))
659 branch)
660 head
661 (if merge-heads
662 (concat "\nMerging: "
b704e589 663 (mapconcat (lambda (str) (git-get-commit-description str)) merge-heads "\n "))
711fc8f6
AJ
664 ""))
665 (if (ewoc-nth status 0) "" " No changes."))))
666
667(defun git-get-filenames (files)
668 (mapcar (lambda (info) (git-fileinfo->name info)) files))
669
670(defun git-update-index (index-file files)
671 "Run git-update-index on a list of files."
672 (let ((env (and index-file `(("GIT_INDEX_FILE" . ,index-file))))
673 added deleted modified)
674 (dolist (info files)
675 (case (git-fileinfo->state info)
676 ('added (push info added))
677 ('deleted (push info deleted))
678 ('modified (push info modified))))
679 (when added
680 (apply #'git-run-command nil env "update-index" "--add" "--" (git-get-filenames added)))
681 (when deleted
682 (apply #'git-run-command nil env "update-index" "--remove" "--" (git-get-filenames deleted)))
683 (when modified
684 (apply #'git-run-command nil env "update-index" "--" (git-get-filenames modified)))))
685
d55552f6
AJ
686(defun git-run-pre-commit-hook ()
687 "Run the pre-commit hook if any."
688 (unless git-status (error "Not in git-status buffer."))
689 (let ((files (git-marked-files-state 'added 'deleted 'modified)))
690 (or (not files)
691 (not (file-executable-p ".git/hooks/pre-commit"))
692 (let ((index-file (make-temp-file "gitidx")))
693 (unwind-protect
694 (let ((head-tree (unless (git-empty-db-p) (git-rev-parse "HEAD^{tree}"))))
695 (git-read-tree head-tree index-file)
696 (git-update-index index-file files)
697 (git-run-hook "pre-commit" `(("GIT_INDEX_FILE" . ,index-file))))
698 (delete-file index-file))))))
699
711fc8f6
AJ
700(defun git-do-commit ()
701 "Perform the actual commit using the current buffer as log message."
702 (interactive)
703 (let ((buffer (current-buffer))
704 (index-file (make-temp-file "gitidx")))
705 (with-current-buffer log-edit-parent-buffer
706 (if (git-marked-files-state 'unmerged)
707 (message "You cannot commit unmerged files, resolve them first.")
708 (unwind-protect
709 (let ((files (git-marked-files-state 'added 'deleted 'modified))
710 head head-tree)
711 (unless (git-empty-db-p)
712 (setq head (git-rev-parse "HEAD")
713 head-tree (git-rev-parse "HEAD^{tree}")))
714 (if files
715 (progn
716 (git-read-tree head-tree index-file)
717 (git-update-index nil files) ;update both the default index
718 (git-update-index index-file files) ;and the temporary one
719 (let ((tree (git-write-tree index-file)))
720 (if (or (not (string-equal tree head-tree))
721 (yes-or-no-p "The tree was not modified, do you really want to perform an empty commit? "))
722 (let ((commit (git-commit-tree buffer tree head)))
711fc8f6 723 (condition-case nil (delete-file ".git/MERGE_HEAD") (error nil))
2379d61f 724 (condition-case nil (delete-file ".git/MERGE_MSG") (error nil))
711fc8f6
AJ
725 (with-current-buffer buffer (erase-buffer))
726 (git-set-files-state files 'uptodate)
b4372ef1 727 (git-run-command nil nil "rerere")
711fc8f6
AJ
728 (git-refresh-files)
729 (git-refresh-ewoc-hf git-status)
d55552f6
AJ
730 (message "Committed %s." commit)
731 (git-run-hook "post-commit" nil))
711fc8f6
AJ
732 (message "Commit aborted."))))
733 (message "No files to commit.")))
734 (delete-file index-file))))))
735
736
737;;;; Interactive functions
738;;;; ------------------------------------------------------------
739
740(defun git-mark-file ()
741 "Mark the file that the cursor is on and move to the next one."
742 (interactive)
743 (unless git-status (error "Not in git-status buffer."))
744 (let* ((pos (ewoc-locate git-status))
745 (info (ewoc-data pos)))
746 (setf (git-fileinfo->marked info) t)
747 (ewoc-invalidate git-status pos)
748 (ewoc-goto-next git-status 1)))
749
750(defun git-unmark-file ()
751 "Unmark the file that the cursor is on and move to the next one."
752 (interactive)
753 (unless git-status (error "Not in git-status buffer."))
754 (let* ((pos (ewoc-locate git-status))
755 (info (ewoc-data pos)))
756 (setf (git-fileinfo->marked info) nil)
757 (ewoc-invalidate git-status pos)
758 (ewoc-goto-next git-status 1)))
759
760(defun git-unmark-file-up ()
761 "Unmark the file that the cursor is on and move to the previous one."
762 (interactive)
763 (unless git-status (error "Not in git-status buffer."))
764 (let* ((pos (ewoc-locate git-status))
765 (info (ewoc-data pos)))
766 (setf (git-fileinfo->marked info) nil)
767 (ewoc-invalidate git-status pos)
768 (ewoc-goto-prev git-status 1)))
769
770(defun git-mark-all ()
771 "Mark all files."
772 (interactive)
773 (unless git-status (error "Not in git-status buffer."))
774 (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) t) t) git-status)
775 ; move back to goal column after invalidate
776 (when goal-column (move-to-column goal-column)))
777
778(defun git-unmark-all ()
779 "Unmark all files."
780 (interactive)
781 (unless git-status (error "Not in git-status buffer."))
782 (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) nil) t) git-status)
783 ; move back to goal column after invalidate
784 (when goal-column (move-to-column goal-column)))
785
786(defun git-toggle-all-marks ()
787 "Toggle all file marks."
788 (interactive)
789 (unless git-status (error "Not in git-status buffer."))
790 (ewoc-map (lambda (info) (setf (git-fileinfo->marked info) (not (git-fileinfo->marked info))) t) git-status)
791 ; move back to goal column after invalidate
792 (when goal-column (move-to-column goal-column)))
793
794(defun git-next-file (&optional n)
795 "Move the selection down N files."
796 (interactive "p")
797 (unless git-status (error "Not in git-status buffer."))
798 (ewoc-goto-next git-status n))
799
800(defun git-prev-file (&optional n)
801 "Move the selection up N files."
802 (interactive "p")
803 (unless git-status (error "Not in git-status buffer."))
804 (ewoc-goto-prev git-status n))
805
8a078c3f
AJ
806(defun git-next-unmerged-file (&optional n)
807 "Move the selection down N unmerged files."
808 (interactive "p")
809 (unless git-status (error "Not in git-status buffer."))
810 (let* ((last (ewoc-locate git-status))
811 (node (ewoc-next git-status last)))
812 (while (and node (> n 0))
813 (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
814 (setq n (1- n))
815 (setq last node))
816 (setq node (ewoc-next git-status node)))
817 (ewoc-goto-node git-status last)))
818
819(defun git-prev-unmerged-file (&optional n)
820 "Move the selection up N unmerged files."
821 (interactive "p")
822 (unless git-status (error "Not in git-status buffer."))
823 (let* ((last (ewoc-locate git-status))
824 (node (ewoc-prev git-status last)))
825 (while (and node (> n 0))
826 (when (eq 'unmerged (git-fileinfo->state (ewoc-data node)))
827 (setq n (1- n))
828 (setq last node))
829 (setq node (ewoc-prev git-status node)))
830 (ewoc-goto-node git-status last)))
831
711fc8f6
AJ
832(defun git-add-file ()
833 "Add marked file(s) to the index cache."
834 (interactive)
93c22eeb 835 (let ((files (git-get-filenames (git-marked-files-state 'unknown))))
711fc8f6 836 (unless files
93c22eeb
AJ
837 (push (file-relative-name (read-file-name "File to add: " nil nil t)) files))
838 (apply #'git-run-command nil nil "update-index" "--add" "--" files)
839 (git-update-status-files files 'uptodate)))
711fc8f6
AJ
840
841(defun git-ignore-file ()
842 "Add marked file(s) to the ignore list."
843 (interactive)
93c22eeb 844 (let ((files (git-get-filenames (git-marked-files-state 'unknown))))
711fc8f6 845 (unless files
93c22eeb
AJ
846 (push (file-relative-name (read-file-name "File to ignore: " nil nil t)) files))
847 (dolist (f files) (git-append-to-ignore f))
848 (git-update-status-files files 'ignored)))
711fc8f6
AJ
849
850(defun git-remove-file ()
851 "Remove the marked file(s)."
852 (interactive)
93c22eeb 853 (let ((files (git-get-filenames (git-marked-files-state 'added 'modified 'unknown 'uptodate))))
711fc8f6 854 (unless files
93c22eeb 855 (push (file-relative-name (read-file-name "File to remove: " nil nil t)) files))
711fc8f6
AJ
856 (if (yes-or-no-p
857 (format "Remove %d file%s? " (length files) (if (> (length files) 1) "s" "")))
858 (progn
93c22eeb
AJ
859 (dolist (name files)
860 (when (file-exists-p name) (delete-file name)))
861 (apply #'git-run-command nil nil "update-index" "--remove" "--" files)
862 (git-update-status-files files nil))
711fc8f6
AJ
863 (message "Aborting"))))
864
865(defun git-revert-file ()
866 "Revert changes to the marked file(s)."
867 (interactive)
868 (let ((files (git-marked-files))
869 added modified)
870 (when (and files
871 (yes-or-no-p
872 (format "Revert %d file%s? " (length files) (if (> (length files) 1) "s" ""))))
873 (dolist (info files)
874 (case (git-fileinfo->state info)
93c22eeb
AJ
875 ('added (push (git-fileinfo->name info) added))
876 ('deleted (push (git-fileinfo->name info) modified))
877 ('unmerged (push (git-fileinfo->name info) modified))
878 ('modified (push (git-fileinfo->name info) modified))))
711fc8f6 879 (when added
93c22eeb 880 (apply #'git-run-command nil nil "update-index" "--force-remove" "--" added))
711fc8f6 881 (when modified
93c22eeb
AJ
882 (apply #'git-run-command nil nil "checkout" "HEAD" modified))
883 (git-update-status-files (append added modified) 'uptodate))))
711fc8f6
AJ
884
885(defun git-resolve-file ()
886 "Resolve conflicts in marked file(s)."
887 (interactive)
93c22eeb 888 (let ((files (git-get-filenames (git-marked-files-state 'unmerged))))
711fc8f6 889 (when files
93c22eeb
AJ
890 (apply #'git-run-command nil nil "update-index" "--" files)
891 (git-update-status-files files 'uptodate))))
711fc8f6
AJ
892
893(defun git-remove-handled ()
894 "Remove handled files from the status list."
895 (interactive)
896 (ewoc-filter git-status
897 (lambda (info)
898 (not (or (eq (git-fileinfo->state info) 'ignored)
899 (eq (git-fileinfo->state info) 'uptodate)))))
900 (unless (ewoc-nth git-status 0) ; refresh header if list is empty
901 (git-refresh-ewoc-hf git-status)))
902
903(defun git-setup-diff-buffer (buffer)
904 "Setup a buffer for displaying a diff."
905 (with-current-buffer buffer
906 (diff-mode)
907 (goto-char (point-min))
908 (setq buffer-read-only t))
909 (display-buffer buffer)
910 (shrink-window-if-larger-than-buffer))
911
912(defun git-diff-file ()
913 "Diff the marked file(s) against HEAD."
914 (interactive)
915 (let ((files (git-marked-files)))
916 (git-setup-diff-buffer
917 (apply #'git-run-command-buffer "*git-diff*" "diff-index" "-p" "-M" "HEAD" "--" (git-get-filenames files)))))
918
2b1c0ef2
AJ
919(defun git-diff-file-merge-head (arg)
920 "Diff the marked file(s) against the first merge head (or the nth one with a numeric prefix)."
921 (interactive "p")
922 (let ((files (git-marked-files))
923 (merge-heads (git-get-merge-heads)))
924 (unless merge-heads (error "No merge in progress"))
925 (git-setup-diff-buffer
926 (apply #'git-run-command-buffer "*git-diff*" "diff-index" "-p" "-M"
927 (or (nth (1- arg) merge-heads) "HEAD") "--" (git-get-filenames files)))))
928
711fc8f6
AJ
929(defun git-diff-unmerged-file (stage)
930 "Diff the marked unmerged file(s) against the specified stage."
931 (let ((files (git-marked-files)))
932 (git-setup-diff-buffer
933 (apply #'git-run-command-buffer "*git-diff*" "diff-files" "-p" stage "--" (git-get-filenames files)))))
934
935(defun git-diff-file-base ()
936 "Diff the marked unmerged file(s) against the common base file."
937 (interactive)
938 (git-diff-unmerged-file "-1"))
939
940(defun git-diff-file-mine ()
941 "Diff the marked unmerged file(s) against my pre-merge version."
942 (interactive)
943 (git-diff-unmerged-file "-2"))
944
945(defun git-diff-file-other ()
946 "Diff the marked unmerged file(s) against the other's pre-merge version."
947 (interactive)
948 (git-diff-unmerged-file "-3"))
949
950(defun git-diff-file-combined ()
951 "Do a combined diff of the marked unmerged file(s)."
952 (interactive)
953 (git-diff-unmerged-file "-c"))
954
955(defun git-diff-file-idiff ()
956 "Perform an interactive diff on the current file."
957 (interactive)
958 (error "Interactive diffs not implemented yet."))
959
960(defun git-log-file ()
961 "Display a log of changes to the marked file(s)."
962 (interactive)
963 (let* ((files (git-marked-files))
964 (coding-system-for-read git-commits-coding-system)
965 (buffer (apply #'git-run-command-buffer "*git-log*" "rev-list" "--pretty" "HEAD" "--" (git-get-filenames files))))
966 (with-current-buffer buffer
967 ; (git-log-mode) FIXME: implement log mode
968 (goto-char (point-min))
969 (setq buffer-read-only t))
970 (display-buffer buffer)))
971
972(defun git-log-edit-files ()
973 "Return a list of marked files for use in the log-edit buffer."
974 (with-current-buffer log-edit-parent-buffer
975 (git-get-filenames (git-marked-files-state 'added 'deleted 'modified))))
976
38448147
AJ
977(defun git-append-sign-off (name email)
978 "Append a Signed-off-by entry to the current buffer, avoiding duplicates."
979 (let ((sign-off (format "Signed-off-by: %s <%s>" name email))
980 (case-fold-search t))
981 (goto-char (point-min))
982 (unless (re-search-forward (concat "^" (regexp-quote sign-off)) nil t)
983 (goto-char (point-min))
984 (unless (re-search-forward "^Signed-off-by: " nil t)
985 (setq sign-off (concat "\n" sign-off)))
986 (goto-char (point-max))
987 (insert sign-off "\n"))))
988
60fa08ed
AJ
989(defun git-setup-log-buffer (buffer &optional author-name author-email subject date msg)
990 "Setup the log buffer for a commit."
711fc8f6 991 (unless git-status (error "Not in git-status buffer."))
60fa08ed 992 (let ((merge-heads (git-get-merge-heads))
45033ad9 993 (dir default-directory)
38448147
AJ
994 (committer-name (git-get-committer-name))
995 (committer-email (git-get-committer-email))
45033ad9 996 (sign-off git-append-signed-off-by))
711fc8f6 997 (with-current-buffer buffer
60fa08ed
AJ
998 (cd dir)
999 (erase-buffer)
1000 (insert
1001 (propertize
1002 (format "Author: %s <%s>\n%s%s"
1003 (or author-name committer-name)
1004 (or author-email committer-email)
1005 (if date (format "Date: %s\n" date) "")
1006 (if merge-heads
1007 (format "Parent: %s\n%s\n"
1008 (git-rev-parse "HEAD")
1009 (mapconcat (lambda (str) (concat "Parent: " str)) merge-heads "\n"))
1010 ""))
1011 'face 'git-header-face)
1012 (propertize git-log-msg-separator 'face 'git-separator-face)
1013 "\n")
1014 (when subject (insert subject "\n\n"))
1015 (cond (msg (insert msg "\n"))
1016 ((file-readable-p ".dotest/msg")
1017 (insert-file-contents ".dotest/msg"))
1018 ((file-readable-p ".git/MERGE_MSG")
1019 (insert-file-contents ".git/MERGE_MSG")))
1020 ; delete empty lines at end
1021 (goto-char (point-min))
1022 (when (re-search-forward "\n+\\'" nil t)
1023 (replace-match "\n" t t))
1024 (when sign-off (git-append-sign-off committer-name committer-email)))))
1025
1026(defun git-commit-file ()
1027 "Commit the marked file(s), asking for a commit message."
1028 (interactive)
1029 (unless git-status (error "Not in git-status buffer."))
d55552f6
AJ
1030 (when (git-run-pre-commit-hook)
1031 (let ((buffer (get-buffer-create "*git-commit*"))
1032 (coding-system (git-get-commits-coding-system))
1033 author-name author-email subject date)
1034 (when (eq 0 (buffer-size buffer))
1035 (when (file-readable-p ".dotest/info")
1036 (with-temp-buffer
1037 (insert-file-contents ".dotest/info")
1038 (goto-char (point-min))
1039 (when (re-search-forward "^Author: \\(.*\\)\nEmail: \\(.*\\)$" nil t)
1040 (setq author-name (match-string 1))
1041 (setq author-email (match-string 2)))
1042 (goto-char (point-min))
1043 (when (re-search-forward "^Subject: \\(.*\\)$" nil t)
1044 (setq subject (match-string 1)))
1045 (goto-char (point-min))
1046 (when (re-search-forward "^Date: \\(.*\\)$" nil t)
1047 (setq date (match-string 1)))))
1048 (git-setup-log-buffer buffer author-name author-email subject date))
1049 (log-edit #'git-do-commit nil #'git-log-edit-files buffer)
1050 (setq font-lock-keywords (font-lock-compile-keywords git-log-edit-font-lock-keywords))
1051 (setq buffer-file-coding-system coding-system)
1052 (re-search-forward (regexp-quote (concat git-log-msg-separator "\n")) nil t))))
711fc8f6
AJ
1053
1054(defun git-find-file ()
1055 "Visit the current file in its own buffer."
1056 (interactive)
1057 (unless git-status (error "Not in git-status buffer."))
1058 (let ((info (ewoc-data (ewoc-locate git-status))))
1059 (find-file (git-fileinfo->name info))
1060 (when (eq 'unmerged (git-fileinfo->state info))
1061 (smerge-mode))))
1062
b8ee5181
AJ
1063(defun git-find-file-other-window ()
1064 "Visit the current file in its own buffer in another window."
1065 (interactive)
1066 (unless git-status (error "Not in git-status buffer."))
1067 (let ((info (ewoc-data (ewoc-locate git-status))))
1068 (find-file-other-window (git-fileinfo->name info))
1069 (when (eq 'unmerged (git-fileinfo->state info))
1070 (smerge-mode))))
1071
711fc8f6
AJ
1072(defun git-find-file-imerge ()
1073 "Visit the current file in interactive merge mode."
1074 (interactive)
1075 (unless git-status (error "Not in git-status buffer."))
1076 (let ((info (ewoc-data (ewoc-locate git-status))))
1077 (find-file (git-fileinfo->name info))
1078 (smerge-ediff)))
1079
1080(defun git-view-file ()
1081 "View the current file in its own buffer."
1082 (interactive)
1083 (unless git-status (error "Not in git-status buffer."))
1084 (let ((info (ewoc-data (ewoc-locate git-status))))
1085 (view-file (git-fileinfo->name info))))
1086
1087(defun git-refresh-status ()
1088 "Refresh the git status buffer."
1089 (interactive)
1090 (let* ((status git-status)
1091 (pos (ewoc-locate status))
1092 (cur-name (and pos (git-fileinfo->name (ewoc-data pos)))))
1093 (unless status (error "Not in git-status buffer."))
93c22eeb 1094 (git-run-command nil nil "update-index" "--refresh")
711fc8f6 1095 (git-clear-status status)
93c22eeb 1096 (git-update-status-files nil)
711fc8f6
AJ
1097 ; move point to the current file name if any
1098 (let ((node (and cur-name (git-find-status-file status cur-name))))
1099 (when node (ewoc-goto-node status node)))))
1100
1101(defun git-status-quit ()
1102 "Quit git-status mode."
1103 (interactive)
1104 (bury-buffer))
1105
1106;;;; Major Mode
1107;;;; ------------------------------------------------------------
1108
1109(defvar git-status-mode-hook nil
1110 "Run after `git-status-mode' is setup.")
1111
1112(defvar git-status-mode-map nil
1113 "Keymap for git major mode.")
1114
1115(defvar git-status nil
1116 "List of all files managed by the git-status mode.")
1117
1118(unless git-status-mode-map
1119 (let ((map (make-keymap))
1120 (diff-map (make-sparse-keymap)))
1121 (suppress-keymap map)
5716e794
JN
1122 (define-key map "?" 'git-help)
1123 (define-key map "h" 'git-help)
711fc8f6
AJ
1124 (define-key map " " 'git-next-file)
1125 (define-key map "a" 'git-add-file)
1126 (define-key map "c" 'git-commit-file)
1127 (define-key map "d" diff-map)
1128 (define-key map "=" 'git-diff-file)
1129 (define-key map "f" 'git-find-file)
18e3e99e 1130 (define-key map "\r" 'git-find-file)
711fc8f6
AJ
1131 (define-key map "g" 'git-refresh-status)
1132 (define-key map "i" 'git-ignore-file)
1133 (define-key map "l" 'git-log-file)
1134 (define-key map "m" 'git-mark-file)
1135 (define-key map "M" 'git-mark-all)
1136 (define-key map "n" 'git-next-file)
8a078c3f 1137 (define-key map "N" 'git-next-unmerged-file)
b8ee5181 1138 (define-key map "o" 'git-find-file-other-window)
711fc8f6 1139 (define-key map "p" 'git-prev-file)
8a078c3f 1140 (define-key map "P" 'git-prev-unmerged-file)
711fc8f6
AJ
1141 (define-key map "q" 'git-status-quit)
1142 (define-key map "r" 'git-remove-file)
1143 (define-key map "R" 'git-resolve-file)
1144 (define-key map "T" 'git-toggle-all-marks)
1145 (define-key map "u" 'git-unmark-file)
1146 (define-key map "U" 'git-revert-file)
1147 (define-key map "v" 'git-view-file)
1148 (define-key map "x" 'git-remove-handled)
1149 (define-key map "\C-?" 'git-unmark-file-up)
1150 (define-key map "\M-\C-?" 'git-unmark-all)
1151 ; the diff submap
1152 (define-key diff-map "b" 'git-diff-file-base)
1153 (define-key diff-map "c" 'git-diff-file-combined)
1154 (define-key diff-map "=" 'git-diff-file)
1155 (define-key diff-map "e" 'git-diff-file-idiff)
1156 (define-key diff-map "E" 'git-find-file-imerge)
2b1c0ef2 1157 (define-key diff-map "h" 'git-diff-file-merge-head)
711fc8f6
AJ
1158 (define-key diff-map "m" 'git-diff-file-mine)
1159 (define-key diff-map "o" 'git-diff-file-other)
1160 (setq git-status-mode-map map)))
1161
1162;; git mode should only run in the *git status* buffer
1163(put 'git-status-mode 'mode-class 'special)
1164
1165(defun git-status-mode ()
1166 "Major mode for interacting with Git.
1167Commands:
1168\\{git-status-mode-map}"
1169 (kill-all-local-variables)
1170 (buffer-disable-undo)
1171 (setq mode-name "git status"
1172 major-mode 'git-status-mode
1173 goal-column 17
1174 buffer-read-only t)
1175 (use-local-map git-status-mode-map)
1176 (let ((buffer-read-only nil))
1177 (erase-buffer)
1178 (let ((status (ewoc-create 'git-fileinfo-prettyprint "" "")))
1179 (set (make-local-variable 'git-status) status))
a944652c 1180 (set (make-local-variable 'list-buffers-directory) default-directory)
711fc8f6
AJ
1181 (run-hooks 'git-status-mode-hook)))
1182
73389f12
AJ
1183(defun git-find-status-buffer (dir)
1184 "Find the git status buffer handling a specified directory."
1185 (let ((list (buffer-list))
1186 (fulldir (expand-file-name dir))
1187 found)
1188 (while (and list (not found))
1189 (let ((buffer (car list)))
1190 (with-current-buffer buffer
1191 (when (and list-buffers-directory
1192 (string-equal fulldir (expand-file-name list-buffers-directory))
1193 (string-match "\\*git-status\\*$" (buffer-name buffer)))
1194 (setq found buffer))))
1195 (setq list (cdr list)))
1196 found))
1197
711fc8f6
AJ
1198(defun git-status (dir)
1199 "Entry point into git-status mode."
1200 (interactive "DSelect directory: ")
1201 (setq dir (git-get-top-dir dir))
1202 (if (file-directory-p (concat (file-name-as-directory dir) ".git"))
73389f12
AJ
1203 (let ((buffer (or (and git-reuse-status-buffer (git-find-status-buffer dir))
1204 (create-file-buffer (expand-file-name "*git-status*" dir)))))
711fc8f6 1205 (switch-to-buffer buffer)
711fc8f6 1206 (cd dir)
a944652c 1207 (git-status-mode)
711fc8f6
AJ
1208 (git-refresh-status)
1209 (goto-char (point-min)))
1210 (message "%s is not a git working tree." dir)))
1211
5716e794
JN
1212(defun git-help ()
1213 "Display help for Git mode."
1214 (interactive)
1215 (describe-function 'git-status-mode))
1216
711fc8f6
AJ
1217(provide 'git)
1218;;; git.el ends here