Mercurial > emacs
annotate lisp/vc-git.el @ 94698:8983ac9b89b4
Back out menu move, it broke something obscure.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Tue, 06 May 2008 23:44:50 +0000 |
parents | ee5932bf781d |
children | bf91c987049c |
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 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
78355 | 11 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
13 ;; (at your option) any later version. |
78355 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
78355 | 22 |
23 ;;; Commentary: | |
24 | |
25 ;; This file contains a VC backend for the git version control | |
26 ;; system. | |
27 ;; | |
28 | |
29 ;;; Installation: | |
30 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
31 ;; To install: put this file on the load-path and add Git to the list |
78355 | 32 ;; of supported backends in `vc-handled-backends'; the following line, |
33 ;; placed in your ~/.emacs, will accomplish this: | |
34 ;; | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
35 ;; (add-to-list 'vc-handled-backends 'Git) |
78355 | 36 |
37 ;;; Todo: | |
38 ;; - check if more functions could use vc-git-command instead | |
39 ;; of start-process. | |
40 ;; - changelog generation | |
41 | |
42 ;; Implement the rest of the vc interface. See the comment at the | |
43 ;; beginning of vc.el. The current status is: | |
44 ;; ("??" means: "figure out what to do about it") | |
45 ;; | |
46 ;; FUNCTION NAME STATUS | |
47 ;; BACKEND PROPERTIES | |
48 ;; * revision-granularity OK | |
49 ;; STATE-QUERYING FUNCTIONS | |
50 ;; * registered (file) OK | |
51 ;; * state (file) OK | |
52 ;; - state-heuristic (file) NOT NEEDED | |
53 ;; - dir-state (dir) OK | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
54 ;; * working-revision (file) OK |
78355 | 55 ;; - latest-on-branch-p (file) NOT NEEDED |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94539
diff
changeset
|
56 ;; * checkout-model (files) OK |
78355 | 57 ;; - 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
|
58 ;; - mode-line-string (file) OK |
94539
fee32a11924d
Name change in preparation for ripping out vc-dired.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
59 ;; - prettify-state-info (file) OK |
78355 | 60 ;; STATE-CHANGING FUNCTIONS |
61 ;; * create-repo () OK | |
62 ;; * register (files &optional rev comment) OK | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
63 ;; - init-revision (file) NOT NEEDED |
78355 | 64 ;; - responsible-p (file) OK |
65 ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD | |
66 ;; - receive-file (file rev) NOT NEEDED | |
67 ;; - unregister (file) OK | |
68 ;; * checkin (files rev comment) OK | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
69 ;; * find-revision (file rev buffer) OK |
78355 | 70 ;; * checkout (file &optional editable rev) OK |
71 ;; * revert (file &optional contents-done) OK | |
72 ;; - rollback (files) COULD BE SUPPORTED | |
73 ;; - merge (file rev1 rev2) It would be possible to merge changes into | |
74 ;; a single file, but when committing they | |
75 ;; wouldn't be identified as a merge by git, | |
76 ;; so it's probably not a good idea. | |
77 ;; - merge-news (file) see `merge' | |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
78 ;; - steal-lock (file &optional revision) NOT NEEDED |
78355 | 79 ;; HISTORY FUNCTIONS |
80 ;; * print-log (files &optional buffer) OK | |
81 ;; - log-view-mode () OK | |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
82 ;; - show-log-entry (revision) OK |
78355 | 83 ;; - wash-log (file) COULD BE SUPPORTED |
84 ;; - comment-history (file) ?? | |
85 ;; - update-changelog (files) COULD BE SUPPORTED | |
86 ;; * 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
|
87 ;; - revision-completion-table (files) OK |
78355 | 88 ;; - annotate-command (file buf &optional rev) OK |
89 ;; - annotate-time () OK | |
90 ;; - annotate-current-time () NOT NEEDED | |
91 ;; - annotate-extract-revision-at-line () OK | |
92 ;; SNAPSHOT SYSTEM | |
93 ;; - create-snapshot (dir name branchp) OK | |
94 ;; - assign-name (file name) NOT NEEDED | |
95 ;; - retrieve-snapshot (dir name update) OK, needs to update buffers | |
96 ;; MISCELLANEOUS | |
97 ;; - make-version-backups-p (file) NOT NEEDED | |
98 ;; - 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
|
99 ;; - 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
|
100 ;; - next-revision (file rev) OK |
78355 | 101 ;; - check-headers () COULD BE SUPPORTED |
102 ;; - clear-headers () NOT NEEDED | |
103 ;; - delete-file (file) OK | |
104 ;; - rename-file (old new) OK | |
105 ;; - find-file-hook () NOT NEEDED | |
106 ;; - find-file-not-found-hook () NOT NEEDED | |
107 | |
94290
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
108 (eval-when-compile |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
109 (require 'cl) |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
110 (require 'vc) |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
111 (require 'grep)) |
78355 | 112 |
113 (defvar git-commits-coding-system 'utf-8 | |
114 "Default coding system for git commits.") | |
115 | |
116 ;;; BACKEND PROPERTIES | |
117 | |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94539
diff
changeset
|
118 (defun vc-git-revision-granularity () 'repository) |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94539
diff
changeset
|
119 (defun vc-git-checkout-model (files) 'implicit) |
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 |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
156 (if (not (vc-git-registered file)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
157 'unregistered |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
158 (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
|
159 (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
|
160 (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
|
161 diff)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
162 (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
|
163 (if (vc-git--empty-db-p) 'added 'up-to-date))))) |
78355 | 164 |
87525
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
165 (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
|
166 "Set state to STATE on all files found with git-ls-files ARGS." |
78355 | 167 (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
|
168 (apply 'vc-git-command (current-buffer) nil nil "ls-files" "-z" args) |
78355 | 169 (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
|
170 (let ((start (point))) |
77d4b0e5e5d2
* vc-git.el (vc-git--ls-files-state): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87516
diff
changeset
|
171 (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
|
172 (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
|
173 (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
|
174 (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
|
175 (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
|
176 (setq start (point)))))) |
78355 | 177 |
178 (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
|
179 "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
|
180 (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
|
181 (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
|
182 (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
|
183 (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
|
184 (vc-git--ls-files-state nil "-o" "--exclude-standard")) |
78355 | 185 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
186 (defun vc-git-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
187 "Git-specific version of `vc-working-revision'." |
78355 | 188 (let ((str (with-output-to-string |
189 (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
|
190 (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
78355 | 191 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
192 (match-string 2 str) | |
193 str))) | |
194 | |
195 (defun vc-git-workfile-unchanged-p (file) | |
78687
429a17d4958d
* vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
196 (eq 'up-to-date (vc-git-state file))) |
78355 | 197 |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
198 (defun vc-git-mode-line-string (file) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
199 "Return string for placement into the modeline for FILE." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
200 (let* ((branch (vc-git-working-revision file)) |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
201 (def-ml (vc-default-mode-line-string 'Git file)) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
202 (help-echo (get-text-property 0 'help-echo def-ml))) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
203 (if (zerop (length branch)) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
204 (propertize |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
205 (concat def-ml "!") |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
206 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
207 (propertize def-ml |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
208 'help-echo (concat help-echo "\nCurrent branch: " branch))))) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
209 |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
210 (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
|
211 (:copier nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
212 (: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
|
213 (: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
|
214 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
|
215 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
|
216 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
|
217 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
218 (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
|
219 "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
|
220 (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
|
221 (concat "\"" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
222 (mapconcat (lambda (c) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
223 (case c |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
224 (?\n "\\n") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
225 (?\t "\\t") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
226 (?\\ "\\\\") |
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 (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
|
229 name "") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
230 "\"") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
231 name)) |
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 (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
|
234 "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
|
235 (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
|
236 (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
|
237 (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
|
238 (?\100 ;; file |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
239 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
240 (?\100 nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
241 (?\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
|
242 (?\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
|
243 (?\120 ;; symlink |
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 " (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
|
246 (?\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
|
247 (t " (symlink)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
248 (?\160 ;; subproject |
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 -> subproject)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
251 (?\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
|
252 (t " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
253 (?\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
|
254 (?\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
|
255 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
256 (?\120 " (symlink)") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
257 (?\160 " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
258 (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
|
259 (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
|
260 ((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
|
261 (t "")))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
262 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
263 (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
|
264 "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
|
265 (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
|
266 (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
|
267 (if rename-state |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
268 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
269 (concat " (" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
270 (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
|
271 (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
|
272 "renamed to ")) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
273 (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
|
274 ")") '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
|
275 ""))) |
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 (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
|
278 "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
|
279 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
280 (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
|
281 (not new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
282 (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
|
283 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
284 (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
|
285 '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
|
286 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
287 (defun vc-git-status-printer (info) |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
288 "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
|
289 (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
|
290 'DIRECTORY |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
291 (vc-dir-fileinfo->state info))) |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
292 (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
|
293 (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
|
294 (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
|
295 (insert |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
296 " " |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
297 (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
|
298 '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
|
299 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
300 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
301 (format "%-12s" state) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
302 '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
|
303 ((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
|
304 (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
|
305 'mouse-face 'highlight) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
306 " " (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
|
307 " " |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
308 (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
|
309 '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
|
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-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
|
312 (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
|
313 |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
314 (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
|
315 "Process sentinel for the various dir-status stages." |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
316 (let (remaining next-stage result) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
317 (goto-char (point-min)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
318 (case stage |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
319 ('update-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
320 (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
|
321 (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
|
322 ('ls-files-added |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
323 (setq next-stage 'ls-files-unknown) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
324 (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
|
325 (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
|
326 (name (match-string 2))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
327 (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
|
328 ('ls-files-up-to-date |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
329 (setq next-stage 'diff-index) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
330 (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
|
331 (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
|
332 (name (match-string 2))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
333 (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
|
334 ('ls-files-unknown |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
335 (when files (setq next-stage 'ls-files-ignored)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
336 (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
|
337 (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
|
338 ('ls-files-ignored |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
339 (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
|
340 (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
|
341 ('diff-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
342 (setq next-stage 'ls-files-unknown) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
343 (while (re-search-forward |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
344 ":\\([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
|
345 nil t 1) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
346 (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
|
347 (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
|
348 (state (or (match-string 4) (match-string 6))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
349 (name (or (match-string 5) (match-string 7))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
350 (new-name (match-string 8))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
351 (if new-name ; copy or rename |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
352 (if (eq ?C (string-to-char state)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
353 (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
|
354 (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
|
355 (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
|
356 (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
|
357 (when result |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
358 (setq result (nreverse result)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
359 (when files |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
360 (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
|
361 (unless files (setq next-stage nil)))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
362 (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
|
363 (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
|
364 |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
365 (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
|
366 (erase-buffer) |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
367 (case stage |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
368 ('update-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
369 (if files |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
370 (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
|
371 (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
|
372 ('ls-files-added |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
373 (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
|
374 ('ls-files-up-to-date |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
375 (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
|
376 ('ls-files-unknown |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
377 (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
|
378 "--directory" "--no-empty-directory" "--exclude-standard" "--")) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
379 ('ls-files-ignored |
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" "-o" "-i" |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
381 "--directory" "--no-empty-directory" "--exclude-standard" "--")) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
382 ('diff-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
383 (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
|
384 (vc-exec-after |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
385 `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function)))) |
93146 | 386 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93426
diff
changeset
|
387 (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
|
388 "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
|
389 ;; 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
|
390 ;; - how to handle unregistered directories |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
391 ;; - 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
|
392 (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
|
393 |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
394 (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
|
395 "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
|
396 (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
|
397 |
93333
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
398 (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
|
399 (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
|
400 (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
|
401 (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
|
402 (concat |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
403 (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
|
404 (propertize |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
405 (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
|
406 (match-string 2 str) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
407 "not (detached HEAD)") |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
408 '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
|
409 |
78355 | 410 ;;; STATE-CHANGING FUNCTIONS |
411 | |
412 (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
|
413 "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
|
414 (vc-git-command nil 0 nil "init")) |
78355 | 415 |
416 (defun vc-git-register (files &optional rev comment) | |
417 "Register FILE into the git version-control system." | |
418 (vc-git-command nil 0 files "update-index" "--add" "--")) | |
419 | |
420 (defalias 'vc-git-responsible-p 'vc-git-root) | |
421 | |
422 (defun vc-git-unregister (file) | |
423 (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
424 | |
425 | |
426 (defun vc-git-checkin (files rev comment) | |
427 (let ((coding-system-for-write git-commits-coding-system)) | |
428 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) | |
429 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
430 (defun vc-git-find-revision (file rev buffer) |
78355 | 431 (let ((coding-system-for-read 'binary) |
432 (coding-system-for-write 'binary) | |
433 (fullname (substring | |
434 (vc-git--run-command-string | |
435 file "ls-files" "-z" "--full-name" "--") | |
436 0 -1))) | |
437 (vc-git-command | |
438 buffer 0 | |
439 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) | |
440 | |
441 (defun vc-git-checkout (file &optional editable rev) | |
442 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) | |
443 | |
444 (defun vc-git-revert (file &optional contents-done) | |
445 "Revert FILE to the version stored in the git repository." | |
446 (if contents-done | |
447 (vc-git-command nil 0 file "update-index" "--") | |
448 (vc-git-command nil 0 file "checkout" "HEAD"))) | |
449 | |
450 ;;; HISTORY FUNCTIONS | |
451 | |
452 (defun vc-git-print-log (files &optional buffer) | |
453 "Get change log associated with FILES." | |
454 (let ((coding-system-for-read git-commits-coding-system) | |
455 ;; Support both the old print-log interface that passes a | |
456 ;; single file, and the new one that passes a file list. | |
457 (flist (if (listp files) files (list files)))) | |
458 ;; `vc-do-command' creates the buffer, but we need it before running | |
459 ;; the command. | |
460 (vc-setup-buffer buffer) | |
461 ;; If the buffer exists from a previous invocation it might be | |
462 ;; read-only. | |
463 (let ((inhibit-read-only t)) | |
464 ;; XXX `log-view-mode' needs to have something to identify where | |
465 ;; the log for each individual file starts. It seems that by | |
466 ;; default git does not output this info. So loop here and call | |
467 ;; "git rev-list" on each file separately to make sure that each | |
468 ;; file gets a "File:" header before the corresponding | |
469 ;; log. Maybe there is a way to do this with one command... | |
470 (dolist (file flist) | |
471 (with-current-buffer | |
472 buffer | |
473 (insert "File: " (file-name-nondirectory file) "\n")) | |
474 (vc-git-command buffer 'async (file-relative-name file) | |
475 "rev-list" "--pretty" "HEAD" "--"))))) | |
476 | |
477 (defvar log-view-message-re) | |
478 (defvar log-view-file-re) | |
479 (defvar log-view-font-lock-keywords) | |
480 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
481 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
78355 | 482 (require 'add-log) ;; we need the faces add-log |
483 ;; Don't have file markers, so use impossible regexp. | |
484 (set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)") | |
485 (set (make-local-variable 'log-view-message-re) | |
486 "^commit *\\([0-9a-z]+\\)") | |
487 (set (make-local-variable 'log-view-font-lock-keywords) | |
488 (append | |
86400 | 489 `((,log-view-message-re (1 'change-log-acknowledgement)) |
490 (,log-view-file-re (1 'change-log-file-face))) | |
491 ;; Handle the case: | |
492 ;; user: foo@bar | |
493 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
494 (1 'change-log-email)) | |
495 ;; Handle the case: | |
496 ;; user: FirstName LastName <foo@bar> | |
497 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
498 (1 'change-log-name) | |
499 (2 'change-log-email)) | |
500 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
501 (1 'change-log-name)) | |
502 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
503 (1 'change-log-name) | |
504 (2 'change-log-email)) | |
505 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
506 (1 'change-log-acknowledgement) | |
507 (2 'change-log-acknowledgement)) | |
508 ("^Date: \\(.+\\)" (1 'change-log-date)) | |
509 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
78355 | 510 |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
511 (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
|
512 "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
|
513 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
|
514 or BRANCH^ (where \"^\" can be repeated)." |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
515 (goto-char (point-min)) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
516 (search-forward "\ncommit" nil t |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
517 (cond ((string-match "~\\([0-9]\\)$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
518 (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
|
519 ((string-match "\\^+$" revision) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
520 (1+ (length (match-string 0 revision)))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
521 (t nil))) |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
522 (beginning-of-line)) |
78355 | 523 |
524 (defun vc-git-diff (files &optional rev1 rev2 buffer) | |
525 (let ((buf (or buffer "*vc-diff*"))) | |
526 (if (and rev1 rev2) | |
86400 | 527 (vc-git-command buf 1 files "diff-tree" "--exit-code" "-p" |
528 rev1 rev2 "--") | |
529 (vc-git-command buf 1 files "diff-index" "--exit-code" "-p" | |
530 (or rev1 "HEAD") "--")))) | |
78355 | 531 |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
532 (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
|
533 ;; What about `files'?!? --Stef |
78355 | 534 (let ((table (list "HEAD"))) |
535 (with-temp-buffer | |
536 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
537 (goto-char (point-min)) | |
538 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) | |
539 (push (match-string 2) table))) | |
540 table)) | |
541 | |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
542 (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
|
543 (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
|
544 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
545 (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
|
546 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
|
547 table)) |
78355 | 548 |
549 (defun vc-git-annotate-command (file buf &optional rev) | |
550 ;; FIXME: rev is ignored | |
551 (let ((name (file-relative-name file))) | |
552 (vc-git-command buf 0 name "blame" (if rev (concat "-r" rev))))) | |
553 | |
554 (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
|
555 (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 | 556 (vc-annotate-convert-time |
86400 | 557 (apply #'encode-time (mapcar (lambda (match) |
558 (string-to-number (match-string match))) | |
559 '(6 5 4 3 2 1 7)))))) | |
78355 | 560 |
561 (defun vc-git-annotate-extract-revision-at-line () | |
86400 | 562 (save-excursion |
563 (move-beginning-of-line 1) | |
93145
9a34bf3a4363
(vc-git-annotate-extract-revision-at-line):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93124
diff
changeset
|
564 (and (looking-at "[0-9a-f^][0-9a-f]+") |
86400 | 565 (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) |
78355 | 566 |
567 ;;; SNAPSHOT SYSTEM | |
568 | |
569 (defun vc-git-create-snapshot (dir name branchp) | |
570 (let ((default-directory dir)) | |
571 (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
572 (if branchp | |
573 (vc-git-command nil 0 nil "checkout" "-b" name) | |
574 (vc-git-command nil 0 nil "tag" name))))) | |
575 | |
576 (defun vc-git-retrieve-snapshot (dir name update) | |
577 (let ((default-directory dir)) | |
578 (vc-git-command nil 0 nil "checkout" name) | |
579 ;; FIXME: update buffers if `update' is true | |
580 )) | |
581 | |
582 | |
583 ;;; MISCELLANEOUS | |
584 | |
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
|
585 (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
|
586 "Git-specific version of `vc-previous-revision'." |
78355 | 587 (let ((default-directory (file-name-directory (expand-file-name file))) |
588 (file (file-name-nondirectory file))) | |
589 (vc-git-symbolic-commit | |
590 (with-temp-buffer | |
591 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
592 (vc-git--out-ok "rev-list" "-2" rev "--" file) |
78355 | 593 (goto-char (point-max)) |
594 (bolp) | |
595 (zerop (forward-line -1)) | |
596 (not (bobp)) | |
597 (buffer-substring-no-properties | |
86400 | 598 (point) |
599 (1- (point-max)))))))) | |
78355 | 600 |
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
|
601 (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
|
602 "Git-specific version of `vc-next-revision'." |
78355 | 603 (let* ((default-directory (file-name-directory |
604 (expand-file-name file))) | |
86400 | 605 (file (file-name-nondirectory file)) |
606 (current-rev | |
607 (with-temp-buffer | |
608 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
609 (vc-git--out-ok "rev-list" "-1" rev "--" file) |
86400 | 610 (goto-char (point-max)) |
611 (bolp) | |
612 (zerop (forward-line -1)) | |
613 (bobp) | |
614 (buffer-substring-no-properties | |
615 (point) | |
616 (1- (point-max))))))) | |
78355 | 617 (and current-rev |
618 (vc-git-symbolic-commit | |
619 (with-temp-buffer | |
620 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
621 (vc-git--out-ok "rev-list" "HEAD" "--" file) |
78355 | 622 (goto-char (point-min)) |
623 (search-forward current-rev nil t) | |
624 (zerop (forward-line -1)) | |
625 (buffer-substring-no-properties | |
626 (point) | |
627 (progn (forward-line 1) (1- (point)))))))))) | |
628 | |
629 (defun vc-git-delete-file (file) | |
630 (vc-git-command nil 0 file "rm" "-f" "--")) | |
631 | |
632 (defun vc-git-rename-file (old new) | |
633 (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
634 | |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
635 (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
|
636 (let ((map (make-sparse-keymap))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
637 (define-key map [git-grep] |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
638 '(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
|
639 :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
|
640 map)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
641 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
642 (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
|
643 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
644 (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
|
645 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
646 ;; Derived from `lgrep'. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
647 (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
|
648 "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
|
649 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
|
650 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
|
651 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
|
652 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
653 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
|
654 before it is executed. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
655 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
|
656 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
657 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
|
658 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
|
659 in the grep output buffer, |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
660 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
|
661 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
662 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
|
663 (interactive |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
664 (progn |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
665 (grep-compute-defaults) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
666 (cond |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
667 ((equal current-prefix-arg '(16)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
668 (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
|
669 nil nil 'grep-history) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
670 nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
671 (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
|
672 (files (grep-read-files regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
673 (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
|
674 nil default-directory t))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
675 (list regexp files dir)))))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
676 (require 'grep) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
677 (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
|
678 (let ((command regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
679 (if (null files) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
680 (if (string= command "git grep") |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
681 (setq command nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
682 (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
|
683 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
684 (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
|
685 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
686 (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
|
687 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
688 (read-from-minibuffer "Confirm: " |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
689 command nil nil 'grep-history)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
690 (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
|
691 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
692 (let ((default-directory dir) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
693 (compilation-environment '("PAGER="))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
694 ;; 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
|
695 ;; 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
|
696 (compilation-start command 'grep-mode)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
697 (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
|
698 (setq default-directory dir)))))) |
78355 | 699 |
700 ;;; Internal commands | |
701 | |
702 (defun vc-git-root (file) | |
703 (vc-find-root file ".git")) | |
704 | |
705 (defun vc-git-command (buffer okstatus file-or-list &rest flags) | |
706 "A wrapper around `vc-do-command' for use in vc-git.el. | |
707 The difference to vc-do-command is that this function always invokes `git'." | |
708 (apply 'vc-do-command buffer okstatus "git" file-or-list flags)) | |
709 | |
93146 | 710 (defun vc-git--empty-db-p () |
711 "Check if the git db is empty (no commit done yet)." | |
712 (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD")))) | |
713 | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
714 (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
|
715 ;; 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
|
716 ;; 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
|
717 ;; directories. |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
718 (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
|
719 |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
720 (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
|
721 (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
|
722 |
78355 | 723 (defun vc-git--run-command-string (file &rest args) |
724 "Run a git command on FILE and return its output as string." | |
725 (let* ((ok t) | |
726 (str (with-output-to-string | |
727 (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
|
728 (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
|
729 (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
|
730 file)))) |
78355 | 731 (setq ok nil)))))) |
732 (and ok str))) | |
733 | |
734 (defun vc-git-symbolic-commit (commit) | |
735 "Translate COMMIT string into symbolic form. | |
736 Returns nil if not possible." | |
737 (and commit | |
738 (with-temp-buffer | |
739 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
740 (vc-git--out-ok "name-rev" "--name-only" "--tags" commit) |
78355 | 741 (goto-char (point-min)) |
742 (= (forward-line 2) 1) | |
743 (bolp) | |
744 (buffer-substring-no-properties (point-min) (1- (point-max))))))) | |
745 | |
746 (provide 'vc-git) | |
747 | |
748 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 | |
749 ;;; vc-git.el ends here |