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