1 ;;; vc-git.el --- VC backend for the git version control system
3 ;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
5 ;; Author: Alexandre Julliard <julliard@winehq.org>
8 ;; This file is part of GNU Emacs.
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 3, or (at your option)
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
23 ;; Boston, MA 02110-1301, USA.
27 ;; This file contains a VC backend for the git version control
33 ;; To install: put this file on the load-path and add Git to the list
34 ;; of supported backends in `vc-handled-backends'; the following line,
35 ;; placed in your ~/.emacs, will accomplish this:
37 ;; (add-to-list 'vc-handled-backends 'Git)
40 ;; - check if more functions could use vc-git-command instead
42 ;; - changelog generation
44 ;; Implement the rest of the vc interface. See the comment at the
45 ;; beginning of vc.el. The current status is:
46 ;; ("??" means: "figure out what to do about it")
48 ;; FUNCTION NAME STATUS
50 ;; * revision-granularity OK
51 ;; STATE-QUERYING FUNCTIONS
52 ;; * registered (file) OK
54 ;; - state-heuristic (file) NOT NEEDED
55 ;; - dir-state (dir) OK
56 ;; * workfile-version (file) OK
57 ;; - latest-on-branch-p (file) NOT NEEDED
58 ;; * checkout-model (file) OK
59 ;; - workfile-unchanged-p (file) OK
60 ;; - mode-line-string (file) NOT NEEDED
61 ;; - dired-state-info (file) OK
62 ;; STATE-CHANGING FUNCTIONS
63 ;; * create-repo () OK
64 ;; * register (files &optional rev comment) OK
65 ;; - init-version (file) NOT NEEDED
66 ;; - responsible-p (file) OK
67 ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD
68 ;; - receive-file (file rev) NOT NEEDED
69 ;; - unregister (file) OK
70 ;; * checkin (files rev comment) OK
71 ;; * find-version (file rev buffer) OK
72 ;; * checkout (file &optional editable rev) OK
73 ;; * revert (file &optional contents-done) OK
74 ;; - rollback (files) COULD BE SUPPORTED
75 ;; - merge (file rev1 rev2) It would be possible to merge changes into
76 ;; a single file, but when committing they
77 ;; wouldn't be identified as a merge by git,
78 ;; so it's probably not a good idea.
79 ;; - merge-news (file) see `merge'
80 ;; - steal-lock (file &optional version) NOT NEEDED
82 ;; * print-log (files &optional buffer) OK
83 ;; - log-view-mode () OK
84 ;; - show-log-entry (version) NOT NEEDED, DEFAULT IS GOOD
85 ;; - wash-log (file) COULD BE SUPPORTED
86 ;; - logentry-check () NOT NEEDED
87 ;; - comment-history (file) ??
88 ;; - update-changelog (files) COULD BE SUPPORTED
89 ;; * diff (file &optional rev1 rev2 buffer) OK
90 ;; - revision-completion-table (file) NEEDED?
91 ;; - diff-tree (dir &optional rev1 rev2) OK
92 ;; - annotate-command (file buf &optional rev) OK
93 ;; - annotate-time () OK
94 ;; - annotate-current-time () NOT NEEDED
95 ;; - annotate-extract-revision-at-line () OK
97 ;; - create-snapshot (dir name branchp) OK
98 ;; - assign-name (file name) NOT NEEDED
99 ;; - retrieve-snapshot (dir name update) OK, needs to update buffers
101 ;; - make-version-backups-p (file) NOT NEEDED
102 ;; - repository-hostname (dirname) NOT NEEDED
103 ;; - previous-version (file rev) OK
104 ;; - next-version (file rev) OK
105 ;; - check-headers () COULD BE SUPPORTED
106 ;; - clear-headers () NOT NEEDED
107 ;; - delete-file (file) OK
108 ;; - rename-file (old new) OK
109 ;; - find-file-hook () NOT NEEDED
110 ;; - find-file-not-found-hook () NOT NEEDED
112 (eval-when-compile (require 'cl
) (require 'vc
))
114 (defvar git-commits-coding-system
'utf-8
115 "Default coding system for git commits.")
117 ;;; BACKEND PROPERTIES
119 (defun vc-git-revision-granularity ()
122 ;;; STATE-QUERYING FUNCTIONS
124 ;;;###autoload (defun vc-git-registered (file)
125 ;;;###autoload "Return non-nil if FILE is registered with git."
126 ;;;###autoload (if (vc-find-root file ".git") ; short cut
127 ;;;###autoload (progn
128 ;;;###autoload (load "vc-git")
129 ;;;###autoload (vc-git-registered file))))
131 (defun vc-git-registered (file)
132 "Check whether FILE is registered with git."
133 (when (vc-git-root file
)
135 (let* ((dir (file-name-directory file
))
136 (name (file-relative-name file dir
)))
139 (eq 0 (call-process "git" nil
'(t nil
) nil
"ls-files" "-c" "-z" "--" name
)))
140 (let ((str (buffer-string)))
141 (and (> (length str
) (length name
))
142 (string= (substring str
0 (1+ (length name
))) (concat name
"\0")))))))))
144 (defun vc-git-state (file)
145 "Git-specific version of `vc-state'."
146 (let ((diff (vc-git--run-command-string file
"diff-index" "-z" "HEAD" "--")))
147 (if (and diff
(string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" diff
))
151 (defun vc-git-dir-state (dir)
153 (vc-git-command (current-buffer) nil nil
"ls-files" "-t")
154 (goto-char (point-min))
155 (let ((status-char nil
)
158 (setq status-char
(char-after))
161 (buffer-substring-no-properties (+ (point) 2) (line-end-position))))
163 ;; The rest of the possible states in "git ls-files -t" output:
166 ;; should not show up in vc-dired, so don't deal with them
169 (vc-file-setprop file
'vc-state
'up-to-date
))
171 (vc-file-setprop file
'vc-state
'edited
))
173 (vc-file-setprop file
'vc-state
'edited
))
175 (vc-file-setprop file
'vc-backend
'none
)
176 (vc-file-setprop file
'vc-state
'nil
)))
179 (defun vc-git-workfile-version (file)
180 "Git-specific version of `vc-workfile-version'."
181 (let ((str (with-output-to-string
182 (with-current-buffer standard-output
183 (call-process "git" nil
'(t nil
) nil
"symbolic-ref" "HEAD")))))
184 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str
)
188 (defun vc-git-checkout-model (file)
191 (defun vc-git-workfile-unchanged-p (file)
192 ;; The reason this does not use the result of vc-git-state is that
193 ;; git-diff-index (used by vc-git-state) doesn't refresh the cached
194 ;; stat info, so if the file has been modified it will always show
195 ;; up as modified in vc-git-state, even if the change has been
196 ;; undone, until git-update-index --refresh is run.
198 ;; OTOH the vc-git-workfile-unchanged-p implementation checks the
199 ;; actual content, so it will detect the case of a file reverted
200 ;; back to its original state.
202 ;; The ideal implementation would be to refresh the stat cache and
203 ;; then call vc-git-state, but at the moment there's no git command
204 ;; to refresh a single file, so this will have to be added first.
205 (let ((sha1 (vc-git--run-command-string file
"hash-object" "--"))
206 (head (vc-git--run-command-string file
"ls-tree" "-z" "HEAD" "--")))
208 (string-match "[0-7]\\{6\\} blob \\([0-9a-f]\\{40\\}\\)\t[^\0]+\0" head
)
209 (string= (car (split-string sha1
"\n")) (match-string 1 head
)))))
211 (defun vc-git-dired-state-info (file)
212 "Git-specific version of `vc-dired-state-info'."
213 (let ((git-state (vc-state file
)))
214 (if (eq git-state
'edited
)
216 ;; fall back to the default VC representation
217 (vc-default-dired-state-info 'Git file
))))
219 ;;; STATE-CHANGING FUNCTIONS
221 (defun vc-git-create-repo ()
222 "Create a new Git repository."
223 (vc-git-command "init" nil
0 nil
))
225 (defun vc-git-register (files &optional rev comment
)
226 "Register FILE into the git version-control system."
227 (vc-git-command nil
0 files
"update-index" "--add" "--"))
229 (defalias 'vc-git-responsible-p
'vc-git-root
)
231 (defun vc-git-unregister (file)
232 (vc-git-command nil
0 file
"rm" "-f" "--cached" "--"))
235 (defun vc-git-checkin (files rev comment
)
236 (let ((coding-system-for-write git-commits-coding-system
))
237 (vc-git-command nil
0 files
"commit" "-m" comment
"--only" "--")))
239 (defun vc-git-find-version (file rev buffer
)
240 (let ((coding-system-for-read 'binary
)
241 (coding-system-for-write 'binary
)
243 (vc-git--run-command-string
244 file
"ls-files" "-z" "--full-name" "--")
248 (concat (if rev rev
"HEAD") ":" fullname
) "cat-file" "blob")))
250 (defun vc-git-checkout (file &optional editable rev
)
251 (vc-git-command nil
0 file
"checkout" (or rev
"HEAD")))
253 (defun vc-git-revert (file &optional contents-done
)
254 "Revert FILE to the version stored in the git repository."
256 (vc-git-command nil
0 file
"update-index" "--")
257 (vc-git-command nil
0 file
"checkout" "HEAD")))
259 ;;; HISTORY FUNCTIONS
261 (defun vc-git-print-log (files &optional buffer
)
262 "Get change log associated with FILES."
263 (let ((coding-system-for-read git-commits-coding-system
)
264 ;; Support both the old print-log interface that passes a
265 ;; single file, and the new one that passes a file list.
266 (flist (if (listp files
) files
(list files
))))
267 ;; `vc-do-command' creates the buffer, but we need it before running
269 (vc-setup-buffer buffer
)
270 ;; If the buffer exists from a previous invocation it might be
272 (let ((inhibit-read-only t
))
273 ;; XXX `log-view-mode' needs to have something to identify where
274 ;; the log for each individual file starts. It seems that by
275 ;; default git does not output this info. So loop here and call
276 ;; "git rev-list" on each file separately to make sure that each
277 ;; file gets a "File:" header before the corresponding
278 ;; log. Maybe there is a way to do this with one command...
282 (insert "File: " (file-name-nondirectory file
) "\n"))
283 (vc-git-command buffer
'async
(file-relative-name file
)
284 "rev-list" "--pretty" "HEAD" "--")))))
286 (defvar log-view-message-re
)
287 (defvar log-view-file-re
)
288 (defvar log-view-font-lock-keywords
)
290 (define-derived-mode vc-git-log-view-mode log-view-mode
"Git-Log-View"
291 (require 'add-log
) ;; we need the faces add-log
292 ;; Don't have file markers, so use impossible regexp.
293 (set (make-local-variable 'log-view-file-re
) "^File:[ \t]+\\(.+\\)")
294 (set (make-local-variable 'log-view-message-re
)
295 "^commit *\\([0-9a-z]+\\)")
296 (set (make-local-variable 'log-view-font-lock-keywords
)
298 `((,log-view-message-re
(1 'change-log-acknowledgement
))
299 (,log-view-file-re
(1 'change-log-file-face
)))
302 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
303 (1 'change-log-email
))
305 ;; user: FirstName LastName <foo@bar>
306 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
308 (2 'change-log-email
))
309 ("^Date: \\(.+\\)" (1 'change-log-date
))
310 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message
))))))
312 (defun vc-git-diff (files &optional rev1 rev2 buffer
)
313 (let ((buf (or buffer
"*vc-diff*")))
315 (vc-git-command buf
1 files
"diff-tree" "--exit-code" "-p" rev1 rev2
"--")
316 (vc-git-command buf
1 files
"diff-index" "--exit-code" "-p" (or rev1
"HEAD") "--"))))
318 (defun vc-git-revision-table (file)
319 (let ((table (list "HEAD")))
321 (vc-git-command t nil nil
"for-each-ref" "--format=%(refname)")
322 (goto-char (point-min))
323 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t
)
324 (push (match-string 2) table
)))
327 (defun vc-git-revision-completion-table (file)
328 (lexical-let ((file file
)
330 (setq table
(lazy-completion-table
331 table
(lambda () (vc-git-revision-table file
))))
334 (defun vc-git-diff-tree (dir &optional rev1 rev2
)
335 (vc-git-diff dir rev1 rev2
))
337 (defun vc-git-annotate-command (file buf
&optional rev
)
338 ;; FIXME: rev is ignored
339 (let ((name (file-relative-name file
)))
340 (vc-git-command buf
0 name
"blame" (if rev
(concat "-r" rev
)))))
342 (defun vc-git-annotate-time ()
343 (and (re-search-forward "[0-9a-f]+ (.* \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\) \\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\) \\([-+0-9]+\\) +[0-9]+)" nil t
)
344 (vc-annotate-convert-time
345 (apply #'encode-time
(mapcar (lambda (match) (string-to-number (match-string match
))) '(6 5 4 3 2 1 7))))))
347 (defun vc-git-annotate-extract-revision-at-line ()
349 (move-beginning-of-line 1)
350 (and (looking-at "[0-9a-f]+")
351 (buffer-substring-no-properties (match-beginning 0) (match-end 0)))))
355 (defun vc-git-create-snapshot (dir name branchp
)
356 (let ((default-directory dir
))
357 (and (vc-git-command nil
0 nil
"update-index" "--refresh")
359 (vc-git-command nil
0 nil
"checkout" "-b" name
)
360 (vc-git-command nil
0 nil
"tag" name
)))))
362 (defun vc-git-retrieve-snapshot (dir name update
)
363 (let ((default-directory dir
))
364 (vc-git-command nil
0 nil
"checkout" name
)
365 ;; FIXME: update buffers if `update' is true
371 (defun vc-git-previous-version (file rev
)
372 "Git-specific version of `vc-previous-version'."
373 (let ((default-directory (file-name-directory (expand-file-name file
)))
374 (file (file-name-nondirectory file
)))
375 (vc-git-symbolic-commit
379 (call-process "git" nil
'(t nil
) nil
"rev-list"
381 (goto-char (point-max))
383 (zerop (forward-line -
1))
385 (buffer-substring-no-properties
387 (1- (point-max))))))))
389 (defun vc-git-next-version (file rev
)
390 "Git-specific version of `vc-next-version'."
391 (let* ((default-directory (file-name-directory
392 (expand-file-name file
)))
393 (file (file-name-nondirectory file
))
398 (call-process "git" nil
'(t nil
) nil
"rev-list"
400 (goto-char (point-max))
402 (zerop (forward-line -
1))
404 (buffer-substring-no-properties
406 (1- (point-max)))))))
408 (vc-git-symbolic-commit
412 (call-process "git" nil
'(t nil
) nil
"rev-list"
414 (goto-char (point-min))
415 (search-forward current-rev nil t
)
416 (zerop (forward-line -
1))
417 (buffer-substring-no-properties
419 (progn (forward-line 1) (1- (point))))))))))
421 (defun vc-git-delete-file (file)
422 (vc-git-command nil
0 file
"rm" "-f" "--"))
424 (defun vc-git-rename-file (old new
)
425 (vc-git-command nil
0 (list old new
) "mv" "-f" "--"))
428 ;;; Internal commands
430 (defun vc-git-root (file)
431 (vc-find-root file
".git"))
433 (defun vc-git-command (buffer okstatus file-or-list
&rest flags
)
434 "A wrapper around `vc-do-command' for use in vc-git.el.
435 The difference to vc-do-command is that this function always invokes `git'."
436 (apply 'vc-do-command buffer okstatus
"git" file-or-list flags
))
438 (defun vc-git--run-command-string (file &rest args
)
439 "Run a git command on FILE and return its output as string."
441 (str (with-output-to-string
442 (with-current-buffer standard-output
443 (unless (eq 0 (apply #'call-process
"git" nil
'(t nil
) nil
444 (append args
(list (file-relative-name file
)))))
448 (defun vc-git-symbolic-commit (commit)
449 "Translate COMMIT string into symbolic form.
450 Returns nil if not possible."
455 (call-process "git" nil
'(t nil
) nil
"name-rev"
456 "--name-only" "--tags"
458 (goto-char (point-min))
459 (= (forward-line 2) 1)
461 (buffer-substring-no-properties (point-min) (1- (point-max)))))))
465 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12
466 ;;; vc-git.el ends here