Mercurial > emacs
annotate lisp/vc-git.el @ 93964:46ac0eab32c3
Revert changes included by mistake in previous commit.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Thu, 10 Apr 2008 07:53:50 +0000 |
parents | 912e50ecb992 |
children | 2ecb2ea8d5b5 |
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 | |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
111 (eval-when-compile (require 'cl) (require 'vc) (require 'grep)) |
78355 | 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 |
93173
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
144 (defun vc-git--state-code (code) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
145 "Convert from a string to a added/deleted/modified state." |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
146 (case (string-to-char code) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
147 (?M 'edited) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
148 (?A 'added) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
149 (?D 'removed) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
150 (?U 'edited) ;; FIXME |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
151 (?T 'edited))) ;; FIXME |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
152 |
78355 | 153 (defun vc-git-state (file) |
154 "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
|
155 ;; 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
|
156 (vc-git--call nil "add" "--refresh" "--" (file-relative-name file)) |
78355 | 157 (let ((diff (vc-git--run-command-string file "diff-index" "-z" "HEAD" "--"))) |
93173
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
158 (if (and diff (string-match ":[0-7]\\{6\\} [0-7]\\{6\\} [0-9a-f]\\{40\\} [0-9a-f]\\{40\\} \\([ADMUT]\\)\0[^\0]+\0" |
86400 | 159 diff)) |
93173
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
160 (vc-git--state-code (match-string 1 diff)) |
93146 | 161 (if (vc-git--empty-db-p) 'added 'up-to-date)))) |
78355 | 162 |
87525
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
163 (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
|
164 "Set state to STATE on all files found with git-ls-files ARGS." |
78355 | 165 (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
|
166 (apply 'vc-git-command (current-buffer) nil nil "ls-files" "-z" args) |
78355 | 167 (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
|
168 (let ((start (point))) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
169 (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
|
170 (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
|
171 (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
|
172 (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
|
173 (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
|
174 (setq start (point)))))) |
78355 | 175 |
176 (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
|
177 "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
|
178 (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
|
179 (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
|
180 (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
|
181 (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
|
182 (vc-git--ls-files-state nil "-o" "--exclude-standard")) |
78355 | 183 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
184 (defun vc-git-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
185 "Git-specific version of `vc-working-revision'." |
78355 | 186 (let ((str (with-output-to-string |
187 (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
|
188 (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
78355 | 189 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
190 (match-string 2 str) | |
191 str))) | |
192 | |
193 (defun vc-git-checkout-model (file) | |
194 'implicit) | |
195 | |
196 (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
|
197 (eq 'up-to-date (vc-git-state file))) |
78355 | 198 |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
199 (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
|
200 "Return string for placement into the modeline for FILE." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
201 (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
|
202 (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
|
203 (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
|
204 (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
|
205 (propertize |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
206 (concat def-ml "!") |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
207 '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
|
208 (propertize def-ml |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
209 '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
|
210 |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
211 (defstruct (vc-git-extra-fileinfo |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
212 (:copier nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
213 (:constructor vc-git-create-extra-fileinfo (old-perm new-perm &optional rename-state orig-name)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
214 (:conc-name vc-git-extra-fileinfo->)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
215 old-perm new-perm ;; permission flags |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
216 rename-state ;; rename or copy state |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
217 orig-name) ;; original name for renames or copies |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
218 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
219 (defun vc-git-escape-file-name (name) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
220 "Escape a file name if necessary." |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
221 (if (string-match "[\n\t\"\\]" name) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
222 (concat "\"" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
223 (mapconcat (lambda (c) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
224 (case c |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
225 (?\n "\\n") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
226 (?\t "\\t") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
227 (?\\ "\\\\") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
228 (?\" "\\\"") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
229 (t (char-to-string c)))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
230 name "") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
231 "\"") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
232 name)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
233 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
234 (defun vc-git-file-type-as-string (old-perm new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
235 "Return a string describing the file type based on its permissions." |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
236 (let* ((old-type (lsh (or old-perm 0) -9)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
237 (new-type (lsh (or new-perm 0) -9)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
238 (str (case new-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
239 (?\100 ;; file |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
240 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
241 (?\100 nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
242 (?\120 " (type change symlink -> file)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
243 (?\160 " (type change subproject -> file)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
244 (?\120 ;; symlink |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
245 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
246 (?\100 " (type change file -> symlink)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
247 (?\160 " (type change subproject -> symlink)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
248 (t " (symlink)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
249 (?\160 ;; subproject |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
250 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
251 (?\100 " (type change file -> subproject)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
252 (?\120 " (type change symlink -> subproject)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
253 (t " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
254 (?\110 nil) ;; directory (internal, not a real git state) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
255 (?\000 ;; deleted or unknown |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
256 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
257 (?\120 " (symlink)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
258 (?\160 " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
259 (t (format " (unknown type %o)" new-type))))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
260 (cond (str (propertize str 'face 'font-lock-comment-face)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
261 ((eq new-type ?\110) "/") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
262 (t "")))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
263 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
264 (defun vc-git-rename-as-string (state extra) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
265 "Return a string describing the copy or rename associated with INFO, or an empty string if none." |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
266 (let ((rename-state (when extra |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
267 (vc-git-extra-fileinfo->rename-state extra)))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
268 (if rename-state |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
269 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
270 (concat " (" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
271 (if (eq rename-state 'copy) "copied from " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
272 (if (eq state 'added) "renamed from " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
273 "renamed to ")) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
274 (vc-git-escape-file-name (vc-git-extra-fileinfo->orig-name extra)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
275 ")") 'face 'font-lock-comment-face) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
276 ""))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
277 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
278 (defun vc-git-permissions-as-string (old-perm new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
279 "Format a permission change as string." |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
280 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
281 (if (or (not old-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
282 (not new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
283 (eq 0 (logand ?\111 (logxor old-perm new-perm)))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
284 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
285 (if (eq 0 (logand ?\111 old-perm)) "+x" "-x")) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
286 'face 'font-lock-type-face)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
287 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
288 (defun vc-git-status-printer (info) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
289 "Pretty-printer for the vc-status-fileinfo structure." |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
290 (let* ((state (vc-status-fileinfo->state info)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
291 (extra (vc-status-fileinfo->extra info)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
292 (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
293 (new-perm (when extra (vc-git-extra-fileinfo->new-perm extra)))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
294 (insert |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
295 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
296 (propertize (format "%c" (if (vc-status-fileinfo->marked info) ?* ? )) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
297 'face 'font-lock-type-face) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
298 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
299 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
300 (format "%-12s" state) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
301 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
302 ((eq state 'missing) 'font-lock-warning-face) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
303 (t 'font-lock-variable-name-face)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
304 'mouse-face 'highlight) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
305 " " (vc-git-permissions-as-string old-perm new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
306 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
307 (propertize (vc-git-escape-file-name (vc-status-fileinfo->name info)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
308 'face 'font-lock-function-name-face |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
309 'mouse-face 'highlight) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
310 (vc-git-file-type-as-string old-perm new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
311 (vc-git-rename-as-string state extra)))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
312 |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
313 ;; 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
|
314 (defvar vc-git-status-result nil) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
315 |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
316 (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
|
317 (goto-char (point-min)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
318 (while (re-search-forward "\\([^\0]*?\\)\0" nil t 1) |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
319 (push (list (match-string 1) 'unregistered (vc-git-create-extra-fileinfo 0 0)) vc-git-status-result)) |
93382
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
320 (funcall update-function (nreverse vc-git-status-result) status-buffer)) |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
321 |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
322 (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
|
323 (goto-char (point-min)) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
324 (while (re-search-forward |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
325 ":\\([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" |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
326 nil t 1) |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
327 (let ((old-perm (string-to-number (match-string 1) 8)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
328 (new-perm (string-to-number (match-string 2) 8)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
329 (state (or (match-string 4) (match-string 6))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
330 (name (or (match-string 5) (match-string 7))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
331 (new-name (match-string 8))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
332 (if new-name ; copy or rename |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
333 (if (eq ?C (string-to-char state)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
334 (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'copy name)) vc-git-status-result) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
335 (push (list name 'removed (vc-git-create-extra-fileinfo 0 0 'rename new-name)) vc-git-status-result) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
336 (push (list new-name 'added (vc-git-create-extra-fileinfo old-perm new-perm 'rename name)) vc-git-status-result)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
337 (push (list name (vc-git--state-code state) (vc-git-create-extra-fileinfo old-perm new-perm)) vc-git-status-result)))) |
93123
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
338 (erase-buffer) |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
339 (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
|
340 "--directory" "--no-empty-directory" "--exclude-standard") |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
341 (vc-exec-after |
38f18130d057
(vc-git-status-result): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93122
diff
changeset
|
342 `(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
|
343 |
93146 | 344 (defun vc-git-after-dir-status-stage1-empty-db (update-function status-buffer) |
345 (goto-char (point-min)) | |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
346 (while (re-search-forward "\\([0-7]\\{6\\}\\) [0-9a-f]\\{40\\} 0\t\\([^\0]+\\)\0" nil t) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
347 (let ((new-perm (string-to-number (match-string 1) 8)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
348 (name (match-string 2))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
349 (push (list name 'added (vc-git-create-extra-fileinfo 0 new-perm)) vc-git-status-result))) |
93146 | 350 (erase-buffer) |
351 (vc-git-command (current-buffer) 'async nil "ls-files" "-z" "-o" | |
352 "--directory" "--no-empty-directory" "--exclude-standard") | |
353 (vc-exec-after | |
354 `(vc-git-after-dir-status-stage2 (quote ,update-function) ,status-buffer))) | |
355 | |
91929
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
356 (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
|
357 "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
|
358 ;; 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
|
359 ;; - how to handle unregistered directories |
ab6a0ec29e00
(vc-git-after-dir-status): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93118
diff
changeset
|
360 ;; - how to support vc-status on a subdir of the project tree |
93382
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
361 (set (make-local-variable 'vc-git-status-result) nil) |
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
362 (if (vc-git--empty-db-p) |
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
363 (progn |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
364 (vc-git-command (current-buffer) 'async nil "ls-files" "-z" "-c" "-s") |
93382
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
365 (vc-exec-after |
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
366 `(vc-git-after-dir-status-stage1-empty-db |
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
367 (quote ,update-function) ,status-buffer))) |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
368 (vc-git-command (current-buffer) 'async nil "diff-index" "-z" "-M" "HEAD") |
93382
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
369 (vc-exec-after |
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93333
diff
changeset
|
370 `(vc-git-after-dir-status-stage1 (quote ,update-function) ,status-buffer)))) |
91929
3299b785d830
(vc-git-after-dir-status, vc-git-dir-status): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
371 |
93333
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
372 (defun vc-git-status-extra-headers (dir) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
373 (let ((str (with-output-to-string |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
374 (with-current-buffer standard-output |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
375 (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
376 (concat |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
377 (propertize "Branch : " 'face 'font-lock-type-face) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
378 (propertize |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
379 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
380 (match-string 2 str) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
381 "not (detached HEAD)") |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
382 'face 'font-lock-variable-name-face)))) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
383 |
78355 | 384 ;;; STATE-CHANGING FUNCTIONS |
385 | |
386 (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
|
387 "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
|
388 (vc-git-command nil 0 nil "init")) |
78355 | 389 |
390 (defun vc-git-register (files &optional rev comment) | |
391 "Register FILE into the git version-control system." | |
392 (vc-git-command nil 0 files "update-index" "--add" "--")) | |
393 | |
394 (defalias 'vc-git-responsible-p 'vc-git-root) | |
395 | |
396 (defun vc-git-unregister (file) | |
397 (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
398 | |
399 | |
400 (defun vc-git-checkin (files rev comment) | |
401 (let ((coding-system-for-write git-commits-coding-system)) | |
402 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) | |
403 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
404 (defun vc-git-find-revision (file rev buffer) |
78355 | 405 (let ((coding-system-for-read 'binary) |
406 (coding-system-for-write 'binary) | |
407 (fullname (substring | |
408 (vc-git--run-command-string | |
409 file "ls-files" "-z" "--full-name" "--") | |
410 0 -1))) | |
411 (vc-git-command | |
412 buffer 0 | |
413 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) | |
414 | |
415 (defun vc-git-checkout (file &optional editable rev) | |
416 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) | |
417 | |
418 (defun vc-git-revert (file &optional contents-done) | |
419 "Revert FILE to the version stored in the git repository." | |
420 (if contents-done | |
421 (vc-git-command nil 0 file "update-index" "--") | |
422 (vc-git-command nil 0 file "checkout" "HEAD"))) | |
423 | |
424 ;;; HISTORY FUNCTIONS | |
425 | |
426 (defun vc-git-print-log (files &optional buffer) | |
427 "Get change log associated with FILES." | |
428 (let ((coding-system-for-read git-commits-coding-system) | |
429 ;; Support both the old print-log interface that passes a | |
430 ;; single file, and the new one that passes a file list. | |
431 (flist (if (listp files) files (list files)))) | |
432 ;; `vc-do-command' creates the buffer, but we need it before running | |
433 ;; the command. | |
434 (vc-setup-buffer buffer) | |
435 ;; If the buffer exists from a previous invocation it might be | |
436 ;; read-only. | |
437 (let ((inhibit-read-only t)) | |
438 ;; XXX `log-view-mode' needs to have something to identify where | |
439 ;; the log for each individual file starts. It seems that by | |
440 ;; default git does not output this info. So loop here and call | |
441 ;; "git rev-list" on each file separately to make sure that each | |
442 ;; file gets a "File:" header before the corresponding | |
443 ;; log. Maybe there is a way to do this with one command... | |
444 (dolist (file flist) | |
445 (with-current-buffer | |
446 buffer | |
447 (insert "File: " (file-name-nondirectory file) "\n")) | |
448 (vc-git-command buffer 'async (file-relative-name file) | |
449 "rev-list" "--pretty" "HEAD" "--"))))) | |
450 | |
451 (defvar log-view-message-re) | |
452 (defvar log-view-file-re) | |
453 (defvar log-view-font-lock-keywords) | |
454 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
455 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
78355 | 456 (require 'add-log) ;; we need the faces add-log |
457 ;; Don't have file markers, so use impossible regexp. | |
458 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") | |
459 (set (make-local-variable 'log-view-message-re) | |
460 "^commit *\\([0-9a-z]+\\)") | |
461 (set (make-local-variable 'log-view-font-lock-keywords) | |
462 (append | |
86400 | 463 `((,log-view-message-re (1 'change-log-acknowledgement)) |
464 (,log-view-file-re (1 'change-log-file-face))) | |
465 ;; Handle the case: | |
466 ;; user: foo@bar | |
467 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
468 (1 'change-log-email)) | |
469 ;; Handle the case: | |
470 ;; user: FirstName LastName <foo@bar> | |
471 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
472 (1 'change-log-name) | |
473 (2 'change-log-email)) | |
474 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
475 (1 'change-log-name)) | |
476 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
477 (1 'change-log-name) | |
478 (2 'change-log-email)) | |
479 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
480 (1 'change-log-acknowledgement) | |
481 (2 'change-log-acknowledgement)) | |
482 ("^Date: \\(.+\\)" (1 'change-log-date)) | |
483 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
78355 | 484 |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
485 (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
|
486 "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
|
487 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
|
488 or BRANCH^ (where \"^\" can be repeated)." |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
489 (goto-char (point-min)) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
490 (search-forward "\ncommit" nil t |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
491 (cond ((string-match "~\\([0-9]\\)$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
492 (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
|
493 ((string-match "\\^+$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
494 (1+ (length (match-string 0 revision)))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
495 (t nil))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
496 (beginning-of-line)) |
78355 | 497 |
498 (defun vc-git-diff (files &optional rev1 rev2 buffer) | |
499 (let ((buf (or buffer "*vc-diff*"))) | |
500 (if (and rev1 rev2) | |
86400 | 501 (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" |
502 rev1 rev2 "--") | |
503 (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" | |
504 (or rev1 "HEAD") "--")))) | |
78355 | 505 |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
506 (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
|
507 ;; What about `files'?!? --Stef |
78355 | 508 (let ((table (list "HEAD"))) |
509 (with-temp-buffer | |
510 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
511 (goto-char (point-min)) | |
512 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) | |
513 (push (match-string 2) table))) | |
514 table)) | |
515 | |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
516 (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
|
517 (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
|
518 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
519 (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
|
520 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
|
521 table)) |
78355 | 522 |
523 (defun vc-git-annotate-command (file buf &optional rev) | |
524 ;; FIXME: rev is ignored | |
525 (let ((name (file-relative-name file))) | |
526 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) | |
527 | |
528 (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
|
529 (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 | 530 (vc-annotate-convert-time |
86400 | 531 (apply #'encode-time (mapcar (lambda (match) |
532 (string-to-number (match-string match))) | |
533 '(6 5 4 3 2 1 7)))))) | |
78355 | 534 |
535 (defun vc-git-annotate-extract-revision-at-line () | |
86400 | 536 (save-excursion |
537 (move-beginning-of-line 1) | |
93145
9a34bf3a4363
(vc-git-annotate-extract-revision-at-line):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93124
diff
changeset
|
538 (and (looking-at "[0-9a-f^][0-9a-f]+") |
86400 | 539 (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) |
78355 | 540 |
541 ;;; SNAPSHOT SYSTEM | |
542 | |
543 (defun vc-git-create-snapshot (dir name branchp) | |
544 (let ((default-directory dir)) | |
545 (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
546 (if branchp | |
547 (vc-git-command nil 0 nil "checkout" "-b" name) | |
548 (vc-git-command nil 0 nil "tag" name))))) | |
549 | |
550 (defun vc-git-retrieve-snapshot (dir name update) | |
551 (let ((default-directory dir)) | |
552 (vc-git-command nil 0 nil "checkout" name) | |
553 ;; FIXME: update buffers if `update' is true | |
554 )) | |
555 | |
556 | |
557 ;;; MISCELLANEOUS | |
558 | |
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
|
559 (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
|
560 "Git-specific version of `vc-previous-revision'." |
78355 | 561 (let ((default-directory (file-name-directory (expand-file-name file))) |
562 (file (file-name-nondirectory file))) | |
563 (vc-git-symbolic-commit | |
564 (with-temp-buffer | |
565 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
566 (vc-git--out-ok "rev-list" "-2" rev "--" file) |
78355 | 567 (goto-char (point-max)) |
568 (bolp) | |
569 (zerop (forward-line -1)) | |
570 (not (bobp)) | |
571 (buffer-substring-no-properties | |
86400 | 572 (point) |
573 (1- (point-max)))))))) | |
78355 | 574 |
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
|
575 (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
|
576 "Git-specific version of `vc-next-revision'." |
78355 | 577 (let* ((default-directory (file-name-directory |
578 (expand-file-name file))) | |
86400 | 579 (file (file-name-nondirectory file)) |
580 (current-rev | |
581 (with-temp-buffer | |
582 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
583 (vc-git--out-ok "rev-list" "-1" rev "--" file) |
86400 | 584 (goto-char (point-max)) |
585 (bolp) | |
586 (zerop (forward-line -1)) | |
587 (bobp) | |
588 (buffer-substring-no-properties | |
589 (point) | |
590 (1- (point-max))))))) | |
78355 | 591 (and current-rev |
592 (vc-git-symbolic-commit | |
593 (with-temp-buffer | |
594 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
595 (vc-git--out-ok "rev-list" "HEAD" "--" file) |
78355 | 596 (goto-char (point-min)) |
597 (search-forward current-rev nil t) | |
598 (zerop (forward-line -1)) | |
599 (buffer-substring-no-properties | |
600 (point) | |
601 (progn (forward-line 1) (1- (point)))))))))) | |
602 | |
603 (defun vc-git-delete-file (file) | |
604 (vc-git-command nil 0 file "rm" "-f" "--")) | |
605 | |
606 (defun vc-git-rename-file (old new) | |
607 (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
608 | |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
609 (defvar vc-git-extra-menu-map |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
610 (let ((map (make-sparse-keymap))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
611 (define-key map [git-grep] |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
612 '(menu-item "Git grep..." vc-git-grep |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
613 :help "Run the `git grep' command")) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
614 map)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
615 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
616 (defun vc-git-extra-menu () vc-git-extra-menu-map) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
617 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
618 (defun vc-git-extra-status-menu () vc-git-extra-menu-map) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
619 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
620 ;; Derived from `lgrep'. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
621 (defun vc-git-grep (regexp &optional files dir) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
622 "Run git grep, searching for REGEXP in FILES in directory DIR. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
623 The search is limited to file names matching shell pattern FILES. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
624 FILES may use abbreviations defined in `grep-files-aliases', e.g. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
625 entering `ch' is equivalent to `*.[ch]'. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
626 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
627 With \\[universal-argument] prefix, you can edit the constructed shell command line |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
628 before it is executed. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
629 With two \\[universal-argument] prefixes, directly edit and run `grep-command'. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
630 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
631 Collect output in a buffer. While git grep runs asynchronously, you |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
632 can use \\[next-error] (M-x next-error), or \\<grep-mode-map>\\[compile-goto-error] \ |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
633 in the grep output buffer, |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
634 to go to the lines where grep found matches. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
635 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
636 This command shares argument histories with \\[rgrep] and \\[grep]." |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
637 (interactive |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
638 (progn |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
639 (grep-compute-defaults) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
640 (cond |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
641 ((equal current-prefix-arg '(16)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
642 (list (read-from-minibuffer "Run: " "git grep" |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
643 nil nil 'grep-history) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
644 nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
645 (t (let* ((regexp (grep-read-regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
646 (files (grep-read-files regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
647 (dir (read-directory-name "In directory: " |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
648 nil default-directory t))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
649 (list regexp files dir)))))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
650 (require 'grep) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
651 (when (and (stringp regexp) (> (length regexp) 0)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
652 (let ((command regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
653 (if (null files) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
654 (if (string= command "git grep") |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
655 (setq command nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
656 (setq dir (file-name-as-directory (expand-file-name dir))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
657 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
658 (grep-expand-template "git grep -n -e <R> -- <F>" regexp files)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
659 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
660 (if (equal current-prefix-arg '(4)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
661 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
662 (read-from-minibuffer "Confirm: " |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
663 command nil nil 'grep-history)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
664 (add-to-history 'grep-history command)))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
665 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
666 (let ((default-directory dir) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
667 (compilation-environment '("PAGER="))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
668 ;; Setting process-setup-function makes exit-message-function work |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
669 ;; even when async processes aren't supported. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
670 (compilation-start command 'grep-mode)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
671 (if (eq next-error-last-buffer (current-buffer)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
672 (setq default-directory dir)))))) |
78355 | 673 |
674 ;;; Internal commands | |
675 | |
676 (defun vc-git-root (file) | |
677 (vc-find-root file ".git")) | |
678 | |
679 (defun vc-git-command (buffer okstatus file-or-list &rest flags) | |
680 "A wrapper around `vc-do-command' for use in vc-git.el. | |
681 The difference to vc-do-command is that this function always invokes `git'." | |
682 (apply 'vc-do-command buffer okstatus "git" file-or-list flags)) | |
683 | |
93146 | 684 (defun vc-git--empty-db-p () |
685 "Check if the git db is empty (no commit done yet)." | |
686 (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD")))) | |
687 | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
688 (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
|
689 ;; 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
|
690 ;; 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
|
691 ;; directories. |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
692 (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
|
693 |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
694 (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
|
695 (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
|
696 |
78355 | 697 (defun vc-git--run-command-string (file &rest args) |
698 "Run a git command on FILE and return its output as string." | |
699 (let* ((ok t) | |
700 (str (with-output-to-string | |
701 (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
|
702 (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
|
703 (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
|
704 file)))) |
78355 | 705 (setq ok nil)))))) |
706 (and ok str))) | |
707 | |
708 (defun vc-git-symbolic-commit (commit) | |
709 "Translate COMMIT string into symbolic form. | |
710 Returns nil if not possible." | |
711 (and commit | |
712 (with-temp-buffer | |
713 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
714 (vc-git--out-ok "name-rev" "--name-only" "--tags" commit) |
78355 | 715 (goto-char (point-min)) |
716 (= (forward-line 2) 1) | |
717 (bolp) | |
718 (buffer-substring-no-properties (point-min) (1- (point-max))))))) | |
719 | |
720 (provide 'vc-git) | |
721 | |
722 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 | |
723 ;;; vc-git.el ends here |