Commit | Line | Data |
---|---|---|
fff4a046 DN |
1 | ;;; vc-git.el --- VC backend for the git version control system |
2 | ||
ae940284 | 3 | ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
fff4a046 | 4 | |
8b38ce20 | 5 | ;; Author: Alexandre Julliard <julliard@winehq.org> |
fff4a046 DN |
6 | ;; Keywords: tools |
7 | ||
8 | ;; This file is part of GNU Emacs. | |
9 | ||
eb3fa2cf | 10 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
fff4a046 | 11 | ;; it under the terms of the GNU General Public License as published by |
eb3fa2cf GM |
12 | ;; the Free Software Foundation, either version 3 of the License, or |
13 | ;; (at your option) any later version. | |
fff4a046 DN |
14 | |
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. | |
19 | ||
20 | ;; You should have received a copy of the GNU General Public License | |
eb3fa2cf | 21 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
fff4a046 DN |
22 | |
23 | ;;; Commentary: | |
24 | ||
25 | ;; This file contains a VC backend for the git version control | |
26 | ;; system. | |
27 | ;; | |
28 | ||
29 | ;;; Installation: | |
30 | ||
4211679b | 31 | ;; To install: put this file on the load-path and add Git to the list |
fff4a046 DN |
32 | ;; of supported backends in `vc-handled-backends'; the following line, |
33 | ;; placed in your ~/.emacs, will accomplish this: | |
34 | ;; | |
4211679b | 35 | ;; (add-to-list 'vc-handled-backends 'Git) |
fff4a046 DN |
36 | |
37 | ;;; Todo: | |
53cc90ab DN |
38 | ;; - check if more functions could use vc-git-command instead |
39 | ;; of start-process. | |
fff4a046 | 40 | ;; - changelog generation |
53cc90ab DN |
41 | |
42 | ;; Implement the rest of the vc interface. See the comment at the | |
43 | ;; beginning of vc.el. The current status is: | |
7546c767 | 44 | ;; ("??" means: "figure out what to do about it") |
fff4a046 | 45 | ;; |
370fded4 | 46 | ;; FUNCTION NAME STATUS |
53cc90ab | 47 | ;; BACKEND PROPERTIES |
370fded4 | 48 | ;; * revision-granularity OK |
53cc90ab | 49 | ;; STATE-QUERYING FUNCTIONS |
370fded4 | 50 | ;; * registered (file) OK |
53cc90ab | 51 | ;; * state (file) OK |
108607bc | 52 | ;; - state-heuristic (file) NOT NEEDED |
370fded4 ER |
53 | ;; * working-revision (file) OK |
54 | ;; - latest-on-branch-p (file) NOT NEEDED | |
55 | ;; * checkout-model (files) OK | |
7546c767 | 56 | ;; - workfile-unchanged-p (file) OK |
6f222162 | 57 | ;; - mode-line-string (file) OK |
53cc90ab | 58 | ;; STATE-CHANGING FUNCTIONS |
370fded4 ER |
59 | ;; * create-repo () OK |
60 | ;; * register (files &optional rev comment) OK | |
ac3f4c6f | 61 | ;; - init-revision (file) NOT NEEDED |
53cc90ab | 62 | ;; - responsible-p (file) OK |
108607bc DN |
63 | ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD |
64 | ;; - receive-file (file rev) NOT NEEDED | |
370fded4 | 65 | ;; - unregister (file) OK |
9143abff | 66 | ;; * checkin (files rev comment) OK |
ac3f4c6f | 67 | ;; * find-revision (file rev buffer) OK |
53cc90ab DN |
68 | ;; * checkout (file &optional editable rev) OK |
69 | ;; * revert (file &optional contents-done) OK | |
370fded4 ER |
70 | ;; - rollback (files) COULD BE SUPPORTED |
71 | ;; - merge (file rev1 rev2) It would be possible to merge | |
72 | ;; changes into a single file, but when | |
73 | ;; committing they wouldn't | |
74 | ;; be identified as a merge | |
75 | ;; by git, so it's probably | |
76 | ;; not a good idea. | |
77 | ;; - merge-news (file) see `merge' | |
5b5afd50 | 78 | ;; - steal-lock (file &optional revision) NOT NEEDED |
53cc90ab | 79 | ;; HISTORY FUNCTIONS |
9143abff | 80 | ;; * print-log (files &optional buffer) OK |
53cc90ab | 81 | ;; - log-view-mode () OK |
b16bd82d | 82 | ;; - show-log-entry (revision) OK |
53cc90ab | 83 | ;; - comment-history (file) ?? |
108607bc | 84 | ;; - update-changelog (files) COULD BE SUPPORTED |
370fded4 | 85 | ;; * diff (file &optional rev1 rev2 buffer) OK |
c8149699 | 86 | ;; - revision-completion-table (files) OK |
53cc90ab DN |
87 | ;; - annotate-command (file buf &optional rev) OK |
88 | ;; - annotate-time () OK | |
108607bc | 89 | ;; - annotate-current-time () NOT NEEDED |
370fded4 ER |
90 | ;; - annotate-extract-revision-at-line () OK |
91 | ;; TAG SYSTEM | |
92 | ;; - create-tag (dir name branchp) OK | |
93 | ;; - retrieve-tag (dir name update) OK, needs to update buffers | |
53cc90ab | 94 | ;; MISCELLANEOUS |
370fded4 ER |
95 | ;; - make-version-backups-p (file) NOT NEEDED |
96 | ;; - repository-hostname (dirname) NOT NEEDED | |
5b5afd50 | 97 | ;; - previous-revision (file rev) OK |
370fded4 ER |
98 | ;; - next-revision (file rev) OK |
99 | ;; - check-headers () COULD BE SUPPORTED | |
100 | ;; - clear-headers () NOT NEEDED | |
101 | ;; - delete-file (file) OK | |
102 | ;; - rename-file (old new) OK | |
103 | ;; - find-file-hook () NOT NEEDED | |
104 | ;; - find-file-not-found-hook () NOT NEEDED | |
fff4a046 | 105 | |
c8149699 DN |
106 | (eval-when-compile |
107 | (require 'cl) | |
108 | (require 'vc) | |
10c7e431 | 109 | (require 'vc-dir) |
c8149699 | 110 | (require 'grep)) |
fff4a046 | 111 | |
a0bea999 | 112 | (defcustom vc-git-diff-switches t |
b6889b65 GM |
113 | "String or list of strings specifying switches for Git diff under VC. |
114 | If nil, use the value of `vc-diff-switches'. If t, use no switches." | |
a0bea999 GM |
115 | :type '(choice (const :tag "Unspecified" nil) |
116 | (const :tag "None" t) | |
117 | (string :tag "Argument String") | |
b6889b65 | 118 | (repeat :tag "Argument List" :value ("") string)) |
a0bea999 GM |
119 | :version "23.1" |
120 | :group 'vc) | |
121 | ||
fff4a046 DN |
122 | (defvar git-commits-coding-system 'utf-8 |
123 | "Default coding system for git commits.") | |
124 | ||
53cc90ab DN |
125 | ;;; BACKEND PROPERTIES |
126 | ||
70e2f6c7 ER |
127 | (defun vc-git-revision-granularity () 'repository) |
128 | (defun vc-git-checkout-model (files) 'implicit) | |
53cc90ab DN |
129 | |
130 | ;;; STATE-QUERYING FUNCTIONS | |
131 | ||
132 | ;;;###autoload (defun vc-git-registered (file) | |
133 | ;;;###autoload "Return non-nil if FILE is registered with git." | |
134 | ;;;###autoload (if (vc-find-root file ".git") ; short cut | |
135 | ;;;###autoload (progn | |
136 | ;;;###autoload (load "vc-git") | |
137 | ;;;###autoload (vc-git-registered file)))) | |
138 | ||
fff4a046 DN |
139 | (defun vc-git-registered (file) |
140 | "Check whether FILE is registered with git." | |
53cc90ab DN |
141 | (when (vc-git-root file) |
142 | (with-temp-buffer | |
143 | (let* ((dir (file-name-directory file)) | |
934a944e AJ |
144 | (name (file-relative-name file dir)) |
145 | (str (ignore-errors | |
146 | (when dir (cd dir)) | |
147 | (vc-git--out-ok "ls-files" "-c" "-z" "--" name) | |
148 | ;; if result is empty, use ls-tree to check for deleted file | |
149 | (when (eq (point-min) (point-max)) | |
150 | (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" "--" name)) | |
151 | (buffer-string)))) | |
152 | (and str | |
153 | (> (length str) (length name)) | |
154 | (string= (substring str 0 (1+ (length name))) | |
155 | (concat name "\0"))))))) | |
108607bc | 156 | |
75cb52be DN |
157 | (defun vc-git--state-code (code) |
158 | "Convert from a string to a added/deleted/modified state." | |
159 | (case (string-to-char code) | |
160 | (?M 'edited) | |
161 | (?A 'added) | |
162 | (?D 'removed) | |
163 | (?U 'edited) ;; FIXME | |
164 | (?T 'edited))) ;; FIXME | |
165 | ||
fff4a046 | 166 | (defun vc-git-state (file) |
53cc90ab | 167 | "Git-specific version of `vc-state'." |
722f037f | 168 | ;; FIXME: This can't set 'ignored yet |
3702367b ER |
169 | (if (not (vc-git-registered file)) |
170 | 'unregistered | |
171 | (vc-git--call nil "add" "--refresh" "--" (file-relative-name file)) | |
172 | (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) | |
173 | (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0" | |
174 | diff)) | |
175 | (vc-git--state-code (match-string 1 diff)) | |
176 | (if (vc-git--empty-db-p) 'added 'up-to-date))))) | |
fff4a046 | 177 | |
ac3f4c6f ER |
178 | (defun vc-git-working-revision (file) |
179 | "Git-specific version of `vc-working-revision'." | |
fff4a046 DN |
180 | (let ((str (with-output-to-string |
181 | (with-current-buffer standard-output | |
5fdbecd8 | 182 | (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
fff4a046 DN |
183 | (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
184 | (match-string 2 str) | |
185 | str))) | |
186 | ||
fff4a046 | 187 | (defun vc-git-workfile-unchanged-p (file) |
00d67080 | 188 | (eq 'up-to-date (vc-git-state file))) |
fff4a046 | 189 | |
6f222162 DN |
190 | (defun vc-git-mode-line-string (file) |
191 | "Return string for placement into the modeline for FILE." | |
ac3f4c6f | 192 | (let* ((branch (vc-git-working-revision file)) |
6f222162 DN |
193 | (def-ml (vc-default-mode-line-string 'Git file)) |
194 | (help-echo (get-text-property 0 'help-echo def-ml))) | |
195 | (if (zerop (length branch)) | |
196 | (propertize | |
197 | (concat def-ml "!") | |
198 | 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) | |
199 | (propertize def-ml | |
200 | 'help-echo (concat help-echo "\nCurrent branch: " branch))))) | |
201 | ||
236b5827 DN |
202 | (defstruct (vc-git-extra-fileinfo |
203 | (:copier nil) | |
204 | (:constructor vc-git-create-extra-fileinfo (old-perm new-perm &optional rename-state orig-name)) | |
205 | (:conc-name vc-git-extra-fileinfo->)) | |
206 | old-perm new-perm ;; permission flags | |
207 | rename-state ;; rename or copy state | |
208 | orig-name) ;; original name for renames or copies | |
209 | ||
210 | (defun vc-git-escape-file-name (name) | |
211 | "Escape a file name if necessary." | |
212 | (if (string-match "[\n\t\"\\]" name) | |
213 | (concat "\"" | |
214 | (mapconcat (lambda (c) | |
215 | (case c | |
216 | (?\n "\\n") | |
217 | (?\t "\\t") | |
218 | (?\\ "\\\\") | |
219 | (?\" "\\\"") | |
220 | (t (char-to-string c)))) | |
221 | name "") | |
222 | "\"") | |
223 | name)) | |
224 | ||
225 | (defun vc-git-file-type-as-string (old-perm new-perm) | |
226 | "Return a string describing the file type based on its permissions." | |
227 | (let* ((old-type (lsh (or old-perm 0) -9)) | |
228 | (new-type (lsh (or new-perm 0) -9)) | |
229 | (str (case new-type | |
230 | (?\100 ;; file | |
231 | (case old-type | |
232 | (?\100 nil) | |
233 | (?\120 " (type change symlink -> file)") | |
234 | (?\160 " (type change subproject -> file)"))) | |
235 | (?\120 ;; symlink | |
236 | (case old-type | |
237 | (?\100 " (type change file -> symlink)") | |
238 | (?\160 " (type change subproject -> symlink)") | |
239 | (t " (symlink)"))) | |
240 | (?\160 ;; subproject | |
241 | (case old-type | |
242 | (?\100 " (type change file -> subproject)") | |
243 | (?\120 " (type change symlink -> subproject)") | |
244 | (t " (subproject)"))) | |
245 | (?\110 nil) ;; directory (internal, not a real git state) | |
246 | (?\000 ;; deleted or unknown | |
247 | (case old-type | |
248 | (?\120 " (symlink)") | |
249 | (?\160 " (subproject)"))) | |
250 | (t (format " (unknown type %o)" new-type))))) | |
251 | (cond (str (propertize str 'face 'font-lock-comment-face)) | |
252 | ((eq new-type ?\110) "/") | |
253 | (t "")))) | |
254 | ||
255 | (defun vc-git-rename-as-string (state extra) | |
256 | "Return a string describing the copy or rename associated with INFO, or an empty string if none." | |
257 | (let ((rename-state (when extra | |
258 | (vc-git-extra-fileinfo->rename-state extra)))) | |
259 | (if rename-state | |
260 | (propertize | |
261 | (concat " (" | |
262 | (if (eq rename-state 'copy) "copied from " | |
263 | (if (eq state 'added) "renamed from " | |
264 | "renamed to ")) | |
265 | (vc-git-escape-file-name (vc-git-extra-fileinfo->orig-name extra)) | |
266 | ")") 'face 'font-lock-comment-face) | |
267 | ""))) | |
268 | ||
269 | (defun vc-git-permissions-as-string (old-perm new-perm) | |
270 | "Format a permission change as string." | |
271 | (propertize | |
272 | (if (or (not old-perm) | |
273 | (not new-perm) | |
274 | (eq 0 (logand ?\111 (logxor old-perm new-perm)))) | |
275 | " " | |
276 | (if (eq 0 (logand ?\111 old-perm)) "+x" "-x")) | |
277 | 'face 'font-lock-type-face)) | |
278 | ||
13ad7457 | 279 | (defun vc-git-dir-printer (info) |
99e1b0c0 | 280 | "Pretty-printer for the vc-dir-fileinfo structure." |
d1bfcce1 DN |
281 | (let* ((isdir (vc-dir-fileinfo->directory info)) |
282 | (state (if isdir "" (vc-dir-fileinfo->state info))) | |
99e1b0c0 | 283 | (extra (vc-dir-fileinfo->extra info)) |
236b5827 DN |
284 | (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra))) |
285 | (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra)))) | |
286 | (insert | |
287 | " " | |
99e1b0c0 | 288 | (propertize (format "%c" (if (vc-dir-fileinfo->marked info) ?* ? )) |
236b5827 DN |
289 | 'face 'font-lock-type-face) |
290 | " " | |
291 | (propertize | |
292 | (format "%-12s" state) | |
293 | 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) | |
294 | ((eq state 'missing) 'font-lock-warning-face) | |
295 | (t 'font-lock-variable-name-face)) | |
296 | 'mouse-face 'highlight) | |
297 | " " (vc-git-permissions-as-string old-perm new-perm) | |
7f4a3168 | 298 | " " |
99e1b0c0 | 299 | (propertize (vc-git-escape-file-name (vc-dir-fileinfo->name info)) |
631601b5 DN |
300 | 'face (if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face) |
301 | 'help-echo | |
302 | (if isdir | |
303 | "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" | |
304 | "File\nmouse-3: Pop-up menu") | |
c7f9e440 | 305 | 'keymap vc-dir-filename-mouse-map |
631601b5 | 306 | 'mouse-face 'highlight) |
236b5827 DN |
307 | (vc-git-file-type-as-string old-perm new-perm) |
308 | (vc-git-rename-as-string state extra)))) | |
309 | ||
d41080ca AJ |
310 | (defun vc-git-after-dir-status-stage (stage files update-function) |
311 | "Process sentinel for the various dir-status stages." | |
312 | (let (remaining next-stage result) | |
313 | (goto-char (point-min)) | |
314 | (case stage | |
315 | ('update-index | |
316 | (setq next-stage (if (vc-git--empty-db-p) 'ls-files-added | |
317 | (if files 'ls-files-up-to-date 'diff-index)))) | |
318 | ('ls-files-added | |
319 | (setq next-stage 'ls-files-unknown) | |
320 | (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t) | |
321 | (let ((new-perm (string-to-number (match-string 1) 8)) | |
322 | (name (match-string 2))) | |
323 | (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm)) result)))) | |
324 | ('ls-files-up-to-date | |
325 | (setq next-stage 'diff-index) | |
326 | (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t) | |
327 | (let ((perm (string-to-number (match-string 1) 8)) | |
328 | (name (match-string 2))) | |
329 | (push (list name 'up-to-date (vc-git-create-extra-fileinfo perm perm)) result)))) | |
330 | ('ls-files-unknown | |
331 | (when files (setq next-stage 'ls-files-ignored)) | |
332 | (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) | |
333 | (push (list (match-string 1) 'unregistered (vc-git-create-extra-fileinfo 0 0)) result))) | |
334 | ('ls-files-ignored | |
335 | (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) | |
336 | (push (list (match-string 1) 'ignored (vc-git-create-extra-fileinfo 0 0)) result))) | |
337 | ('diff-index | |
338 | (setq next-stage 'ls-files-unknown) | |
339 | (while (re-search-forward | |
340 | ":\\([0-7]\\{6\\}\\) \\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\(\\([ADMUT]\\)\0\\([^\0]+\\)\\|\\([CR]\\)[0-9]*\0\\([^\0]+\\)\0\\([^\0]+\\)\\)\0" | |
341 | nil t 1) | |
342 | (let ((old-perm (string-to-number (match-string 1) 8)) | |
343 | (new-perm (string-to-number (match-string 2) 8)) | |
344 | (state (or (match-string 4) (match-string 6))) | |
345 | (name (or (match-string 5) (match-string 7))) | |
346 | (new-name (match-string 8))) | |
347 | (if new-name ; copy or rename | |
348 | (if (eq ?C (string-to-char state)) | |
349 | (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'copy name)) result) | |
350 | (push (list name 'removed (vc-git-create-extra-fileinfo 0 0 'rename new-name)) result) | |
351 | (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'rename name)) result)) | |
352 | (push (list name (vc-git--state-code state) (vc-git-create-extra-fileinfo old-perm new-perm)) result)))))) | |
353 | (when result | |
354 | (setq result (nreverse result)) | |
355 | (when files | |
356 | (dolist (entry result) (setq files (delete (car entry) files))) | |
357 | (unless files (setq next-stage nil)))) | |
358 | (when (or result (not next-stage)) (funcall update-function result next-stage)) | |
359 | (when next-stage (vc-git-dir-status-goto-stage next-stage files update-function)))) | |
360 | ||
361 | (defun vc-git-dir-status-goto-stage (stage files update-function) | |
8e4e4aef | 362 | (erase-buffer) |
d41080ca AJ |
363 | (case stage |
364 | ('update-index | |
365 | (if files | |
366 | (vc-git-command (current-buffer) 'async files "add" "--refresh" "--") | |
367 | (vc-git-command (current-buffer) 'async nil "update-index" "--refresh"))) | |
368 | ('ls-files-added | |
369 | (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-c" "-s" "--")) | |
370 | ('ls-files-up-to-date | |
371 | (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-c" "-s" "--")) | |
372 | ('ls-files-unknown | |
373 | (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" | |
374 | "--directory" "--no-empty-directory" "--exclude-standard" "--")) | |
375 | ('ls-files-ignored | |
376 | (vc-git-command (current-buffer) 'async files "ls-files" "-z" "-o" "-i" | |
377 | "--directory" "--no-empty-directory" "--exclude-standard" "--")) | |
378 | ('diff-index | |
379 | (vc-git-command (current-buffer) 'async files "diff-index" "-z" "-M" "HEAD" "--"))) | |
8e4e4aef | 380 | (vc-exec-after |
d41080ca | 381 | `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function)))) |
8e4e4aef | 382 | |
c1b51374 | 383 | (defun vc-git-dir-status (dir update-function) |
d41080ca | 384 | "Return a list of (FILE STATE EXTRA) entries for DIR." |
12cb746e | 385 | ;; Further things that would have to be fixed later: |
12cb746e | 386 | ;; - how to handle unregistered directories |
99e1b0c0 | 387 | ;; - how to support vc-dir on a subdir of the project tree |
d41080ca AJ |
388 | (vc-git-dir-status-goto-stage 'update-index nil update-function)) |
389 | ||
390 | (defun vc-git-dir-status-files (dir files default-state update-function) | |
391 | "Return a list of (FILE STATE EXTRA) entries for FILES in DIR." | |
392 | (vc-git-dir-status-goto-stage 'update-index files update-function)) | |
758dc0cc | 393 | |
13ad7457 | 394 | (defun vc-git-dir-extra-headers (dir) |
15c5c970 DN |
395 | (let ((str (with-output-to-string |
396 | (with-current-buffer standard-output | |
397 | (vc-git--out-ok "symbolic-ref" "HEAD"))))) | |
398 | (concat | |
399 | (propertize "Branch : " 'face 'font-lock-type-face) | |
400 | (propertize | |
401 | (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) | |
402 | (match-string 2 str) | |
403 | "not (detached HEAD)") | |
404 | 'face 'font-lock-variable-name-face)))) | |
405 | ||
53cc90ab DN |
406 | ;;; STATE-CHANGING FUNCTIONS |
407 | ||
408 | (defun vc-git-create-repo () | |
4211679b | 409 | "Create a new Git repository." |
00d67080 | 410 | (vc-git-command nil 0 nil "init")) |
53cc90ab | 411 | |
8b9783e0 | 412 | (defun vc-git-register (files &optional rev comment) |
fff4a046 | 413 | "Register FILE into the git version-control system." |
8b9783e0 | 414 | (vc-git-command nil 0 files "update-index" "--add" "--")) |
fff4a046 | 415 | |
53cc90ab DN |
416 | (defalias 'vc-git-responsible-p 'vc-git-root) |
417 | ||
d7009f45 DN |
418 | (defun vc-git-unregister (file) |
419 | (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
108607bc | 420 | |
d7009f45 | 421 | |
8b9783e0 | 422 | (defun vc-git-checkin (files rev comment) |
fff4a046 | 423 | (let ((coding-system-for-write git-commits-coding-system)) |
8b9783e0 | 424 | (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) |
fff4a046 | 425 | |
ac3f4c6f | 426 | (defun vc-git-find-revision (file rev buffer) |
b0f90937 | 427 | (let ((coding-system-for-read 'binary) |
8b38ce20 DN |
428 | (coding-system-for-write 'binary) |
429 | (fullname (substring | |
108607bc | 430 | (vc-git--run-command-string |
8b38ce20 DN |
431 | file "ls-files" "-z" "--full-name" "--") |
432 | 0 -1))) | |
108607bc DN |
433 | (vc-git-command |
434 | buffer 0 | |
8b38ce20 | 435 | (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) |
b0f90937 DN |
436 | |
437 | (defun vc-git-checkout (file &optional editable rev) | |
7546c767 | 438 | (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) |
fff4a046 DN |
439 | |
440 | (defun vc-git-revert (file &optional contents-done) | |
441 | "Revert FILE to the version stored in the git repository." | |
442 | (if contents-done | |
b0f90937 DN |
443 | (vc-git-command nil 0 file "update-index" "--") |
444 | (vc-git-command nil 0 file "checkout" "HEAD"))) | |
fff4a046 | 445 | |
53cc90ab DN |
446 | ;;; HISTORY FUNCTIONS |
447 | ||
8b9783e0 DN |
448 | (defun vc-git-print-log (files &optional buffer) |
449 | "Get change log associated with FILES." | |
a0709d8d DN |
450 | (let ((coding-system-for-read git-commits-coding-system) |
451 | ;; Support both the old print-log interface that passes a | |
452 | ;; single file, and the new one that passes a file list. | |
453 | (flist (if (listp files) files (list files)))) | |
53cc90ab DN |
454 | ;; `vc-do-command' creates the buffer, but we need it before running |
455 | ;; the command. | |
456 | (vc-setup-buffer buffer) | |
457 | ;; If the buffer exists from a previous invocation it might be | |
458 | ;; read-only. | |
459 | (let ((inhibit-read-only t)) | |
934a944e AJ |
460 | (with-current-buffer |
461 | buffer | |
462 | (vc-git-command buffer 'async files | |
64e3efd9 | 463 | "rev-list" "--pretty" "HEAD" "--"))))) |
53cc90ab DN |
464 | |
465 | (defvar log-view-message-re) | |
466 | (defvar log-view-file-re) | |
467 | (defvar log-view-font-lock-keywords) | |
934a944e | 468 | (defvar log-view-per-file-logs) |
53cc90ab | 469 | |
4211679b | 470 | (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
53cc90ab DN |
471 | (require 'add-log) ;; we need the faces add-log |
472 | ;; Don't have file markers, so use impossible regexp. | |
934a944e AJ |
473 | (set (make-local-variable 'log-view-file-re) "\\`a\\`") |
474 | (set (make-local-variable 'log-view-per-file-logs) nil) | |
53cc90ab DN |
475 | (set (make-local-variable 'log-view-message-re) |
476 | "^commit *\\([0-9a-z]+\\)") | |
477 | (set (make-local-variable 'log-view-font-lock-keywords) | |
478 | (append | |
934a944e | 479 | `((,log-view-message-re (1 'change-log-acknowledgement))) |
2aa0736a TTN |
480 | ;; Handle the case: |
481 | ;; user: foo@bar | |
482 | '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
483 | (1 'change-log-email)) | |
484 | ;; Handle the case: | |
485 | ;; user: FirstName LastName <foo@bar> | |
486 | ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
487 | (1 'change-log-name) | |
488 | (2 'change-log-email)) | |
489 | ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
490 | (1 'change-log-name)) | |
491 | ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
492 | (1 'change-log-name) | |
493 | (2 'change-log-email)) | |
494 | ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
495 | (1 'change-log-acknowledgement) | |
496 | (2 'change-log-acknowledgement)) | |
497 | ("^Date: \\(.+\\)" (1 'change-log-date)) | |
498 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
fff4a046 | 499 | |
b16bd82d TTN |
500 | (defun vc-git-show-log-entry (revision) |
501 | "Move to the log entry for REVISION. | |
502 | REVISION may have the form BRANCH, BRANCH~N, | |
503 | or BRANCH^ (where \"^\" can be repeated)." | |
504 | (goto-char (point-min)) | |
89d98000 | 505 | (when revision |
07ebab66 | 506 | (search-forward (format "\ncommit %s" revision) nil t |
89d98000 DN |
507 | (cond ((string-match "~\\([0-9]\\)$" revision) |
508 | (1+ (string-to-number (match-string 1 revision)))) | |
509 | ((string-match "\\^+$" revision) | |
510 | (1+ (length (match-string 0 revision)))) | |
511 | (t nil)))) | |
b16bd82d TTN |
512 | (beginning-of-line)) |
513 | ||
b747d346 | 514 | (defun vc-git-diff (files &optional rev1 rev2 buffer) |
a0bea999 GM |
515 | "Get a difference report using Git between two revisions of FILES." |
516 | (apply #'vc-git-command (or buffer "*vc-diff*") 1 files | |
517 | (if (and rev1 rev2) "diff-tree" "diff-index") | |
518 | "--exit-code" | |
68159bc5 | 519 | (append (vc-switches 'git 'diff) |
a0bea999 | 520 | (list "-p" (or rev1 "HEAD") rev2 "--")))) |
fff4a046 | 521 | |
9f11ce4e SM |
522 | (defun vc-git-revision-table (files) |
523 | ;; What about `files'?!? --Stef | |
108607bc DN |
524 | (let ((table (list "HEAD"))) |
525 | (with-temp-buffer | |
526 | (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
527 | (goto-char (point-min)) | |
528 | (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) | |
529 | (push (match-string 2) table))) | |
530 | table)) | |
531 | ||
9f11ce4e SM |
532 | (defun vc-git-revision-completion-table (files) |
533 | (lexical-let ((files files) | |
108607bc DN |
534 | table) |
535 | (setq table (lazy-completion-table | |
9f11ce4e | 536 | table (lambda () (vc-git-revision-table files)))) |
108607bc DN |
537 | table)) |
538 | ||
fff4a046 | 539 | (defun vc-git-annotate-command (file buf &optional rev) |
fff4a046 | 540 | (let ((name (file-relative-name file))) |
1f8da6df | 541 | (vc-git-command buf 0 name "blame" rev))) |
fff4a046 | 542 | |
f8bd9ac6 DN |
543 | (declare-function vc-annotate-convert-time "vc-annotate" (time)) |
544 | ||
fff4a046 | 545 | (defun vc-git-annotate-time () |
0bcc6163 | 546 | (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) |
fff4a046 | 547 | (vc-annotate-convert-time |
2aa0736a TTN |
548 | (apply #'encode-time (mapcar (lambda (match) |
549 | (string-to-number (match-string match))) | |
550 | '(6 5 4 3 2 1 7)))))) | |
fff4a046 | 551 | |
53cc90ab | 552 | (defun vc-git-annotate-extract-revision-at-line () |
2aa0736a TTN |
553 | (save-excursion |
554 | (move-beginning-of-line 1) | |
dd3ffb9a | 555 | (and (looking-at "[0-9a-f^][0-9a-f]+") |
2aa0736a | 556 | (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) |
53cc90ab | 557 | |
370fded4 | 558 | ;;; TAG SYSTEM |
b747d346 | 559 | |
370fded4 | 560 | (defun vc-git-create-tag (dir name branchp) |
b747d346 DN |
561 | (let ((default-directory dir)) |
562 | (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
563 | (if branchp | |
564 | (vc-git-command nil 0 nil "checkout" "-b" name) | |
565 | (vc-git-command nil 0 nil "tag" name))))) | |
566 | ||
370fded4 | 567 | (defun vc-git-retrieve-tag (dir name update) |
b747d346 DN |
568 | (let ((default-directory dir)) |
569 | (vc-git-command nil 0 nil "checkout" name) | |
570 | ;; FIXME: update buffers if `update' is true | |
571 | )) | |
572 | ||
573 | ||
53cc90ab | 574 | ;;; MISCELLANEOUS |
fff4a046 | 575 | |
5b5afd50 ER |
576 | (defun vc-git-previous-revision (file rev) |
577 | "Git-specific version of `vc-previous-revision'." | |
934a944e | 578 | (if file |
4537363c AJ |
579 | (let* ((default-directory (file-name-directory (expand-file-name file))) |
580 | (file (file-name-nondirectory file)) | |
581 | (prev-rev (with-temp-buffer | |
582 | (and | |
583 | (vc-git--out-ok "rev-list" "-2" rev "--" file) | |
584 | (goto-char (point-max)) | |
585 | (bolp) | |
586 | (zerop (forward-line -1)) | |
587 | (not (bobp)) | |
588 | (buffer-substring-no-properties | |
589 | (point) | |
590 | (1- (point-max))))))) | |
591 | (or (vc-git-symbolic-commit prev-rev) prev-rev)) | |
934a944e AJ |
592 | (with-temp-buffer |
593 | (and | |
594 | (vc-git--out-ok "rev-parse" (concat rev "^")) | |
595 | (buffer-substring-no-properties (point-min) (+ (point-min) 40)))))) | |
fff4a046 | 596 | |
5b5afd50 ER |
597 | (defun vc-git-next-revision (file rev) |
598 | "Git-specific version of `vc-next-revision'." | |
fff4a046 DN |
599 | (let* ((default-directory (file-name-directory |
600 | (expand-file-name file))) | |
2aa0736a TTN |
601 | (file (file-name-nondirectory file)) |
602 | (current-rev | |
603 | (with-temp-buffer | |
604 | (and | |
5fdbecd8 | 605 | (vc-git--out-ok "rev-list" "-1" rev "--" file) |
2aa0736a TTN |
606 | (goto-char (point-max)) |
607 | (bolp) | |
608 | (zerop (forward-line -1)) | |
609 | (bobp) | |
610 | (buffer-substring-no-properties | |
611 | (point) | |
4537363c AJ |
612 | (1- (point-max)))))) |
613 | (next-rev | |
614 | (and current-rev | |
615 | (with-temp-buffer | |
616 | (and | |
617 | (vc-git--out-ok "rev-list" "HEAD" "--" file) | |
618 | (goto-char (point-min)) | |
619 | (search-forward current-rev nil t) | |
620 | (zerop (forward-line -1)) | |
621 | (buffer-substring-no-properties | |
622 | (point) | |
623 | (progn (forward-line 1) (1- (point))))))))) | |
624 | (or (vc-git-symbolic-commit next-rev) next-rev))) | |
fff4a046 | 625 | |
8b38ce20 DN |
626 | (defun vc-git-delete-file (file) |
627 | (vc-git-command nil 0 file "rm" "-f" "--")) | |
b0f90937 | 628 | |
8b38ce20 DN |
629 | (defun vc-git-rename-file (old new) |
630 | (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
b0f90937 | 631 | |
f0e1713e DN |
632 | (defvar vc-git-extra-menu-map |
633 | (let ((map (make-sparse-keymap))) | |
634 | (define-key map [git-grep] | |
635 | '(menu-item "Git grep..." vc-git-grep | |
636 | :help "Run the `git grep' command")) | |
637 | map)) | |
638 | ||
639 | (defun vc-git-extra-menu () vc-git-extra-menu-map) | |
640 | ||
641 | (defun vc-git-extra-status-menu () vc-git-extra-menu-map) | |
642 | ||
643 | ;; Derived from `lgrep'. | |
644 | (defun vc-git-grep (regexp &optional files dir) | |
645 | "Run git grep, searching for REGEXP in FILES in directory DIR. | |
646 | The search is limited to file names matching shell pattern FILES. | |
647 | FILES may use abbreviations defined in `grep-files-aliases', e.g. | |
648 | entering `ch' is equivalent to `*.[ch]'. | |
649 | ||
650 | With \\[universal-argument] prefix, you can edit the constructed shell command line | |
651 | before it is executed. | |
652 | With two \\[universal-argument] prefixes, directly edit and run `grep-command'. | |
653 | ||
654 | Collect output in a buffer. While git grep runs asynchronously, you | |
655 | can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \ | |
656 | in the grep output buffer, | |
657 | to go to the lines where grep found matches. | |
658 | ||
659 | This command shares argument histories with \\[rgrep] and \\[grep]." | |
660 | (interactive | |
661 | (progn | |
662 | (grep-compute-defaults) | |
663 | (cond | |
664 | ((equal current-prefix-arg '(16)) | |
665 | (list (read-from-minibuffer "Run: " "git grep" | |
666 | nil nil 'grep-history) | |
667 | nil)) | |
668 | (t (let* ((regexp (grep-read-regexp)) | |
669 | (files (grep-read-files regexp)) | |
670 | (dir (read-directory-name "In directory: " | |
671 | nil default-directory t))) | |
672 | (list regexp files dir)))))) | |
673 | (require 'grep) | |
674 | (when (and (stringp regexp) (> (length regexp) 0)) | |
675 | (let ((command regexp)) | |
676 | (if (null files) | |
677 | (if (string= command "git grep") | |
678 | (setq command nil)) | |
679 | (setq dir (file-name-as-directory (expand-file-name dir))) | |
680 | (setq command | |
681 | (grep-expand-template "git grep -n -e <R> -- <F>" regexp files)) | |
682 | (when command | |
683 | (if (equal current-prefix-arg '(4)) | |
684 | (setq command | |
685 | (read-from-minibuffer "Confirm: " | |
686 | command nil nil 'grep-history)) | |
687 | (add-to-history 'grep-history command)))) | |
688 | (when command | |
689 | (let ((default-directory dir) | |
690 | (compilation-environment '("PAGER="))) | |
691 | ;; Setting process-setup-function makes exit-message-function work | |
692 | ;; even when async processes aren't supported. | |
693 | (compilation-start command 'grep-mode)) | |
694 | (if (eq next-error-last-buffer (current-buffer)) | |
695 | (setq default-directory dir)))))) | |
fff4a046 | 696 | \f |
b747d346 | 697 | ;;; Internal commands |
fff4a046 | 698 | |
53cc90ab DN |
699 | (defun vc-git-root (file) |
700 | (vc-find-root file ".git")) | |
701 | ||
8b9783e0 | 702 | (defun vc-git-command (buffer okstatus file-or-list &rest flags) |
53cc90ab DN |
703 | "A wrapper around `vc-do-command' for use in vc-git.el. |
704 | The difference to vc-do-command is that this function always invokes `git'." | |
2888a97e | 705 | (apply 'vc-do-command (or buffer "*vc*") okstatus "git" file-or-list flags)) |
53cc90ab | 706 | |
8e4e4aef DN |
707 | (defun vc-git--empty-db-p () |
708 | "Check if the git db is empty (no commit done yet)." | |
709 | (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD")))) | |
710 | ||
5fdbecd8 | 711 | (defun vc-git--call (buffer command &rest args) |
0664ff72 MA |
712 | ;; We don't need to care the arguments. If there is a file name, it |
713 | ;; is always a relative one. This works also for remote | |
714 | ;; directories. | |
715 | (apply 'process-file "git" nil buffer nil command args)) | |
5fdbecd8 TTN |
716 | |
717 | (defun vc-git--out-ok (command &rest args) | |
718 | (zerop (apply 'vc-git--call '(t nil) command args))) | |
719 | ||
fff4a046 DN |
720 | (defun vc-git--run-command-string (file &rest args) |
721 | "Run a git command on FILE and return its output as string." | |
722 | (let* ((ok t) | |
723 | (str (with-output-to-string | |
724 | (with-current-buffer standard-output | |
5fdbecd8 TTN |
725 | (unless (apply 'vc-git--out-ok |
726 | (append args (list (file-relative-name | |
727 | file)))) | |
fff4a046 DN |
728 | (setq ok nil)))))) |
729 | (and ok str))) | |
730 | ||
fff4a046 DN |
731 | (defun vc-git-symbolic-commit (commit) |
732 | "Translate COMMIT string into symbolic form. | |
733 | Returns nil if not possible." | |
734 | (and commit | |
4537363c AJ |
735 | (let ((name (with-temp-buffer |
736 | (and | |
737 | (vc-git--out-ok "name-rev" "--name-only" commit) | |
738 | (goto-char (point-min)) | |
739 | (= (forward-line 2) 1) | |
740 | (bolp) | |
741 | (buffer-substring-no-properties (point-min) (1- (point-max))))))) | |
742 | (and name (not (string= name "undefined")) name)))) | |
fff4a046 DN |
743 | |
744 | (provide 'vc-git) | |
53cc90ab | 745 | |
328471d9 | 746 | ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 |
53cc90ab | 747 | ;;; vc-git.el ends here |