Mercurial > emacs
annotate lisp/vc-git.el @ 86400:fdd891feb624
Refill; nfc.
author | Thien-Thi Nguyen <ttn@gnuvola.org> |
---|---|
date | Sat, 24 Nov 2007 14:35:54 +0000 |
parents | 38193bd1ab69 |
children | d2c8f5a27761 |
rev | line source |
---|---|
78355 | 1 ;;; vc-git.el --- VC backend for the git version control system |
2 | |
3 ;; Copyright (C) 2006, 2007 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Alexandre Julliard <julliard@winehq.org> | |
6 ;; Keywords: tools | |
7 | |
8 ;; This file is part of GNU Emacs. | |
9 | |
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) | |
13 ;; any later version. | |
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 | |
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. | |
24 | |
25 ;;; Commentary: | |
26 | |
27 ;; This file contains a VC backend for the git version control | |
28 ;; system. | |
29 ;; | |
30 | |
31 ;;; Installation: | |
32 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
33 ;; To install: put this file on the load-path and add Git to the list |
78355 | 34 ;; of supported backends in `vc-handled-backends'; the following line, |
35 ;; placed in your ~/.emacs, will accomplish this: | |
36 ;; | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
37 ;; (add-to-list 'vc-handled-backends 'Git) |
78355 | 38 |
39 ;;; Todo: | |
40 ;; - check if more functions could use vc-git-command instead | |
41 ;; of start-process. | |
42 ;; - changelog generation | |
43 | |
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") | |
47 ;; | |
48 ;; FUNCTION NAME STATUS | |
49 ;; BACKEND PROPERTIES | |
50 ;; * revision-granularity OK | |
51 ;; STATE-QUERYING FUNCTIONS | |
52 ;; * registered (file) OK | |
53 ;; * state (file) OK | |
54 ;; - state-heuristic (file) NOT NEEDED | |
55 ;; - dir-state (dir) OK | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
56 ;; * working-revision (file) OK |
78355 | 57 ;; - latest-on-branch-p (file) NOT NEEDED |
58 ;; * checkout-model (file) OK | |
59 ;; - workfile-unchanged-p (file) OK | |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
60 ;; - mode-line-string (file) OK |
78355 | 61 ;; - dired-state-info (file) OK |
62 ;; STATE-CHANGING FUNCTIONS | |
63 ;; * create-repo () OK | |
64 ;; * register (files &optional rev comment) OK | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
65 ;; - init-revision (file) NOT NEEDED |
78355 | 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 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
71 ;; * find-revision (file rev buffer) OK |
78355 | 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' | |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
80 ;; - steal-lock (file &optional revision) NOT NEEDED |
78355 | 81 ;; HISTORY FUNCTIONS |
82 ;; * print-log (files &optional buffer) OK | |
83 ;; - log-view-mode () OK | |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
84 ;; - show-log-entry (revision) OK |
78355 | 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 | |
85462
43a9834cf1a6
* vc-bzr.el (vc-bzr-diff-tree):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85459
diff
changeset
|
90 ;; - revision-completion-table (files) NEEDED? |
78355 | 91 ;; - annotate-command (file buf &optional rev) OK |
92 ;; - annotate-time () OK | |
93 ;; - annotate-current-time () NOT NEEDED | |
94 ;; - annotate-extract-revision-at-line () OK | |
95 ;; SNAPSHOT SYSTEM | |
96 ;; - create-snapshot (dir name branchp) OK | |
97 ;; - assign-name (file name) NOT NEEDED | |
98 ;; - retrieve-snapshot (dir name update) OK, needs to update buffers | |
99 ;; MISCELLANEOUS | |
100 ;; - make-version-backups-p (file) NOT NEEDED | |
101 ;; - repository-hostname (dirname) NOT NEEDED | |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
102 ;; - previous-revision (file rev) OK |
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
103 ;; - next-revision (file rev) OK |
78355 | 104 ;; - check-headers () COULD BE SUPPORTED |
105 ;; - clear-headers () NOT NEEDED | |
106 ;; - delete-file (file) OK | |
107 ;; - rename-file (old new) OK | |
108 ;; - find-file-hook () NOT NEEDED | |
109 ;; - find-file-not-found-hook () NOT NEEDED | |
110 | |
111 (eval-when-compile (require 'cl) (require 'vc)) | |
112 | |
113 (defvar git-commits-coding-system 'utf-8 | |
114 "Default coding system for git commits.") | |
115 | |
116 ;;; BACKEND PROPERTIES | |
117 | |
118 (defun vc-git-revision-granularity () | |
86400 | 119 'repository) |
78355 | 120 |
121 ;;; STATE-QUERYING FUNCTIONS | |
122 | |
123 ;;;###autoload (defun vc-git-registered (file) | |
124 ;;;###autoload "Return non-nil if FILE is registered with git." | |
125 ;;;###autoload (if (vc-find-root file ".git") ; short cut | |
126 ;;;###autoload (progn | |
127 ;;;###autoload (load "vc-git") | |
128 ;;;###autoload (vc-git-registered file)))) | |
129 | |
130 (defun vc-git-registered (file) | |
131 "Check whether FILE is registered with git." | |
132 (when (vc-git-root file) | |
133 (with-temp-buffer | |
134 (let* ((dir (file-name-directory file)) | |
135 (name (file-relative-name file dir))) | |
136 (and (ignore-errors | |
86400 | 137 (when dir (cd dir)) |
138 (eq 0 (call-process "git" nil '(t nil) nil "ls-files" | |
139 "-c" "-z" "--" name))) | |
78355 | 140 (let ((str (buffer-string))) |
141 (and (> (length str) (length name)) | |
86400 | 142 (string= (substring str 0 (1+ (length name))) |
143 (concat name "\0"))))))))) | |
78355 | 144 |
145 (defun vc-git-state (file) | |
146 "Git-specific version of `vc-state'." | |
78687
429a17d4958d
* vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
147 (call-process "git" nil nil nil "add" "--refresh" "--" (file-relative-name file)) |
78355 | 148 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) |
86400 | 149 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} [ADMU]\0[^\0]+\0" |
150 diff)) | |
78355 | 151 'edited |
152 'up-to-date))) | |
153 | |
154 (defun vc-git-dir-state (dir) | |
155 (with-temp-buffer | |
156 (vc-git-command (current-buffer) nil nil "ls-files" "-t") | |
157 (goto-char (point-min)) | |
158 (let ((status-char nil) | |
159 (file nil)) | |
160 (while (not (eobp)) | |
161 (setq status-char (char-after)) | |
162 (setq file | |
163 (expand-file-name | |
86400 | 164 (buffer-substring-no-properties (+ (point) 2) |
165 (line-end-position)))) | |
78355 | 166 (cond |
167 ;; The rest of the possible states in "git ls-files -t" output: | |
168 ;; R removed/deleted | |
169 ;; K to be killed | |
170 ;; should not show up in vc-dired, so don't deal with them | |
171 ;; here. | |
172 ((eq status-char ?H) | |
173 (vc-file-setprop file 'vc-state 'up-to-date)) | |
174 ((eq status-char ?M) | |
175 (vc-file-setprop file 'vc-state 'edited)) | |
176 ((eq status-char ?C) | |
177 (vc-file-setprop file 'vc-state 'edited)) | |
178 ((eq status-char ??) | |
179 (vc-file-setprop file 'vc-backend 'none) | |
180 (vc-file-setprop file 'vc-state 'nil))) | |
181 (forward-line))))) | |
182 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
183 (defun vc-git-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
184 "Git-specific version of `vc-working-revision'." |
78355 | 185 (let ((str (with-output-to-string |
186 (with-current-buffer standard-output | |
187 (call-process "git" nil '(t nil) nil "symbolic-ref" "HEAD"))))) | |
188 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) | |
189 (match-string 2 str) | |
190 str))) | |
191 | |
192 (defun vc-git-checkout-model (file) | |
193 'implicit) | |
194 | |
195 (defun vc-git-workfile-unchanged-p (file) | |
78687
429a17d4958d
* vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
196 (eq 'up-to-date (vc-git-state file))) |
78355 | 197 |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
198 (defun vc-git-mode-line-string (file) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
199 "Return string for placement into the modeline for FILE." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
200 (let* ((branch (vc-git-working-revision file)) |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
201 (def-ml (vc-default-mode-line-string 'Git file)) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
202 (help-echo (get-text-property 0 'help-echo def-ml))) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
203 (if (zerop (length branch)) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
204 (propertize |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
205 (concat def-ml "!") |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
206 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
207 (propertize def-ml |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
208 'help-echo (concat help-echo "\nCurrent branch: " branch))))) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
209 |
78355 | 210 (defun vc-git-dired-state-info (file) |
211 "Git-specific version of `vc-dired-state-info'." | |
212 (let ((git-state (vc-state file))) | |
213 (if (eq git-state 'edited) | |
214 "(modified)" | |
215 ;; fall back to the default VC representation | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
216 (vc-default-dired-state-info 'Git file)))) |
78355 | 217 |
218 ;;; STATE-CHANGING FUNCTIONS | |
219 | |
220 (defun vc-git-create-repo () | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
221 "Create a new Git repository." |
78687
429a17d4958d
* vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
222 (vc-git-command nil 0 nil "init")) |
78355 | 223 |
224 (defun vc-git-register (files &optional rev comment) | |
225 "Register FILE into the git version-control system." | |
226 (vc-git-command nil 0 files "update-index" "--add" "--")) | |
227 | |
228 (defalias 'vc-git-responsible-p 'vc-git-root) | |
229 | |
230 (defun vc-git-unregister (file) | |
231 (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
232 | |
233 | |
234 (defun vc-git-checkin (files rev comment) | |
235 (let ((coding-system-for-write git-commits-coding-system)) | |
236 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) | |
237 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
238 (defun vc-git-find-revision (file rev buffer) |
78355 | 239 (let ((coding-system-for-read 'binary) |
240 (coding-system-for-write 'binary) | |
241 (fullname (substring | |
242 (vc-git--run-command-string | |
243 file "ls-files" "-z" "--full-name" "--") | |
244 0 -1))) | |
245 (vc-git-command | |
246 buffer 0 | |
247 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) | |
248 | |
249 (defun vc-git-checkout (file &optional editable rev) | |
250 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) | |
251 | |
252 (defun vc-git-revert (file &optional contents-done) | |
253 "Revert FILE to the version stored in the git repository." | |
254 (if contents-done | |
255 (vc-git-command nil 0 file "update-index" "--") | |
256 (vc-git-command nil 0 file "checkout" "HEAD"))) | |
257 | |
258 ;;; HISTORY FUNCTIONS | |
259 | |
260 (defun vc-git-print-log (files &optional buffer) | |
261 "Get change log associated with FILES." | |
262 (let ((coding-system-for-read git-commits-coding-system) | |
263 ;; Support both the old print-log interface that passes a | |
264 ;; single file, and the new one that passes a file list. | |
265 (flist (if (listp files) files (list files)))) | |
266 ;; `vc-do-command' creates the buffer, but we need it before running | |
267 ;; the command. | |
268 (vc-setup-buffer buffer) | |
269 ;; If the buffer exists from a previous invocation it might be | |
270 ;; read-only. | |
271 (let ((inhibit-read-only t)) | |
272 ;; XXX `log-view-mode' needs to have something to identify where | |
273 ;; the log for each individual file starts. It seems that by | |
274 ;; default git does not output this info. So loop here and call | |
275 ;; "git rev-list" on each file separately to make sure that each | |
276 ;; file gets a "File:" header before the corresponding | |
277 ;; log. Maybe there is a way to do this with one command... | |
278 (dolist (file flist) | |
279 (with-current-buffer | |
280 buffer | |
281 (insert "File: " (file-name-nondirectory file) "\n")) | |
282 (vc-git-command buffer 'async (file-relative-name file) | |
283 "rev-list" "--pretty" "HEAD" "--"))))) | |
284 | |
285 (defvar log-view-message-re) | |
286 (defvar log-view-file-re) | |
287 (defvar log-view-font-lock-keywords) | |
288 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
289 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
78355 | 290 (require 'add-log) ;; we need the faces add-log |
291 ;; Don't have file markers, so use impossible regexp. | |
292 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") | |
293 (set (make-local-variable 'log-view-message-re) | |
294 "^commit *\\([0-9a-z]+\\)") | |
295 (set (make-local-variable 'log-view-font-lock-keywords) | |
296 (append | |
86400 | 297 `((,log-view-message-re (1 'change-log-acknowledgement)) |
298 (,log-view-file-re (1 'change-log-file-face))) | |
299 ;; Handle the case: | |
300 ;; user: foo@bar | |
301 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
302 (1 'change-log-email)) | |
303 ;; Handle the case: | |
304 ;; user: FirstName LastName <foo@bar> | |
305 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
306 (1 'change-log-name) | |
307 (2 'change-log-email)) | |
308 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
309 (1 'change-log-name)) | |
310 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
311 (1 'change-log-name) | |
312 (2 'change-log-email)) | |
313 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
314 (1 'change-log-acknowledgement) | |
315 (2 'change-log-acknowledgement)) | |
316 ("^Date: \\(.+\\)" (1 'change-log-date)) | |
317 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
78355 | 318 |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
319 (defun vc-git-show-log-entry (revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
320 "Move to the log entry for REVISION. |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
321 REVISION may have the form BRANCH, BRANCH~N, |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
322 or BRANCH^ (where \"^\" can be repeated)." |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
323 (goto-char (point-min)) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
324 (search-forward "\ncommit" nil t |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
325 (cond ((string-match "~\\([0-9]\\)$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
326 (1+ (string-to-number (match-string 1 revision)))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
327 ((string-match "\\^+$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
328 (1+ (length (match-string 0 revision)))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
329 (t nil))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
330 (beginning-of-line)) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
331 |
78355 | 332 (defun vc-git-diff (files &optional rev1 rev2 buffer) |
333 (let ((buf (or buffer "*vc-diff*"))) | |
334 (if (and rev1 rev2) | |
86400 | 335 (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" |
336 rev1 rev2 "--") | |
337 (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" | |
338 (or rev1 "HEAD") "--")))) | |
78355 | 339 |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
340 (defun vc-git-revision-table (files) |
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
341 ;; What about `files'?!? --Stef |
78355 | 342 (let ((table (list "HEAD"))) |
343 (with-temp-buffer | |
344 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
345 (goto-char (point-min)) | |
346 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) | |
347 (push (match-string 2) table))) | |
348 table)) | |
349 | |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
350 (defun vc-git-revision-completion-table (files) |
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
351 (lexical-let ((files files) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
352 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
353 (setq table (lazy-completion-table |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
354 table (lambda () (vc-git-revision-table files)))) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
355 table)) |
78355 | 356 |
357 (defun vc-git-annotate-command (file buf &optional rev) | |
358 ;; FIXME: rev is ignored | |
359 (let ((name (file-relative-name file))) | |
360 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) | |
361 | |
362 (defun vc-git-annotate-time () | |
363 (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) | |
364 (vc-annotate-convert-time | |
86400 | 365 (apply #'encode-time (mapcar (lambda (match) |
366 (string-to-number (match-string match))) | |
367 '(6 5 4 3 2 1 7)))))) | |
78355 | 368 |
369 (defun vc-git-annotate-extract-revision-at-line () | |
86400 | 370 (save-excursion |
371 (move-beginning-of-line 1) | |
372 (and (looking-at "[0-9a-f]+") | |
373 (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) | |
78355 | 374 |
375 ;;; SNAPSHOT SYSTEM | |
376 | |
377 (defun vc-git-create-snapshot (dir name branchp) | |
378 (let ((default-directory dir)) | |
379 (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
380 (if branchp | |
381 (vc-git-command nil 0 nil "checkout" "-b" name) | |
382 (vc-git-command nil 0 nil "tag" name))))) | |
383 | |
384 (defun vc-git-retrieve-snapshot (dir name update) | |
385 (let ((default-directory dir)) | |
386 (vc-git-command nil 0 nil "checkout" name) | |
387 ;; FIXME: update buffers if `update' is true | |
388 )) | |
389 | |
390 | |
391 ;;; MISCELLANEOUS | |
392 | |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
393 (defun vc-git-previous-revision (file rev) |
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
394 "Git-specific version of `vc-previous-revision'." |
78355 | 395 (let ((default-directory (file-name-directory (expand-file-name file))) |
396 (file (file-name-nondirectory file))) | |
397 (vc-git-symbolic-commit | |
398 (with-temp-buffer | |
399 (and | |
400 (zerop | |
401 (call-process "git" nil '(t nil) nil "rev-list" | |
402 "-2" rev "--" file)) | |
403 (goto-char (point-max)) | |
404 (bolp) | |
405 (zerop (forward-line -1)) | |
406 (not (bobp)) | |
407 (buffer-substring-no-properties | |
86400 | 408 (point) |
409 (1- (point-max)))))))) | |
78355 | 410 |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
411 (defun vc-git-next-revision (file rev) |
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
412 "Git-specific version of `vc-next-revision'." |
78355 | 413 (let* ((default-directory (file-name-directory |
414 (expand-file-name file))) | |
86400 | 415 (file (file-name-nondirectory file)) |
416 (current-rev | |
417 (with-temp-buffer | |
418 (and | |
419 (zerop | |
420 (call-process "git" nil '(t nil) nil "rev-list" | |
421 "-1" rev "--" file)) | |
422 (goto-char (point-max)) | |
423 (bolp) | |
424 (zerop (forward-line -1)) | |
425 (bobp) | |
426 (buffer-substring-no-properties | |
427 (point) | |
428 (1- (point-max))))))) | |
78355 | 429 (and current-rev |
430 (vc-git-symbolic-commit | |
431 (with-temp-buffer | |
432 (and | |
433 (zerop | |
434 (call-process "git" nil '(t nil) nil "rev-list" | |
435 "HEAD" "--" file)) | |
436 (goto-char (point-min)) | |
437 (search-forward current-rev nil t) | |
438 (zerop (forward-line -1)) | |
439 (buffer-substring-no-properties | |
440 (point) | |
441 (progn (forward-line 1) (1- (point)))))))))) | |
442 | |
443 (defun vc-git-delete-file (file) | |
444 (vc-git-command nil 0 file "rm" "-f" "--")) | |
445 | |
446 (defun vc-git-rename-file (old new) | |
447 (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
448 | |
449 | |
450 ;;; Internal commands | |
451 | |
452 (defun vc-git-root (file) | |
453 (vc-find-root file ".git")) | |
454 | |
455 (defun vc-git-command (buffer okstatus file-or-list &rest flags) | |
456 "A wrapper around `vc-do-command' for use in vc-git.el. | |
457 The difference to vc-do-command is that this function always invokes `git'." | |
458 (apply 'vc-do-command buffer okstatus "git" file-or-list flags)) | |
459 | |
460 (defun vc-git--run-command-string (file &rest args) | |
461 "Run a git command on FILE and return its output as string." | |
462 (let* ((ok t) | |
463 (str (with-output-to-string | |
464 (with-current-buffer standard-output | |
465 (unless (eq 0 (apply #'call-process "git" nil '(t nil) nil | |
86400 | 466 (append args (list (file-relative-name |
467 file))))) | |
78355 | 468 (setq ok nil)))))) |
469 (and ok str))) | |
470 | |
471 (defun vc-git-symbolic-commit (commit) | |
472 "Translate COMMIT string into symbolic form. | |
473 Returns nil if not possible." | |
474 (and commit | |
475 (with-temp-buffer | |
476 (and | |
477 (zerop | |
478 (call-process "git" nil '(t nil) nil "name-rev" | |
479 "--name-only" "--tags" | |
480 commit)) | |
481 (goto-char (point-min)) | |
482 (= (forward-line 2) 1) | |
483 (bolp) | |
484 (buffer-substring-no-properties (point-min) (1- (point-max))))))) | |
485 | |
486 (provide 'vc-git) | |
487 | |
488 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 | |
489 ;;; vc-git.el ends here |