Mercurial > emacs
annotate lisp/vc-git.el @ 93164:849abb573acb
(vc-bzr-state): Return 'removed for removed files and
'unregistered for unregistered files.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 23 Mar 2008 20:50:52 +0000 |
parents | c73e70274c0c |
children | 019e6794fecf |
rev | line source |
---|---|
78355 | 1 ;;; vc-git.el --- VC backend for the git version control system |
2 | |
79721 | 3 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. |
78355 | 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)) |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
138 (vc-git--out-ok "ls-files" "-c" "-z" "--" name)) |
78355 | 139 (let ((str (buffer-string))) |
140 (and (> (length str) (length name)) | |
86400 | 141 (string= (substring str 0 (1+ (length name))) |
142 (concat name "\0"))))))))) | |
78355 | 143 |
144 (defun vc-git-state (file) | |
145 "Git-specific version of `vc-state'." | |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87442
diff
changeset
|
146 ;; FIXME: This can't set 'ignored yet |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
147 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file)) |
78355 | 148 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) |
93118
01d3fd1a2cfe
* vc-hg.el (vc-hg-state):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92093
diff
changeset
|
149 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMU]\\)\0[^\0]+\0" |
86400 | 150 diff)) |
93118
01d3fd1a2cfe
* vc-hg.el (vc-hg-state):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92093
diff
changeset
|
151 (if (string= (match-string 1 diff) "A") 'added 'edited) |
93146 | 152 (if (vc-git--empty-db-p) 'added 'up-to-date)))) |
78355 | 153 |
87525
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
154 (defun vc-git--ls-files-state (state &rest args) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
155 "Set state to STATE on all files found with git-ls-files ARGS." |
78355 | 156 (with-temp-buffer |
87525
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
157 (apply 'vc-git-command (current-buffer) nil nil "ls-files" "-z" args) |
78355 | 158 (goto-char (point-min)) |
87525
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
159 (let ((start (point))) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
160 (while (search-forward "\0" nil t) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
161 (let ((file (expand-file-name |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
162 (buffer-substring-no-properties start (1- (point)))))) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
163 (vc-file-setprop file 'vc-backend (if state 'Git 'none)) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
164 (vc-file-setprop file 'vc-state state)) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
165 (setq start (point)))))) |
78355 | 166 |
167 (defun vc-git-dir-state (dir) | |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87442
diff
changeset
|
168 "Git-specific version of `dir-state'." |
87525
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
169 (vc-git--ls-files-state 'up-to-date "-c") |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
170 (vc-git--ls-files-state 'edited "-m") |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
171 (vc-git--ls-files-state 'removed "-d") |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
172 (vc-git--ls-files-state 'ignored "-o" "-i" "--exclude-standard") |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
173 (vc-git--ls-files-state nil "-o" "--exclude-standard")) |
78355 | 174 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
175 (defun vc-git-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
176 "Git-specific version of `vc-working-revision'." |
78355 | 177 (let ((str (with-output-to-string |
178 (with-current-buffer standard-output | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
179 (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
78355 | 180 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
181 (match-string 2 str) | |
182 str))) | |
183 | |
184 (defun vc-git-checkout-model (file) | |
185 'implicit) | |
186 | |
187 (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
|
188 (eq 'up-to-date (vc-git-state file))) |
78355 | 189 |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
190 (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
|
191 "Return string for placement into the modeline for FILE." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
192 (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
|
193 (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
|
194 (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
|
195 (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
|
196 (propertize |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
197 (concat def-ml "!") |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
198 '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
|
199 (propertize def-ml |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
200 '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
|
201 |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
202 ;; Variable used to keep the intermediate results for vc-git-status. |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
203 (defvar vc-git-status-result nil) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
204 |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
205 (defun vc-git-after-dir-status-stage2 (update-function status-buffer) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
206 (goto-char (point-min)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
207 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
208 (push (cons (match-string 1) 'unregistered) vc-git-status-result)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
209 (funcall update-function (nreverse vc-git-status-result) status-buffer) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
210 ;; Remove the temporary buffer. |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
211 (kill-buffer (current-buffer))) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
212 |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
213 (defun vc-git-after-dir-status-stage1 (update-function status-buffer) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
214 (goto-char (point-min)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
215 (while (re-search-forward |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
216 ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0\\([^\0]+\\)\0" |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
217 nil t 1) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
218 (let ((filename (match-string 2)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
219 (status (case (string-to-char( match-string 1)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
220 (?M 'edited) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
221 (?A 'added) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
222 (?D 'removed) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
223 (?U 'edited) ;; FIXME |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
224 (?T 'edited)))) ;; FIXME |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
225 (push (cons filename status) vc-git-status-result))) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
226 (erase-buffer) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
227 (vc-git-command (current-buffer) 'async nil "ls-files" "-z" "-o" |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
228 "--directory" "--no-empty-directory" "--exclude-standard") |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
229 (vc-exec-after |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
230 `(vc-git-after-dir-status-stage2 (quote ,update-function) ,status-buffer))) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
231 |
93146 | 232 (defun vc-git-after-dir-status-stage1-empty-db (update-function status-buffer) |
233 (goto-char (point-min)) | |
234 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) | |
235 (push (cons (match-string 1) 'added) vc-git-status-result)) | |
236 (erase-buffer) | |
237 (vc-git-command (current-buffer) 'async nil "ls-files" "-z" "-o" | |
238 "--directory" "--no-empty-directory" "--exclude-standard") | |
239 (vc-exec-after | |
240 `(vc-git-after-dir-status-stage2 (quote ,update-function) ,status-buffer))) | |
241 | |
91929
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
242 (defun vc-git-dir-status (dir update-function status-buffer) |
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
243 "Return a list of conses (file . state) for DIR." |
93122
ab6a0ec29e00
(vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93118
diff
changeset
|
244 ;; Further things that would have to be fixed later: |
ab6a0ec29e00
(vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93118
diff
changeset
|
245 ;; - how to handle unregistered directories |
ab6a0ec29e00
(vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93118
diff
changeset
|
246 ;; - how to support vc-status on a subdir of the project tree |
91929
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
247 (with-current-buffer |
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
248 (get-buffer-create |
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
249 (expand-file-name " *VC-Git* tmp status" dir)) |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
250 (set (make-local-variable 'vc-git-status-result) nil) |
93122
ab6a0ec29e00
(vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93118
diff
changeset
|
251 (cd dir) |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
252 (erase-buffer) |
93146 | 253 (if (vc-git--empty-db-p) |
254 (progn | |
255 (vc-git-command (current-buffer) 'async nil "ls-files" "-z" "-c") | |
256 (vc-exec-after | |
257 `(vc-git-after-dir-status-stage1-empty-db (quote ,update-function) ,status-buffer))) | |
258 (vc-git-command (current-buffer) 'async nil "diff-index" "-z" "HEAD") | |
259 (vc-exec-after | |
260 `(vc-git-after-dir-status-stage1 (quote ,update-function) ,status-buffer))) | |
92093
a0193ceeaa83
* vc.el (vc-exec-after): Move setting mode-line-process in the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
91929
diff
changeset
|
261 (current-buffer))) |
91929
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
262 |
78355 | 263 ;;; STATE-CHANGING FUNCTIONS |
264 | |
265 (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
|
266 "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
|
267 (vc-git-command nil 0 nil "init")) |
78355 | 268 |
269 (defun vc-git-register (files &optional rev comment) | |
270 "Register FILE into the git version-control system." | |
271 (vc-git-command nil 0 files "update-index" "--add" "--")) | |
272 | |
273 (defalias 'vc-git-responsible-p 'vc-git-root) | |
274 | |
275 (defun vc-git-unregister (file) | |
276 (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
277 | |
278 | |
279 (defun vc-git-checkin (files rev comment) | |
280 (let ((coding-system-for-write git-commits-coding-system)) | |
281 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) | |
282 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
283 (defun vc-git-find-revision (file rev buffer) |
78355 | 284 (let ((coding-system-for-read 'binary) |
285 (coding-system-for-write 'binary) | |
286 (fullname (substring | |
287 (vc-git--run-command-string | |
288 file "ls-files" "-z" "--full-name" "--") | |
289 0 -1))) | |
290 (vc-git-command | |
291 buffer 0 | |
292 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) | |
293 | |
294 (defun vc-git-checkout (file &optional editable rev) | |
295 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) | |
296 | |
297 (defun vc-git-revert (file &optional contents-done) | |
298 "Revert FILE to the version stored in the git repository." | |
299 (if contents-done | |
300 (vc-git-command nil 0 file "update-index" "--") | |
301 (vc-git-command nil 0 file "checkout" "HEAD"))) | |
302 | |
303 ;;; HISTORY FUNCTIONS | |
304 | |
305 (defun vc-git-print-log (files &optional buffer) | |
306 "Get change log associated with FILES." | |
307 (let ((coding-system-for-read git-commits-coding-system) | |
308 ;; Support both the old print-log interface that passes a | |
309 ;; single file, and the new one that passes a file list. | |
310 (flist (if (listp files) files (list files)))) | |
311 ;; `vc-do-command' creates the buffer, but we need it before running | |
312 ;; the command. | |
313 (vc-setup-buffer buffer) | |
314 ;; If the buffer exists from a previous invocation it might be | |
315 ;; read-only. | |
316 (let ((inhibit-read-only t)) | |
317 ;; XXX `log-view-mode' needs to have something to identify where | |
318 ;; the log for each individual file starts. It seems that by | |
319 ;; default git does not output this info. So loop here and call | |
320 ;; "git rev-list" on each file separately to make sure that each | |
321 ;; file gets a "File:" header before the corresponding | |
322 ;; log. Maybe there is a way to do this with one command... | |
323 (dolist (file flist) | |
324 (with-current-buffer | |
325 buffer | |
326 (insert "File: " (file-name-nondirectory file) "\n")) | |
327 (vc-git-command buffer 'async (file-relative-name file) | |
328 "rev-list" "--pretty" "HEAD" "--"))))) | |
329 | |
330 (defvar log-view-message-re) | |
331 (defvar log-view-file-re) | |
332 (defvar log-view-font-lock-keywords) | |
333 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
334 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
78355 | 335 (require 'add-log) ;; we need the faces add-log |
336 ;; Don't have file markers, so use impossible regexp. | |
337 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") | |
338 (set (make-local-variable 'log-view-message-re) | |
339 "^commit *\\([0-9a-z]+\\)") | |
340 (set (make-local-variable 'log-view-font-lock-keywords) | |
341 (append | |
86400 | 342 `((,log-view-message-re (1 'change-log-acknowledgement)) |
343 (,log-view-file-re (1 'change-log-file-face))) | |
344 ;; Handle the case: | |
345 ;; user: foo@bar | |
346 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
347 (1 'change-log-email)) | |
348 ;; Handle the case: | |
349 ;; user: FirstName LastName <foo@bar> | |
350 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
351 (1 'change-log-name) | |
352 (2 'change-log-email)) | |
353 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
354 (1 'change-log-name)) | |
355 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
356 (1 'change-log-name) | |
357 (2 'change-log-email)) | |
358 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
359 (1 'change-log-acknowledgement) | |
360 (2 'change-log-acknowledgement)) | |
361 ("^Date: \\(.+\\)" (1 'change-log-date)) | |
362 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
78355 | 363 |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
364 (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
|
365 "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
|
366 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
|
367 or BRANCH^ (where \"^\" can be repeated)." |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
368 (goto-char (point-min)) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
369 (search-forward "\ncommit" nil t |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
370 (cond ((string-match "~\\([0-9]\\)$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
371 (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
|
372 ((string-match "\\^+$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
373 (1+ (length (match-string 0 revision)))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
374 (t nil))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
375 (beginning-of-line)) |
78355 | 376 |
377 (defun vc-git-diff (files &optional rev1 rev2 buffer) | |
378 (let ((buf (or buffer "*vc-diff*"))) | |
379 (if (and rev1 rev2) | |
86400 | 380 (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" |
381 rev1 rev2 "--") | |
382 (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" | |
383 (or rev1 "HEAD") "--")))) | |
78355 | 384 |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
385 (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
|
386 ;; What about `files'?!? --Stef |
78355 | 387 (let ((table (list "HEAD"))) |
388 (with-temp-buffer | |
389 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
390 (goto-char (point-min)) | |
391 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) | |
392 (push (match-string 2) table))) | |
393 table)) | |
394 | |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
395 (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
|
396 (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
|
397 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
398 (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
|
399 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
|
400 table)) |
78355 | 401 |
402 (defun vc-git-annotate-command (file buf &optional rev) | |
403 ;; FIXME: rev is ignored | |
404 (let ((name (file-relative-name file))) | |
405 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) | |
406 | |
407 (defun vc-git-annotate-time () | |
86422
68e2cdfcf931
(vc-git-annotate-time): Handle optional field FILENAME.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86403
diff
changeset
|
408 (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) |
78355 | 409 (vc-annotate-convert-time |
86400 | 410 (apply #'encode-time (mapcar (lambda (match) |
411 (string-to-number (match-string match))) | |
412 '(6 5 4 3 2 1 7)))))) | |
78355 | 413 |
414 (defun vc-git-annotate-extract-revision-at-line () | |
86400 | 415 (save-excursion |
416 (move-beginning-of-line 1) | |
93145
9a34bf3a4363
(vc-git-annotate-extract-revision-at-line):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93124
diff
changeset
|
417 (and (looking-at "[0-9a-f^][0-9a-f]+") |
86400 | 418 (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) |
78355 | 419 |
420 ;;; SNAPSHOT SYSTEM | |
421 | |
422 (defun vc-git-create-snapshot (dir name branchp) | |
423 (let ((default-directory dir)) | |
424 (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
425 (if branchp | |
426 (vc-git-command nil 0 nil "checkout" "-b" name) | |
427 (vc-git-command nil 0 nil "tag" name))))) | |
428 | |
429 (defun vc-git-retrieve-snapshot (dir name update) | |
430 (let ((default-directory dir)) | |
431 (vc-git-command nil 0 nil "checkout" name) | |
432 ;; FIXME: update buffers if `update' is true | |
433 )) | |
434 | |
435 | |
436 ;;; MISCELLANEOUS | |
437 | |
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
|
438 (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
|
439 "Git-specific version of `vc-previous-revision'." |
78355 | 440 (let ((default-directory (file-name-directory (expand-file-name file))) |
441 (file (file-name-nondirectory file))) | |
442 (vc-git-symbolic-commit | |
443 (with-temp-buffer | |
444 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
445 (vc-git--out-ok "rev-list" "-2" rev "--" file) |
78355 | 446 (goto-char (point-max)) |
447 (bolp) | |
448 (zerop (forward-line -1)) | |
449 (not (bobp)) | |
450 (buffer-substring-no-properties | |
86400 | 451 (point) |
452 (1- (point-max)))))))) | |
78355 | 453 |
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
|
454 (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
|
455 "Git-specific version of `vc-next-revision'." |
78355 | 456 (let* ((default-directory (file-name-directory |
457 (expand-file-name file))) | |
86400 | 458 (file (file-name-nondirectory file)) |
459 (current-rev | |
460 (with-temp-buffer | |
461 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
462 (vc-git--out-ok "rev-list" "-1" rev "--" file) |
86400 | 463 (goto-char (point-max)) |
464 (bolp) | |
465 (zerop (forward-line -1)) | |
466 (bobp) | |
467 (buffer-substring-no-properties | |
468 (point) | |
469 (1- (point-max))))))) | |
78355 | 470 (and current-rev |
471 (vc-git-symbolic-commit | |
472 (with-temp-buffer | |
473 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
474 (vc-git--out-ok "rev-list" "HEAD" "--" file) |
78355 | 475 (goto-char (point-min)) |
476 (search-forward current-rev nil t) | |
477 (zerop (forward-line -1)) | |
478 (buffer-substring-no-properties | |
479 (point) | |
480 (progn (forward-line 1) (1- (point)))))))))) | |
481 | |
482 (defun vc-git-delete-file (file) | |
483 (vc-git-command nil 0 file "rm" "-f" "--")) | |
484 | |
485 (defun vc-git-rename-file (old new) | |
486 (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
487 | |
488 | |
489 ;;; Internal commands | |
490 | |
491 (defun vc-git-root (file) | |
492 (vc-find-root file ".git")) | |
493 | |
494 (defun vc-git-command (buffer okstatus file-or-list &rest flags) | |
495 "A wrapper around `vc-do-command' for use in vc-git.el. | |
496 The difference to vc-do-command is that this function always invokes `git'." | |
497 (apply 'vc-do-command buffer okstatus "git" file-or-list flags)) | |
498 | |
93146 | 499 (defun vc-git--empty-db-p () |
500 "Check if the git db is empty (no commit done yet)." | |
501 (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD")))) | |
502 | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
503 (defun vc-git--call (buffer command &rest args) |
87648
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
504 ;; We don't need to care the arguments. If there is a file name, it |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
505 ;; is always a relative one. This works also for remote |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
506 ;; directories. |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
507 (apply 'process-file "git" nil buffer nil command args)) |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
508 |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
509 (defun vc-git--out-ok (command &rest args) |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
510 (zerop (apply 'vc-git--call '(t nil) command args))) |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
511 |
78355 | 512 (defun vc-git--run-command-string (file &rest args) |
513 "Run a git command on FILE and return its output as string." | |
514 (let* ((ok t) | |
515 (str (with-output-to-string | |
516 (with-current-buffer standard-output | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
517 (unless (apply 'vc-git--out-ok |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
518 (append args (list (file-relative-name |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
519 file)))) |
78355 | 520 (setq ok nil)))))) |
521 (and ok str))) | |
522 | |
523 (defun vc-git-symbolic-commit (commit) | |
524 "Translate COMMIT string into symbolic form. | |
525 Returns nil if not possible." | |
526 (and commit | |
527 (with-temp-buffer | |
528 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
529 (vc-git--out-ok "name-rev" "--name-only" "--tags" commit) |
78355 | 530 (goto-char (point-min)) |
531 (= (forward-line 2) 1) | |
532 (bolp) | |
533 (buffer-substring-no-properties (point-min) (1- (point-max))))))) | |
534 | |
535 (provide 'vc-git) | |
536 | |
537 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 | |
538 ;;; vc-git.el ends here |