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