Mercurial > emacs
annotate lisp/vc-git.el @ 102118:bfad00b8a4f5
Add entry for maven.
author | Nick Roberts <nickrob@snap.net.nz> |
---|---|
date | Thu, 19 Feb 2009 06:50:39 +0000 |
parents | dea4466580a6 |
children | 97eebd9d88a8 |
rev | line source |
---|---|
78355 | 1 ;;; vc-git.el --- VC backend for the git version control system |
2 | |
100908 | 3 ;; Copyright (C) 2006, 2007, 2008, 2009 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 ;; | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
46 ;; FUNCTION NAME STATUS |
78355 | 47 ;; BACKEND PROPERTIES |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
48 ;; * revision-granularity OK |
78355 | 49 ;; STATE-QUERYING FUNCTIONS |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
50 ;; * registered (file) OK |
78355 | 51 ;; * state (file) OK |
52 ;; - state-heuristic (file) NOT NEEDED | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
53 ;; * working-revision (file) OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
54 ;; - latest-on-branch-p (file) NOT NEEDED |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
55 ;; * checkout-model (files) OK |
78355 | 56 ;; - 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
|
57 ;; - mode-line-string (file) OK |
78355 | 58 ;; STATE-CHANGING FUNCTIONS |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
59 ;; * create-repo () OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
60 ;; * register (files &optional rev comment) OK |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
61 ;; - init-revision (file) NOT NEEDED |
78355 | 62 ;; - responsible-p (file) OK |
63 ;; - could-register (file) NOT NEEDED, DEFAULT IS GOOD | |
64 ;; - receive-file (file rev) NOT NEEDED | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
65 ;; - unregister (file) OK |
78355 | 66 ;; * checkin (files rev comment) OK |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
67 ;; * find-revision (file rev buffer) OK |
78355 | 68 ;; * checkout (file &optional editable rev) OK |
69 ;; * revert (file &optional contents-done) OK | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
70 ;; - rollback (files) COULD BE SUPPORTED |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
71 ;; - merge (file rev1 rev2) It would be possible to merge |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
72 ;; changes into a single file, but when |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
73 ;; committing they wouldn't |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
74 ;; be identified as a merge |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
75 ;; by git, so it's probably |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
76 ;; not a good idea. |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
77 ;; - merge-news (file) see `merge' |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
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 ;; - comment-history (file) ?? |
84 ;; - update-changelog (files) COULD BE SUPPORTED | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
85 ;; * 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
|
86 ;; - revision-completion-table (files) OK |
78355 | 87 ;; - annotate-command (file buf &optional rev) OK |
88 ;; - annotate-time () OK | |
89 ;; - annotate-current-time () NOT NEEDED | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
90 ;; - annotate-extract-revision-at-line () OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
91 ;; TAG SYSTEM |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
92 ;; - create-tag (dir name branchp) OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
93 ;; - retrieve-tag (dir name update) OK, needs to update buffers |
78355 | 94 ;; MISCELLANEOUS |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
95 ;; - make-version-backups-p (file) NOT NEEDED |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
96 ;; - repository-hostname (dirname) NOT NEEDED |
85141
b16f7408cd3f
Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
97 ;; - previous-revision (file rev) OK |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
98 ;; - next-revision (file rev) OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
99 ;; - check-headers () COULD BE SUPPORTED |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
100 ;; - clear-headers () NOT NEEDED |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
101 ;; - delete-file (file) OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
102 ;; - rename-file (old new) OK |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
103 ;; - find-file-hook () NOT NEEDED |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
104 ;; - find-file-not-found-hook () NOT NEEDED |
78355 | 105 |
94290
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
106 (eval-when-compile |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
107 (require 'cl) |
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
108 (require 'vc) |
96260 | 109 (require 'vc-dir) |
94290
55b13d307a7a
(vc-git-status-printer): Deal with directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94107
diff
changeset
|
110 (require 'grep)) |
78355 | 111 |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
112 (defcustom vc-git-diff-switches t |
100179
7dffc98adf8f
(vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100056
diff
changeset
|
113 "String or list of strings specifying switches for Git diff under VC. |
7dffc98adf8f
(vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100056
diff
changeset
|
114 If nil, use the value of `vc-diff-switches'. If t, use no switches." |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
115 :type '(choice (const :tag "Unspecified" nil) |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
116 (const :tag "None" t) |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
117 (string :tag "Argument String") |
100179
7dffc98adf8f
(vc-git-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100056
diff
changeset
|
118 (repeat :tag "Argument List" :value ("") string)) |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
119 :version "23.1" |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
120 :group 'vc) |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
121 |
78355 | 122 (defvar git-commits-coding-system 'utf-8 |
123 "Default coding system for git commits.") | |
124 | |
125 ;;; BACKEND PROPERTIES | |
126 | |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94539
diff
changeset
|
127 (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
|
128 (defun vc-git-checkout-model (files) 'implicit) |
78355 | 129 |
130 ;;; STATE-QUERYING FUNCTIONS | |
131 | |
132 ;;;###autoload (defun vc-git-registered (file) | |
133 ;;;###autoload "Return non-nil if FILE is registered with git." | |
134 ;;;###autoload (if (vc-find-root file ".git") ; short cut | |
135 ;;;###autoload (progn | |
136 ;;;###autoload (load "vc-git") | |
137 ;;;###autoload (vc-git-registered file)))) | |
138 | |
139 (defun vc-git-registered (file) | |
140 "Check whether FILE is registered with git." | |
141 (when (vc-git-root file) | |
142 (with-temp-buffer | |
143 (let* ((dir (file-name-directory file)) | |
96524
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
144 (name (file-relative-name file dir)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
145 (str (ignore-errors |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
146 (when dir (cd dir)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
147 (vc-git--out-ok "ls-files" "-c" "-z" "--" name) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
148 ;; if result is empty, use ls-tree to check for deleted file |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
149 (when (eq (point-min) (point-max)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
150 (vc-git--out-ok "ls-tree" "--name-only" "-z" "HEAD" "--" name)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
151 (buffer-string)))) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
152 (and str |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
153 (> (length str) (length name)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
154 (string= (substring str 0 (1+ (length name))) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
155 (concat name "\0"))))))) |
78355 | 156 |
93173
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
157 (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
|
158 "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
|
159 (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
|
160 (?M 'edited) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
161 (?A 'added) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
162 (?D 'removed) |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
163 (?U 'edited) ;; FIXME |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
164 (?T 'edited))) ;; FIXME |
019e6794fecf
(vc-git-after-dir-status-stage1): Move state matching
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93146
diff
changeset
|
165 |
78355 | 166 (defun vc-git-state (file) |
167 "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
|
168 ;; 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
|
169 (if (not (vc-git-registered file)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
170 'unregistered |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
171 (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
|
172 (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
|
173 (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
|
174 diff)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
175 (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
|
176 (if (vc-git--empty-db-p) 'added 'up-to-date))))) |
78355 | 177 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
178 (defun vc-git-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
179 "Git-specific version of `vc-working-revision'." |
78355 | 180 (let ((str (with-output-to-string |
181 (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
|
182 (vc-git--out-ok "symbolic-ref" "HEAD"))))) |
78355 | 183 (if (string-match "^\\(refs/heads/\\)?\\(.+\\)$" str) |
184 (match-string 2 str) | |
185 str))) | |
186 | |
187 (defun vc-git-workfile-unchanged-p (file) | |
78687
429a17d4958d
* vc-git.el (vc-git-state): Call git-add --refresh to update the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
188 (eq 'up-to-date (vc-git-state file))) |
78355 | 189 |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
190 (defun vc-git-mode-line-string (file) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
191 "Return string for placement into the modeline for FILE." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
192 (let* ((branch (vc-git-working-revision file)) |
82843
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
193 (def-ml (vc-default-mode-line-string 'Git file)) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
194 (help-echo (get-text-property 0 'help-echo def-ml))) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
195 (if (zerop (length branch)) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
196 (propertize |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
197 (concat def-ml "!") |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
198 'help-echo (concat help-echo "\nNo current branch (detached HEAD)")) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
199 (propertize def-ml |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
200 'help-echo (concat help-echo "\nCurrent branch: " branch))))) |
768766d373a7
* vc-git.el (vc-git-mode-line-string): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
201 |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
202 (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
|
203 (:copier nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
204 (: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
|
205 (: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
|
206 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
|
207 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
|
208 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
|
209 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
210 (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
|
211 "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
|
212 (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
|
213 (concat "\"" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
214 (mapconcat (lambda (c) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
215 (case c |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
216 (?\n "\\n") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
217 (?\t "\\t") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
218 (?\\ "\\\\") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
219 (?\" "\\\"") |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
220 (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
|
221 name "") |
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 name)) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
224 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
225 (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
|
226 "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
|
227 (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
|
228 (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
|
229 (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
|
230 (?\100 ;; file |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
231 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
232 (?\100 nil) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
233 (?\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
|
234 (?\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
|
235 (?\120 ;; symlink |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
236 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
237 (?\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
|
238 (?\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
|
239 (t " (symlink)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
240 (?\160 ;; subproject |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
241 (case old-type |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
242 (?\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
|
243 (?\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
|
244 (t " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
245 (?\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
|
246 (?\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
|
247 (case old-type |
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 (?\160 " (subproject)"))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
250 (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
|
251 (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
|
252 ((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
|
253 (t "")))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
254 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
255 (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
|
256 "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
|
257 (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
|
258 (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
|
259 (if rename-state |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
260 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
261 (concat " (" |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
262 (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
|
263 (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
|
264 "renamed to ")) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
265 (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
|
266 ")") '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
|
267 ""))) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
268 |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
269 (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
|
270 "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
|
271 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
272 (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
|
273 (not new-perm) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
274 (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
|
275 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
276 (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
|
277 '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
|
278 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98701
diff
changeset
|
279 (defun vc-git-dir-printer (info) |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
280 "Pretty-printer for the vc-dir-fileinfo structure." |
96881
44c60e2cb9ef
(vc-git-status-printer): Update the directory display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96540
diff
changeset
|
281 (let* ((isdir (vc-dir-fileinfo->directory info)) |
44c60e2cb9ef
(vc-git-status-printer): Update the directory display
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96540
diff
changeset
|
282 (state (if isdir "" (vc-dir-fileinfo->state info))) |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
283 (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
|
284 (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
|
285 (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
|
286 (insert |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
287 " " |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
288 (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
|
289 '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
|
290 " " |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
291 (propertize |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
292 (format "%-12s" state) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
293 '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
|
294 ((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
|
295 (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
|
296 'mouse-face 'highlight) |
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
297 " " (vc-git-permissions-as-string old-perm new-perm) |
100723
bca91c325d5c
(vc-git-dir-printer): Fix filename column.
Andreas Schwab <schwab@suse.de>
parents:
100179
diff
changeset
|
298 " " |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
299 (propertize (vc-git-escape-file-name (vc-dir-fileinfo->name info)) |
97108
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
300 'face (if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face) |
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
301 'help-echo |
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
302 (if isdir |
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
303 "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" |
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
304 "File\nmouse-3: Pop-up menu") |
101940
dea4466580a6
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
305 'keymap vc-dir-filename-mouse-map |
97108
086f5c9fa0be
(vc-git-status-printer): Synchronize with the default.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96881
diff
changeset
|
306 'mouse-face 'highlight) |
93426
912e50ecb992
* vc-git.el: Make vc-status display information about copies,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
307 (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
|
308 (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
|
309 |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
310 (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
|
311 "Process sentinel for the various dir-status stages." |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
312 (let (remaining next-stage result) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
313 (goto-char (point-min)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
314 (case stage |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
315 ('update-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
316 (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
|
317 (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
|
318 ('ls-files-added |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
319 (setq next-stage 'ls-files-unknown) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
320 (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
|
321 (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
|
322 (name (match-string 2))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
323 (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
|
324 ('ls-files-up-to-date |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
325 (setq next-stage 'diff-index) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
326 (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
|
327 (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
|
328 (name (match-string 2))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
329 (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
|
330 ('ls-files-unknown |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
331 (when files (setq next-stage 'ls-files-ignored)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
332 (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
|
333 (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
|
334 ('ls-files-ignored |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
335 (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
|
336 (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
|
337 ('diff-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
338 (setq next-stage 'ls-files-unknown) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
339 (while (re-search-forward |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
340 ":\\([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
|
341 nil t 1) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
342 (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
|
343 (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
|
344 (state (or (match-string 4) (match-string 6))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
345 (name (or (match-string 5) (match-string 7))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
346 (new-name (match-string 8))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
347 (if new-name ; copy or rename |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
348 (if (eq ?C (string-to-char state)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
349 (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
|
350 (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
|
351 (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
|
352 (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
|
353 (when result |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
354 (setq result (nreverse result)) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
355 (when files |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
356 (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
|
357 (unless files (setq next-stage nil)))) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
358 (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
|
359 (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
|
360 |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
361 (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
|
362 (erase-buffer) |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
363 (case stage |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
364 ('update-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
365 (if files |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
366 (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
|
367 (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
|
368 ('ls-files-added |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
369 (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
|
370 ('ls-files-up-to-date |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
371 (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
|
372 ('ls-files-unknown |
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" "-o" |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
374 "--directory" "--no-empty-directory" "--exclude-standard" "--")) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
375 ('ls-files-ignored |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
376 (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
|
377 "--directory" "--no-empty-directory" "--exclude-standard" "--")) |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
378 ('diff-index |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
379 (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
|
380 (vc-exec-after |
94060
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
381 `(vc-git-after-dir-status-stage (quote ,stage) (quote ,files) (quote ,update-function)))) |
93146 | 382 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93426
diff
changeset
|
383 (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
|
384 "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
|
385 ;; 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
|
386 ;; - how to handle unregistered directories |
94107
5d2bbe3fd618
Rename vc-status to vc-dir.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94060
diff
changeset
|
387 ;; - 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
|
388 (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
|
389 |
6c138603231c
(vc-git-after-dir-status-stage)
Alexandre Julliard <julliard@winehq.org>
parents:
94003
diff
changeset
|
390 (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
|
391 "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
|
392 (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
|
393 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98701
diff
changeset
|
394 (defun vc-git-dir-extra-headers (dir) |
93333
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
395 (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
|
396 (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
|
397 (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
|
398 (concat |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
399 (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
|
400 (propertize |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
401 (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
|
402 (match-string 2 str) |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
403 "not (detached HEAD)") |
53eee5c271f4
* vc.el: Add new backend function 'status-extra-headers.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93240
diff
changeset
|
404 '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
|
405 |
78355 | 406 ;;; STATE-CHANGING FUNCTIONS |
407 | |
408 (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
|
409 "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
|
410 (vc-git-command nil 0 nil "init")) |
78355 | 411 |
412 (defun vc-git-register (files &optional rev comment) | |
413 "Register FILE into the git version-control system." | |
414 (vc-git-command nil 0 files "update-index" "--add" "--")) | |
415 | |
416 (defalias 'vc-git-responsible-p 'vc-git-root) | |
417 | |
418 (defun vc-git-unregister (file) | |
419 (vc-git-command nil 0 file "rm" "-f" "--cached" "--")) | |
420 | |
421 | |
422 (defun vc-git-checkin (files rev comment) | |
423 (let ((coding-system-for-write git-commits-coding-system)) | |
424 (vc-git-command nil 0 files "commit" "-m" comment "--only" "--"))) | |
425 | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
426 (defun vc-git-find-revision (file rev buffer) |
78355 | 427 (let ((coding-system-for-read 'binary) |
428 (coding-system-for-write 'binary) | |
429 (fullname (substring | |
430 (vc-git--run-command-string | |
431 file "ls-files" "-z" "--full-name" "--") | |
432 0 -1))) | |
433 (vc-git-command | |
434 buffer 0 | |
435 (concat (if rev rev "HEAD") ":" fullname) "cat-file" "blob"))) | |
436 | |
437 (defun vc-git-checkout (file &optional editable rev) | |
438 (vc-git-command nil 0 file "checkout" (or rev "HEAD"))) | |
439 | |
440 (defun vc-git-revert (file &optional contents-done) | |
441 "Revert FILE to the version stored in the git repository." | |
442 (if contents-done | |
443 (vc-git-command nil 0 file "update-index" "--") | |
444 (vc-git-command nil 0 file "checkout" "HEAD"))) | |
445 | |
446 ;;; HISTORY FUNCTIONS | |
447 | |
448 (defun vc-git-print-log (files &optional buffer) | |
449 "Get change log associated with FILES." | |
450 (let ((coding-system-for-read git-commits-coding-system) | |
451 ;; Support both the old print-log interface that passes a | |
452 ;; single file, and the new one that passes a file list. | |
453 (flist (if (listp files) files (list files)))) | |
454 ;; `vc-do-command' creates the buffer, but we need it before running | |
455 ;; the command. | |
456 (vc-setup-buffer buffer) | |
457 ;; If the buffer exists from a previous invocation it might be | |
458 ;; read-only. | |
459 (let ((inhibit-read-only t)) | |
96524
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
460 (with-current-buffer |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
461 buffer |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
462 (vc-git-command buffer 'async files |
78355 | 463 "rev-list" "--pretty" "HEAD" "--"))))) |
464 | |
465 (defvar log-view-message-re) | |
466 (defvar log-view-file-re) | |
467 (defvar log-view-font-lock-keywords) | |
96524
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
468 (defvar log-view-per-file-logs) |
78355 | 469 |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78359
diff
changeset
|
470 (define-derived-mode vc-git-log-view-mode log-view-mode "Git-Log-View" |
78355 | 471 (require 'add-log) ;; we need the faces add-log |
472 ;; Don't have file markers, so use impossible regexp. | |
96524
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
473 (set (make-local-variable 'log-view-file-re) "\\`a\\`") |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
474 (set (make-local-variable 'log-view-per-file-logs) nil) |
78355 | 475 (set (make-local-variable 'log-view-message-re) |
476 "^commit *\\([0-9a-z]+\\)") | |
477 (set (make-local-variable 'log-view-font-lock-keywords) | |
478 (append | |
96524
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
479 `((,log-view-message-re (1 'change-log-acknowledgement))) |
86400 | 480 ;; Handle the case: |
481 ;; user: foo@bar | |
482 '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
483 (1 'change-log-email)) | |
484 ;; Handle the case: | |
485 ;; user: FirstName LastName <foo@bar> | |
486 ("^Author:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
487 (1 'change-log-name) | |
488 (2 'change-log-email)) | |
489 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | |
490 (1 'change-log-name)) | |
491 ("^ +\\(?:\\(?:[Aa]cked\\|[Ss]igned-[Oo]ff\\)-[Bb]y:\\)[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
492 (1 'change-log-name) | |
493 (2 'change-log-email)) | |
494 ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" | |
495 (1 'change-log-acknowledgement) | |
496 (2 'change-log-acknowledgement)) | |
497 ("^Date: \\(.+\\)" (1 'change-log-date)) | |
498 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
78355 | 499 |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
500 (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
|
501 "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
|
502 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
|
503 or BRANCH^ (where \"^\" can be repeated)." |
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
504 (goto-char (point-min)) |
98220
962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97108
diff
changeset
|
505 (when revision |
98701
5970e7c70c96
* vc-git.el (vc-git-show-log-entry): Include the revision in the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98220
diff
changeset
|
506 (search-forward (format "\ncommit %s" revision) nil t |
98220
962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97108
diff
changeset
|
507 (cond ((string-match "~\\([0-9]\\)$" revision) |
962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97108
diff
changeset
|
508 (1+ (string-to-number (match-string 1 revision)))) |
962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97108
diff
changeset
|
509 ((string-match "\\^+$" revision) |
962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97108
diff
changeset
|
510 (1+ (length (match-string 0 revision)))) |
962e4709829b
* vc-bzr.el (vc-bzr-show-log-entry):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97108
diff
changeset
|
511 (t nil)))) |
86397
38193bd1ab69
(vc-git-show-log-entry): New func.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
85462
diff
changeset
|
512 (beginning-of-line)) |
78355 | 513 |
514 (defun vc-git-diff (files &optional rev1 rev2 buffer) | |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
515 "Get a difference report using Git between two revisions of FILES." |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
516 (apply #'vc-git-command (or buffer "*vc-diff*") 1 files |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
517 (if (and rev1 rev2) "diff-tree" "diff-index") |
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
518 "--exit-code" |
100056
961732603114
(vc-git-diff): No need to duplicate vc-switches logic.
Glenn Morris <rgm@gnu.org>
parents:
99932
diff
changeset
|
519 (append (vc-switches 'git 'diff) |
99932
36e205658d72
(vc-git-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
520 (list "-p" (or rev1 "HEAD") rev2 "--")))) |
78355 | 521 |
85459
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
522 (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
|
523 ;; What about `files'?!? --Stef |
78355 | 524 (let ((table (list "HEAD"))) |
525 (with-temp-buffer | |
526 (vc-git-command t nil nil "for-each-ref" "--format=%(refname)") | |
527 (goto-char (point-min)) | |
528 (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t) | |
529 (push (match-string 2) table))) | |
530 table)) | |
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-completion-table (files) |
dec6fdd5ddf4
(vc-git-revision-completion-table, vc-git-revision-table):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
533 (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
|
534 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78356
diff
changeset
|
535 (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
|
536 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
|
537 table)) |
78355 | 538 |
539 (defun vc-git-annotate-command (file buf &optional rev) | |
540 (let ((name (file-relative-name file))) | |
96487
5b7442d7d9ce
2008-07-02 Magnus Henoch <mange@freemail.hu>
Magnus Henoch <mange@freemail.hu>
parents:
96260
diff
changeset
|
541 (vc-git-command buf 0 name "blame" rev))) |
78355 | 542 |
96213
09da7727f35f
* vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95020
diff
changeset
|
543 (declare-function vc-annotate-convert-time "vc-annotate" (time)) |
09da7727f35f
* vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95020
diff
changeset
|
544 |
78355 | 545 (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
|
546 (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 | 547 (vc-annotate-convert-time |
86400 | 548 (apply #'encode-time (mapcar (lambda (match) |
549 (string-to-number (match-string match))) | |
550 '(6 5 4 3 2 1 7)))))) | |
78355 | 551 |
552 (defun vc-git-annotate-extract-revision-at-line () | |
86400 | 553 (save-excursion |
554 (move-beginning-of-line 1) | |
93145
9a34bf3a4363
(vc-git-annotate-extract-revision-at-line):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93124
diff
changeset
|
555 (and (looking-at "[0-9a-f^][0-9a-f]+") |
86400 | 556 (buffer-substring-no-properties (match-beginning 0) (match-end 0))))) |
78355 | 557 |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
558 ;;; TAG SYSTEM |
78355 | 559 |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
560 (defun vc-git-create-tag (dir name branchp) |
78355 | 561 (let ((default-directory dir)) |
562 (and (vc-git-command nil 0 nil "update-index" "--refresh") | |
563 (if branchp | |
564 (vc-git-command nil 0 nil "checkout" "-b" name) | |
565 (vc-git-command nil 0 nil "tag" name))))) | |
566 | |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
567 (defun vc-git-retrieve-tag (dir name update) |
78355 | 568 (let ((default-directory dir)) |
569 (vc-git-command nil 0 nil "checkout" name) | |
570 ;; FIXME: update buffers if `update' is true | |
571 )) | |
572 | |
573 | |
574 ;;; MISCELLANEOUS | |
575 | |
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
|
576 (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
|
577 "Git-specific version of `vc-previous-revision'." |
96524
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
578 (if file |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
579 (let ((default-directory (file-name-directory (expand-file-name file))) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
580 (file (file-name-nondirectory file))) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
581 (vc-git-symbolic-commit |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
582 (with-temp-buffer |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
583 (and |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
584 (vc-git--out-ok "rev-list" "-2" rev "--" file) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
585 (goto-char (point-max)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
586 (bolp) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
587 (zerop (forward-line -1)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
588 (not (bobp)) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
589 (buffer-substring-no-properties |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
590 (point) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
591 (1- (point-max))))))) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
592 (with-temp-buffer |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
593 (and |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
594 (vc-git--out-ok "rev-parse" (concat rev "^")) |
d620ef3acfdc
* vc-git.el (vc-git-registered): Return true for removed files.
Alexandre Julliard <julliard@winehq.org>
parents:
96487
diff
changeset
|
595 (buffer-substring-no-properties (point-min) (+ (point-min) 40)))))) |
78355 | 596 |
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
|
597 (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
|
598 "Git-specific version of `vc-next-revision'." |
78355 | 599 (let* ((default-directory (file-name-directory |
600 (expand-file-name file))) | |
86400 | 601 (file (file-name-nondirectory file)) |
602 (current-rev | |
603 (with-temp-buffer | |
604 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
605 (vc-git--out-ok "rev-list" "-1" rev "--" file) |
86400 | 606 (goto-char (point-max)) |
607 (bolp) | |
608 (zerop (forward-line -1)) | |
609 (bobp) | |
610 (buffer-substring-no-properties | |
611 (point) | |
612 (1- (point-max))))))) | |
78355 | 613 (and current-rev |
614 (vc-git-symbolic-commit | |
615 (with-temp-buffer | |
616 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
617 (vc-git--out-ok "rev-list" "HEAD" "--" file) |
78355 | 618 (goto-char (point-min)) |
619 (search-forward current-rev nil t) | |
620 (zerop (forward-line -1)) | |
621 (buffer-substring-no-properties | |
622 (point) | |
623 (progn (forward-line 1) (1- (point)))))))))) | |
624 | |
625 (defun vc-git-delete-file (file) | |
626 (vc-git-command nil 0 file "rm" "-f" "--")) | |
627 | |
628 (defun vc-git-rename-file (old new) | |
629 (vc-git-command nil 0 (list old new) "mv" "-f" "--")) | |
630 | |
93240
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
631 (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
|
632 (let ((map (make-sparse-keymap))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
633 (define-key map [git-grep] |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
634 '(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
|
635 :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
|
636 map)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
637 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
638 (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
|
639 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
640 (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
|
641 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
642 ;; Derived from `lgrep'. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
643 (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
|
644 "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
|
645 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
|
646 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
|
647 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
|
648 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
649 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
|
650 before it is executed. |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
651 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
|
652 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
653 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
|
654 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
|
655 in the grep output buffer, |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
656 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
|
657 |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
658 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
|
659 (interactive |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
660 (progn |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
661 (grep-compute-defaults) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
662 (cond |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
663 ((equal current-prefix-arg '(16)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
664 (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
|
665 nil nil 'grep-history) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
666 nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
667 (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
|
668 (files (grep-read-files regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
669 (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
|
670 nil default-directory t))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
671 (list regexp files dir)))))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
672 (require 'grep) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
673 (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
|
674 (let ((command regexp)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
675 (if (null files) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
676 (if (string= command "git grep") |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
677 (setq command nil)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
678 (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
|
679 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
680 (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
|
681 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
682 (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
|
683 (setq command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
684 (read-from-minibuffer "Confirm: " |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
685 command nil nil 'grep-history)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
686 (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
|
687 (when command |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
688 (let ((default-directory dir) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
689 (compilation-environment '("PAGER="))) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
690 ;; 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
|
691 ;; 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
|
692 (compilation-start command 'grep-mode)) |
231f72336aed
(vc-git-extra-menu-map): New key map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93173
diff
changeset
|
693 (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
|
694 (setq default-directory dir)))))) |
78355 | 695 |
696 ;;; Internal commands | |
697 | |
698 (defun vc-git-root (file) | |
699 (vc-find-root file ".git")) | |
700 | |
701 (defun vc-git-command (buffer okstatus file-or-list &rest flags) | |
702 "A wrapper around `vc-do-command' for use in vc-git.el. | |
703 The difference to vc-do-command is that this function always invokes `git'." | |
94847
5e64dca662f0
Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94806
diff
changeset
|
704 (apply 'vc-do-command (or buffer "*vc*") okstatus "git" file-or-list flags)) |
78355 | 705 |
93146 | 706 (defun vc-git--empty-db-p () |
707 "Check if the git db is empty (no commit done yet)." | |
708 (not (eq 0 (vc-git--call nil "rev-parse" "--verify" "HEAD")))) | |
709 | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
710 (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
|
711 ;; 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
|
712 ;; 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
|
713 ;; directories. |
7ae99e295dfd
* vc-git.el (vc-git--call): Apply `process-file' instead of
Michael Albinus <michael.albinus@gmx.de>
parents:
87525
diff
changeset
|
714 (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
|
715 |
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
716 (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
|
717 (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
|
718 |
78355 | 719 (defun vc-git--run-command-string (file &rest args) |
720 "Run a git command on FILE and return its output as string." | |
721 (let* ((ok t) | |
722 (str (with-output-to-string | |
723 (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
|
724 (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
|
725 (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
|
726 file)))) |
78355 | 727 (setq ok nil)))))) |
728 (and ok str))) | |
729 | |
730 (defun vc-git-symbolic-commit (commit) | |
731 "Translate COMMIT string into symbolic form. | |
732 Returns nil if not possible." | |
733 (and commit | |
734 (with-temp-buffer | |
735 (and | |
86403
d2c8f5a27761
(vc-git--call, vc-git--out-ok): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
86400
diff
changeset
|
736 (vc-git--out-ok "name-rev" "--name-only" "--tags" commit) |
78355 | 737 (goto-char (point-min)) |
738 (= (forward-line 2) 1) | |
739 (bolp) | |
740 (buffer-substring-no-properties (point-min) (1- (point-max))))))) | |
741 | |
742 (provide 'vc-git) | |
743 | |
744 ;; arch-tag: bd10664a-0e5b-48f5-a877-6c17b135be12 | |
745 ;;; vc-git.el ends here |