Mercurial > emacs
annotate lisp/vc-dir.el @ 106117:0fba14676688
* lread.c (Funintern): Error if symbol is t or nil.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 19 Nov 2009 16:13:22 +0000 |
parents | 098f8a47a308 |
children | 3fea95b17dfa |
rev | line source |
---|---|
96203 | 1 ;;; vc-dir.el --- Directory status display under VC |
2 | |
100908 | 3 ;; Copyright (C) 2007, 2008, 2009 |
96203 | 4 ;; Free Software Foundation, Inc. |
5 | |
6 ;; Author: Dan Nicolaescu <dann@ics.uci.edu> | |
7 ;; Keywords: tools | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software: you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation, either version 3 of the License, or | |
14 ;; (at your option) any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | |
23 | |
24 ;;; Credits: | |
25 | |
26 ;; The original VC directory status implementation was based on dired. | |
27 ;; This implementation was inspired by PCL-CVS. | |
28 ;; Many people contributed comments, ideas and code to this | |
29 ;; implementation. These include: | |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
30 ;; |
96203 | 31 ;; Alexandre Julliard <julliard@winehq.org> |
32 ;; Stefan Monnier <monnier@iro.umontreal.ca> | |
33 ;; Tom Tromey <tromey@redhat.com> | |
34 | |
35 ;;; Commentary: | |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
36 ;; |
96203 | 37 |
38 ;;; Todo: see vc.el. | |
39 | |
40 (require 'vc-hooks) | |
41 (require 'vc) | |
96310
ba295cada06b
* vc-dir.el (tool-bar): Require.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96256
diff
changeset
|
42 (require 'tool-bar) |
96203 | 43 (require 'ewoc) |
44 | |
45 ;;; Code: | |
46 (eval-when-compile | |
47 (require 'cl)) | |
48 | |
49 (defcustom vc-dir-mode-hook nil | |
50 "Normal hook run by `vc-dir-mode'. | |
51 See `run-hooks'." | |
52 :type 'hook | |
53 :group 'vc) | |
54 | |
55 ;; Used to store information for the files displayed in the directory buffer. | |
56 ;; Each item displayed corresponds to one of these defstructs. | |
57 (defstruct (vc-dir-fileinfo | |
58 (:copier nil) | |
59 (:type list) ;So we can use `member' on lists of FIs. | |
60 (:constructor | |
61 ;; We could define it as an alias for `list'. | |
62 vc-dir-create-fileinfo (name state &optional extra marked directory)) | |
63 (:conc-name vc-dir-fileinfo->)) | |
64 name ;Keep it as first, for `member'. | |
65 state | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
66 ;; For storing backend specific information. |
96203 | 67 extra |
68 marked | |
69 ;; To keep track of not updated files during a global refresh | |
70 needs-update | |
71 ;; To distinguish files and directories. | |
72 directory) | |
73 | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
74 (defvar vc-ewoc nil) |
96203 | 75 |
76 (defvar vc-dir-process-buffer nil | |
77 "The buffer used for the asynchronous call that computes status.") | |
78 | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
79 (defvar vc-dir-backend nil |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
80 "The backend used by the current *vc-dir* buffer.") |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
81 |
96203 | 82 (defun vc-dir-move-to-goal-column () |
83 ;; Used to keep the cursor on the file name column. | |
84 (beginning-of-line) | |
85 (unless (eolp) | |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
86 ;; Must be in sync with vc-default-dir-printer. |
96203 | 87 (forward-char 25))) |
88 | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
89 (defun vc-dir-prepare-status-buffer (bname dir backend &optional create-new) |
96203 | 90 "Find a buffer named BNAME showing DIR, or create a new one." |
97660
cf2cf606d5d7
(vc-dir-prepare-status-buffer): Make sure we use a
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97315
diff
changeset
|
91 (setq dir (file-name-as-directory (expand-file-name dir))) |
105293
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
92 (let* ;; Look for another buffer name BNAME visiting the same directory. |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
93 ((buf (save-excursion |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
94 (unless create-new |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
95 (dolist (buffer vc-dir-buffers) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
96 (when (buffer-live-p buffer) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
97 (set-buffer buffer) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
98 (when (and (derived-mode-p 'vc-dir-mode) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
99 (eq vc-dir-backend backend) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
100 (string= default-directory dir)) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
101 (return buffer)))))))) |
96203 | 102 (or buf |
103 ;; Create a new buffer named BNAME. | |
104 (with-current-buffer (create-file-buffer bname) | |
105 (cd dir) | |
106 (vc-setup-buffer (current-buffer)) | |
107 ;; Reset the vc-parent-buffer-name so that it does not appear | |
108 ;; in the mode-line. | |
109 (setq vc-parent-buffer-name nil) | |
110 (current-buffer))))) | |
111 | |
112 (defvar vc-dir-menu-map | |
113 (let ((map (make-sparse-keymap "VC-dir"))) | |
114 (define-key map [quit] | |
115 '(menu-item "Quit" quit-window | |
116 :help "Quit")) | |
117 (define-key map [kill] | |
118 '(menu-item "Kill Update Command" vc-dir-kill-dir-status-process | |
119 :enable (vc-dir-busy) | |
120 :help "Kill the command that updates the directory buffer")) | |
121 (define-key map [refresh] | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
122 '(menu-item "Refresh" revert-buffer |
96203 | 123 :enable (not (vc-dir-busy)) |
124 :help "Refresh the contents of the directory buffer")) | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
125 (define-key map [remup] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
126 '(menu-item "Hide up-to-date" vc-dir-hide-up-to-date |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
127 :help "Hide up-to-date items from display")) |
96203 | 128 ;; Movement. |
129 (define-key map [sepmv] '("--")) | |
130 (define-key map [next-line] | |
131 '(menu-item "Next line" vc-dir-next-line | |
132 :help "Go to the next line" :keys "n")) | |
133 (define-key map [previous-line] | |
134 '(menu-item "Previous line" vc-dir-previous-line | |
135 :help "Go to the previous line")) | |
136 ;; Marking. | |
137 (define-key map [sepmrk] '("--")) | |
138 (define-key map [unmark-all] | |
139 '(menu-item "Unmark All" vc-dir-unmark-all-files | |
140 :help "Unmark all files that are in the same state as the current file\ | |
141 \nWith prefix argument unmark all files")) | |
142 (define-key map [unmark-previous] | |
143 '(menu-item "Unmark previous " vc-dir-unmark-file-up | |
144 :help "Move to the previous line and unmark the file")) | |
145 | |
146 (define-key map [mark-all] | |
147 '(menu-item "Mark All" vc-dir-mark-all-files | |
148 :help "Mark all files that are in the same state as the current file\ | |
149 \nWith prefix argument mark all files")) | |
150 (define-key map [unmark] | |
151 '(menu-item "Unmark" vc-dir-unmark | |
152 :help "Unmark the current file or all files in the region")) | |
153 | |
154 (define-key map [mark] | |
155 '(menu-item "Mark" vc-dir-mark | |
156 :help "Mark the current file or all files in the region")) | |
157 | |
158 (define-key map [sepopn] '("--")) | |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
159 (define-key map [qr] |
96964
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
160 '(menu-item "Query Replace in Files..." vc-dir-query-replace-regexp |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
161 :help "Replace a string in the marked files")) |
96963
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
162 (define-key map [se] |
96964
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
163 '(menu-item "Search Files..." vc-dir-search |
96963
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
164 :help "Search a regexp in the marked files")) |
96964
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
165 (define-key map [ires] |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
166 '(menu-item "Isearch Regexp Files..." vc-dir-isearch-regexp |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
167 :help "Incremental search a regexp in the marked files")) |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
168 (define-key map [ise] |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
169 '(menu-item "Isearch Files..." vc-dir-isearch |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
170 :help "Incremental search a string in the marked files")) |
96203 | 171 (define-key map [open-other] |
172 '(menu-item "Open in other window" vc-dir-find-file-other-window | |
173 :help "Find the file on the current line, in another window")) | |
174 (define-key map [open] | |
175 '(menu-item "Open file" vc-dir-find-file | |
176 :help "Find the file on the current line")) | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
177 (define-key map [sepvcdet] '("--")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
178 ;; FIXME: This needs a key binding. And maybe a better name |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
179 ;; ("Insert" like PCL-CVS uses does not sound that great either)... |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
180 (define-key map [ins] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
181 '(menu-item "Show File" vc-dir-show-fileentry |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
182 :help "Show a file in the VC status listing even though it might be up to date")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
183 (define-key map [annotate] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
184 '(menu-item "Annotate" vc-annotate |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
185 :help "Display the edit history of the current file using colors")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
186 (define-key map [diff] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
187 '(menu-item "Compare with Base Version" vc-diff |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
188 :help "Compare file set with the base version")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
189 (define-key map [log] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
190 '(menu-item "Show history" vc-print-log |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
191 :help "List the change log of the current file set in a window")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
192 ;; VC commands. |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
193 (define-key map [sepvccmd] '("--")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
194 (define-key map [update] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
195 '(menu-item "Update to latest version" vc-update |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
196 :help "Update the current fileset's files to their tip revisions")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
197 (define-key map [revert] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
198 '(menu-item "Revert to base version" vc-revert |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
199 :help "Revert working copies of the selected fileset to their repository contents.")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
200 (define-key map [next-action] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
201 ;; FIXME: This really really really needs a better name! |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
202 ;; And a key binding too. |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
203 '(menu-item "Check In/Out" vc-next-action |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
204 :help "Do the next logical version control operation on the current fileset")) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
205 (define-key map [register] |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
206 '(menu-item "Register" vc-register |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
207 :help "Register file set into the version control system")) |
96203 | 208 map) |
101642
a2281d8c22e0
* vc-dir.el (vc-dir-menu-map, vc-dir-at-event, vc-dir-resynch-file):
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
209 "Menu for VC dir.") |
96203 | 210 |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
211 ;; VC backends can use this to add mode-specific menu items to |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
212 ;; vc-dir-menu-map. |
96203 | 213 (defun vc-dir-menu-map-filter (orig-binding) |
214 (when (and (symbolp orig-binding) (fboundp orig-binding)) | |
215 (setq orig-binding (indirect-function orig-binding))) | |
216 (let ((ext-binding | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
217 (when (derived-mode-p 'vc-dir-mode) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
218 (vc-call-backend vc-dir-backend 'extra-status-menu)))) |
96203 | 219 (if (null ext-binding) |
220 orig-binding | |
221 (append orig-binding | |
222 '("----") | |
223 ext-binding)))) | |
224 | |
225 (defvar vc-dir-mode-map | |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
226 (let ((map (make-sparse-keymap))) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
227 ;; VC commands |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
228 (define-key map "v" 'vc-next-action) ;; C-x v v |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
229 (define-key map "=" 'vc-diff) ;; C-x v = |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
230 (define-key map "i" 'vc-register) ;; C-x v i |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
231 (define-key map "+" 'vc-update) ;; C-x v + |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
232 (define-key map "l" 'vc-print-log) ;; C-x v l |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
233 ;; More confusing than helpful, probably |
97210 | 234 ;;(define-key map "R" 'vc-revert) ;; u is taken by vc-dir-unmark. |
235 ;;(define-key map "A" 'vc-annotate) ;; g is taken by revert-buffer | |
236 ;; bound by `special-mode'. | |
96203 | 237 ;; Marking. |
238 (define-key map "m" 'vc-dir-mark) | |
239 (define-key map "M" 'vc-dir-mark-all-files) | |
240 (define-key map "u" 'vc-dir-unmark) | |
241 (define-key map "U" 'vc-dir-unmark-all-files) | |
242 (define-key map "\C-?" 'vc-dir-unmark-file-up) | |
243 (define-key map "\M-\C-?" 'vc-dir-unmark-all-files) | |
244 ;; Movement. | |
245 (define-key map "n" 'vc-dir-next-line) | |
246 (define-key map " " 'vc-dir-next-line) | |
247 (define-key map "\t" 'vc-dir-next-directory) | |
248 (define-key map "p" 'vc-dir-previous-line) | |
249 (define-key map [backtab] 'vc-dir-previous-directory) | |
250 ;;; Rebind paragraph-movement commands. | |
251 (define-key map "\M-}" 'vc-dir-next-directory) | |
252 (define-key map "\M-{" 'vc-dir-previous-directory) | |
253 (define-key map [C-down] 'vc-dir-next-directory) | |
254 (define-key map [C-up] 'vc-dir-previous-directory) | |
255 ;; The remainder. | |
256 (define-key map "f" 'vc-dir-find-file) | |
257 (define-key map "\C-m" 'vc-dir-find-file) | |
258 (define-key map "o" 'vc-dir-find-file-other-window) | |
259 (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process) | |
260 (define-key map [down-mouse-3] 'vc-dir-menu) | |
261 (define-key map [mouse-2] 'vc-dir-toggle-mark) | |
99133
be46fd14df8a
(vc-dir-mode-map): Add follow-link behavior.
Chong Yidong <cyd@stupidchicken.com>
parents:
98471
diff
changeset
|
262 (define-key map [follow-link] 'mouse-face) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
263 (define-key map "x" 'vc-dir-hide-up-to-date) |
96963
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
264 (define-key map "S" 'vc-dir-search) ;; FIXME: Maybe use A like dired? |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
265 (define-key map "Q" 'vc-dir-query-replace-regexp) |
96964
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
266 (define-key map (kbd "M-s a C-s") 'vc-dir-isearch) |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
267 (define-key map (kbd "M-s a M-C-s") 'vc-dir-isearch-regexp) |
96203 | 268 |
269 ;; Hook up the menu. | |
270 (define-key map [menu-bar vc-dir-mode] | |
271 `(menu-item | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
272 ;; VC backends can use this to add mode-specific menu items to |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
273 ;; vc-dir-menu-map. |
96203 | 274 "VC-dir" ,vc-dir-menu-map :filter vc-dir-menu-map-filter)) |
275 map) | |
276 "Keymap for directory buffer.") | |
277 | |
100483
15455ea10b4a
(vc-dir-at-event): Rename from vc-at-event. Change
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100475
diff
changeset
|
278 (defmacro vc-dir-at-event (event &rest body) |
101642
a2281d8c22e0
* vc-dir.el (vc-dir-menu-map, vc-dir-at-event, vc-dir-resynch-file):
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
279 "Evaluate BODY with point located at event-start of EVENT. |
a2281d8c22e0
* vc-dir.el (vc-dir-menu-map, vc-dir-at-event, vc-dir-resynch-file):
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
280 If BODY uses EVENT, it should be a variable, |
96203 | 281 otherwise it will be evaluated twice." |
100483
15455ea10b4a
(vc-dir-at-event): Rename from vc-at-event. Change
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100475
diff
changeset
|
282 (let ((posn (make-symbol "vc-dir-at-event-posn"))) |
100475
75d8b06be81f
(vc-at-event): Handle (tool-bar) events. Fix bug#1585.
Sam Steingold <sds@gnu.org>
parents:
99367
diff
changeset
|
283 `(save-excursion |
75d8b06be81f
(vc-at-event): Handle (tool-bar) events. Fix bug#1585.
Sam Steingold <sds@gnu.org>
parents:
99367
diff
changeset
|
284 (unless (equal ,event '(tool-bar)) |
75d8b06be81f
(vc-at-event): Handle (tool-bar) events. Fix bug#1585.
Sam Steingold <sds@gnu.org>
parents:
99367
diff
changeset
|
285 (let ((,posn (event-start ,event))) |
75d8b06be81f
(vc-at-event): Handle (tool-bar) events. Fix bug#1585.
Sam Steingold <sds@gnu.org>
parents:
99367
diff
changeset
|
286 (set-buffer (window-buffer (posn-window ,posn))) |
75d8b06be81f
(vc-at-event): Handle (tool-bar) events. Fix bug#1585.
Sam Steingold <sds@gnu.org>
parents:
99367
diff
changeset
|
287 (goto-char (posn-point ,posn)))) |
75d8b06be81f
(vc-at-event): Handle (tool-bar) events. Fix bug#1585.
Sam Steingold <sds@gnu.org>
parents:
99367
diff
changeset
|
288 ,@body))) |
96203 | 289 |
290 (defun vc-dir-menu (e) | |
97210 | 291 "Popup the VC dir menu." |
96203 | 292 (interactive "e") |
100483
15455ea10b4a
(vc-dir-at-event): Rename from vc-at-event. Change
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100475
diff
changeset
|
293 (vc-dir-at-event e (popup-menu vc-dir-menu-map e))) |
96203 | 294 |
295 (defvar vc-dir-tool-bar-map | |
296 (let ((map (make-sparse-keymap))) | |
297 (tool-bar-local-item-from-menu 'vc-dir-find-file "open" | |
298 map vc-dir-mode-map) | |
299 (tool-bar-local-item "bookmark_add" | |
300 'vc-dir-toggle-mark 'vc-dir-toggle-mark map | |
301 :help "Toggle mark on current item") | |
302 (tool-bar-local-item-from-menu 'vc-dir-previous-line "left-arrow" | |
303 map vc-dir-mode-map | |
304 :rtl "right-arrow") | |
305 (tool-bar-local-item-from-menu 'vc-dir-next-line "right-arrow" | |
306 map vc-dir-mode-map | |
307 :rtl "left-arrow") | |
308 (tool-bar-local-item-from-menu 'vc-print-log "info" | |
309 map vc-dir-mode-map) | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
310 (tool-bar-local-item-from-menu 'revert-buffer "refresh" |
96203 | 311 map vc-dir-mode-map) |
312 (tool-bar-local-item-from-menu 'nonincremental-search-forward | |
313 "search" map) | |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
314 (tool-bar-local-item-from-menu 'vc-dir-query-replace-regexp |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
315 "search-replace" map vc-dir-mode-map) |
96203 | 316 (tool-bar-local-item-from-menu 'vc-dir-kill-dir-status-process "cancel" |
317 map vc-dir-mode-map) | |
318 (tool-bar-local-item-from-menu 'quit-window "exit" | |
319 map vc-dir-mode-map) | |
320 map)) | |
321 | |
322 (defun vc-dir-node-directory (node) | |
323 ;; Compute the directory for NODE. | |
105424
098f8a47a308
Fix typos in comments.
Juanma Barranquero <lekktu@gmail.com>
parents:
105293
diff
changeset
|
324 ;; If it's a directory node, get it from the node. |
96203 | 325 (let ((data (ewoc-data node))) |
326 (or (vc-dir-fileinfo->directory data) | |
327 ;; Otherwise compute it from the file name. | |
328 (file-name-directory | |
104615
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
329 (directory-file-name |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
330 (expand-file-name |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
331 (vc-dir-fileinfo->name data))))))) |
96203 | 332 |
333 (defun vc-dir-update (entries buffer &optional noinsert) | |
334 "Update BUFFER's ewoc from the list of ENTRIES. | |
335 If NOINSERT, ignore elements on ENTRIES which are not in the ewoc." | |
336 ;; Add ENTRIES to the vc-dir buffer BUFFER. | |
337 (with-current-buffer buffer | |
338 ;; Insert the entries sorted by name into the ewoc. | |
339 ;; We assume the ewoc is sorted too, which should be the | |
340 ;; case if we always add entries with vc-dir-update. | |
341 (setq entries | |
342 ;; Sort: first files and then subdirectories. | |
343 ;; XXX: this is VERY inefficient, it computes the directory | |
344 ;; names too many times | |
345 (sort entries | |
346 (lambda (entry1 entry2) | |
104615
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
347 (let ((dir1 (file-name-directory |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
348 (directory-file-name (expand-file-name (car entry1))))) |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
349 (dir2 (file-name-directory |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
350 (directory-file-name (expand-file-name (car entry2)))))) |
96203 | 351 (cond |
352 ((string< dir1 dir2) t) | |
353 ((not (string= dir1 dir2)) nil) | |
354 ((string< (car entry1) (car entry2)))))))) | |
355 ;; Insert directory entries in the right places. | |
356 (let ((entry (car entries)) | |
102260
a52c9332c41c
(vc-dir-update): Make sure ./ is always first in the listing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101940
diff
changeset
|
357 (node (ewoc-nth vc-ewoc 0)) |
a52c9332c41c
(vc-dir-update): Make sure ./ is always first in the listing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101940
diff
changeset
|
358 (dotname (file-relative-name default-directory))) |
96203 | 359 ;; Insert . if it is not present. |
360 (unless node | |
102260
a52c9332c41c
(vc-dir-update): Make sure ./ is always first in the listing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101940
diff
changeset
|
361 (ewoc-enter-last |
a52c9332c41c
(vc-dir-update): Make sure ./ is always first in the listing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101940
diff
changeset
|
362 vc-ewoc (vc-dir-create-fileinfo |
105293
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
363 dotname nil nil nil default-directory)) |
96203 | 364 (setq node (ewoc-nth vc-ewoc 0))) |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
365 |
96203 | 366 (while (and entry node) |
367 (let* ((entryfile (car entry)) | |
104615
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
368 (entrydir (file-name-directory (directory-file-name |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
369 (expand-file-name entryfile)))) |
96203 | 370 (nodedir (vc-dir-node-directory node))) |
371 (cond | |
372 ;; First try to find the directory. | |
373 ((string-lessp nodedir entrydir) | |
374 (setq node (ewoc-next vc-ewoc node))) | |
375 ((string-equal nodedir entrydir) | |
376 ;; Found the directory, find the place for the file name. | |
377 (let ((nodefile (vc-dir-fileinfo->name (ewoc-data node)))) | |
378 (cond | |
102260
a52c9332c41c
(vc-dir-update): Make sure ./ is always first in the listing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101940
diff
changeset
|
379 ((string= nodefile dotname) |
a52c9332c41c
(vc-dir-update): Make sure ./ is always first in the listing.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101940
diff
changeset
|
380 (setq node (ewoc-next vc-ewoc node))) |
96203 | 381 ((string-lessp nodefile entryfile) |
382 (setq node (ewoc-next vc-ewoc node))) | |
383 ((string-equal nodefile entryfile) | |
384 (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry)) | |
385 (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry)) | |
386 (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil) | |
387 (ewoc-invalidate vc-ewoc node) | |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
388 (setq entries (cdr entries)) |
96203 | 389 (setq entry (car entries)) |
390 (setq node (ewoc-next vc-ewoc node))) | |
391 (t | |
392 (ewoc-enter-before vc-ewoc node | |
393 (apply 'vc-dir-create-fileinfo entry)) | |
394 (setq entries (cdr entries)) | |
395 (setq entry (car entries)))))) | |
396 (t | |
397 ;; We might need to insert a directory node if the | |
398 ;; previous node was in a different directory. | |
399 (let* ((rd (file-relative-name entrydir)) | |
400 (prev-node (ewoc-prev vc-ewoc node)) | |
401 (prev-dir (vc-dir-node-directory prev-node))) | |
402 (unless (string-equal entrydir prev-dir) | |
403 (ewoc-enter-before | |
404 vc-ewoc node (vc-dir-create-fileinfo rd nil nil nil entrydir)))) | |
405 ;; Now insert the node itself. | |
406 (ewoc-enter-before vc-ewoc node | |
407 (apply 'vc-dir-create-fileinfo entry)) | |
408 (setq entries (cdr entries) entry (car entries)))))) | |
409 ;; We're past the last node, all remaining entries go to the end. | |
410 (unless (or node noinsert) | |
411 (let ((lastdir (vc-dir-node-directory (ewoc-nth vc-ewoc -1)))) | |
412 (dolist (entry entries) | |
104615
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
413 (let ((entrydir (file-name-directory |
6915f976dcd2
(vc-dir-node-directory, vc-dir-update): Get the parent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104051
diff
changeset
|
414 (directory-file-name (expand-file-name (car entry)))))) |
96203 | 415 ;; Insert a directory node if needed. |
416 (unless (string-equal lastdir entrydir) | |
417 (setq lastdir entrydir) | |
418 (let ((rd (file-relative-name entrydir))) | |
419 (ewoc-enter-last | |
420 vc-ewoc (vc-dir-create-fileinfo rd nil nil nil entrydir)))) | |
421 ;; Now insert the node itself. | |
422 (ewoc-enter-last vc-ewoc | |
423 (apply 'vc-dir-create-fileinfo entry))))))))) | |
424 | |
425 (defun vc-dir-busy () | |
426 (and (buffer-live-p vc-dir-process-buffer) | |
427 (get-buffer-process vc-dir-process-buffer))) | |
428 | |
429 (defun vc-dir-kill-dir-status-process () | |
430 "Kill the temporary buffer and associated process." | |
431 (interactive) | |
432 (when (buffer-live-p vc-dir-process-buffer) | |
433 (let ((proc (get-buffer-process vc-dir-process-buffer))) | |
434 (when proc (delete-process proc)) | |
435 (setq vc-dir-process-buffer nil) | |
436 (setq mode-line-process nil)))) | |
437 | |
438 (defun vc-dir-kill-query () | |
439 ;; Make sure that when the status buffer is killed the update | |
440 ;; process running in background is also killed. | |
441 (if (vc-dir-busy) | |
442 (when (y-or-n-p "Status update process running, really kill status buffer? ") | |
443 (vc-dir-kill-dir-status-process) | |
444 t) | |
445 t)) | |
446 | |
447 (defun vc-dir-next-line (arg) | |
448 "Go to the next line. | |
449 If a prefix argument is given, move by that many lines." | |
450 (interactive "p") | |
451 (with-no-warnings | |
452 (ewoc-goto-next vc-ewoc arg) | |
453 (vc-dir-move-to-goal-column))) | |
454 | |
455 (defun vc-dir-previous-line (arg) | |
456 "Go to the previous line. | |
457 If a prefix argument is given, move by that many lines." | |
458 (interactive "p") | |
459 (ewoc-goto-prev vc-ewoc arg) | |
460 (vc-dir-move-to-goal-column)) | |
461 | |
462 (defun vc-dir-next-directory () | |
463 "Go to the next directory." | |
464 (interactive) | |
465 (let ((orig (point))) | |
466 (if | |
467 (catch 'foundit | |
468 (while t | |
469 (let* ((next (ewoc-next vc-ewoc (ewoc-locate vc-ewoc)))) | |
470 (cond ((not next) | |
471 (throw 'foundit t)) | |
472 (t | |
473 (progn | |
474 (ewoc-goto-node vc-ewoc next) | |
475 (vc-dir-move-to-goal-column) | |
476 (if (vc-dir-fileinfo->directory (ewoc-data next)) | |
477 (throw 'foundit nil)))))))) | |
478 (goto-char orig)))) | |
479 | |
480 (defun vc-dir-previous-directory () | |
481 "Go to the previous directory." | |
482 (interactive) | |
483 (let ((orig (point))) | |
484 (if | |
485 (catch 'foundit | |
486 (while t | |
487 (let* ((prev (ewoc-prev vc-ewoc (ewoc-locate vc-ewoc)))) | |
488 (cond ((not prev) | |
489 (throw 'foundit t)) | |
490 (t | |
491 (progn | |
492 (ewoc-goto-node vc-ewoc prev) | |
493 (vc-dir-move-to-goal-column) | |
494 (if (vc-dir-fileinfo->directory (ewoc-data prev)) | |
495 (throw 'foundit nil)))))))) | |
496 (goto-char orig)))) | |
497 | |
498 (defun vc-dir-mark-unmark (mark-unmark-function) | |
499 (if (use-region-p) | |
500 (let ((firstl (line-number-at-pos (region-beginning))) | |
501 (lastl (line-number-at-pos (region-end)))) | |
502 (save-excursion | |
503 (goto-char (region-beginning)) | |
504 (while (<= (line-number-at-pos) lastl) | |
505 (funcall mark-unmark-function)))) | |
506 (funcall mark-unmark-function))) | |
507 | |
508 (defun vc-dir-parent-marked-p (arg) | |
509 ;; Return nil if none of the parent directories of arg is marked. | |
510 (let* ((argdir (vc-dir-node-directory arg)) | |
511 (arglen (length argdir)) | |
512 (crt arg) | |
513 data dir) | |
514 ;; Go through the predecessors, checking if any directory that is | |
515 ;; a parent is marked. | |
516 (while (setq crt (ewoc-prev vc-ewoc crt)) | |
517 (setq data (ewoc-data crt)) | |
518 (setq dir (vc-dir-node-directory crt)) | |
519 (when (and (vc-dir-fileinfo->directory data) | |
520 (vc-string-prefix-p dir argdir)) | |
521 (when (vc-dir-fileinfo->marked data) | |
522 (error "Cannot mark `%s', parent directory `%s' marked" | |
523 (vc-dir-fileinfo->name (ewoc-data arg)) | |
524 (vc-dir-fileinfo->name data))))) | |
525 nil)) | |
526 | |
527 (defun vc-dir-children-marked-p (arg) | |
528 ;; Return nil if none of the children of arg is marked. | |
529 (let* ((argdir-re (concat "\\`" (regexp-quote (vc-dir-node-directory arg)))) | |
530 (is-child t) | |
531 (crt arg) | |
532 data dir) | |
533 (while (and is-child (setq crt (ewoc-next vc-ewoc crt))) | |
534 (setq data (ewoc-data crt)) | |
535 (setq dir (vc-dir-node-directory crt)) | |
536 (if (string-match argdir-re dir) | |
537 (when (vc-dir-fileinfo->marked data) | |
538 (error "Cannot mark `%s', child `%s' marked" | |
539 (vc-dir-fileinfo->name (ewoc-data arg)) | |
540 (vc-dir-fileinfo->name data))) | |
541 ;; We are done, we got to an entry that is not a child of `arg'. | |
542 (setq is-child nil))) | |
543 nil)) | |
544 | |
545 (defun vc-dir-mark-file (&optional arg) | |
546 ;; Mark ARG or the current file and move to the next line. | |
547 (let* ((crt (or arg (ewoc-locate vc-ewoc))) | |
548 (file (ewoc-data crt)) | |
549 (isdir (vc-dir-fileinfo->directory file))) | |
550 (when (or (and isdir (not (vc-dir-children-marked-p crt))) | |
551 (and (not isdir) (not (vc-dir-parent-marked-p crt)))) | |
552 (setf (vc-dir-fileinfo->marked file) t) | |
553 (ewoc-invalidate vc-ewoc crt) | |
554 (unless (or arg (mouse-event-p last-command-event)) | |
555 (vc-dir-next-line 1))))) | |
556 | |
557 (defun vc-dir-mark () | |
558 "Mark the current file or all files in the region. | |
559 If the region is active, mark all the files in the region. | |
560 Otherwise mark the file on the current line and move to the next | |
561 line." | |
562 (interactive) | |
563 (vc-dir-mark-unmark 'vc-dir-mark-file)) | |
564 | |
565 (defun vc-dir-mark-all-files (arg) | |
566 "Mark all files with the same state as the current one. | |
567 With a prefix argument mark all files. | |
568 If the current entry is a directory, mark all child files. | |
569 | |
570 The commands operate on files that are on the same state. | |
571 This command is intended to make it easy to select all files that | |
572 share the same state." | |
573 (interactive "P") | |
574 (if arg | |
575 ;; Mark all files. | |
576 (progn | |
577 ;; First check that no directory is marked, we can't mark | |
578 ;; files in that case. | |
579 (ewoc-map | |
580 (lambda (filearg) | |
581 (when (and (vc-dir-fileinfo->directory filearg) | |
582 (vc-dir-fileinfo->marked filearg)) | |
583 (error "Cannot mark all files, directory `%s' marked" | |
584 (vc-dir-fileinfo->name filearg)))) | |
585 vc-ewoc) | |
586 (ewoc-map | |
587 (lambda (filearg) | |
588 (unless (vc-dir-fileinfo->marked filearg) | |
589 (setf (vc-dir-fileinfo->marked filearg) t) | |
590 t)) | |
591 vc-ewoc)) | |
592 (let ((data (ewoc-data (ewoc-locate vc-ewoc)))) | |
593 (if (vc-dir-fileinfo->directory data) | |
594 ;; It's a directory, mark child files. | |
595 (let ((crt (ewoc-locate vc-ewoc))) | |
596 (unless (vc-dir-children-marked-p crt) | |
597 (while (setq crt (ewoc-next vc-ewoc crt)) | |
598 (let ((crt-data (ewoc-data crt))) | |
599 (unless (vc-dir-fileinfo->directory crt-data) | |
600 (setf (vc-dir-fileinfo->marked crt-data) t) | |
601 (ewoc-invalidate vc-ewoc crt)))))) | |
602 ;; It's a file | |
603 (let ((state (vc-dir-fileinfo->state data)) | |
604 (crt (ewoc-nth vc-ewoc 0))) | |
605 (while crt | |
606 (let ((crt-data (ewoc-data crt))) | |
607 (when (and (not (vc-dir-fileinfo->marked crt-data)) | |
608 (eq (vc-dir-fileinfo->state crt-data) state) | |
609 (not (vc-dir-fileinfo->directory crt-data))) | |
610 (vc-dir-mark-file crt))) | |
611 (setq crt (ewoc-next vc-ewoc crt)))))))) | |
612 | |
613 (defun vc-dir-unmark-file () | |
614 ;; Unmark the current file and move to the next line. | |
615 (let* ((crt (ewoc-locate vc-ewoc)) | |
616 (file (ewoc-data crt))) | |
617 (setf (vc-dir-fileinfo->marked file) nil) | |
618 (ewoc-invalidate vc-ewoc crt) | |
619 (unless (mouse-event-p last-command-event) | |
620 (vc-dir-next-line 1)))) | |
621 | |
622 (defun vc-dir-unmark () | |
623 "Unmark the current file or all files in the region. | |
624 If the region is active, unmark all the files in the region. | |
625 Otherwise mark the file on the current line and move to the next | |
626 line." | |
627 (interactive) | |
628 (vc-dir-mark-unmark 'vc-dir-unmark-file)) | |
629 | |
630 (defun vc-dir-unmark-file-up () | |
631 "Move to the previous line and unmark the file." | |
632 (interactive) | |
633 ;; If we're on the first line, we won't move up, but we will still | |
634 ;; remove the mark. This seems a bit odd but it is what buffer-menu | |
635 ;; does. | |
636 (let* ((prev (ewoc-goto-prev vc-ewoc 1)) | |
637 (file (ewoc-data prev))) | |
638 (setf (vc-dir-fileinfo->marked file) nil) | |
639 (ewoc-invalidate vc-ewoc prev) | |
640 (vc-dir-move-to-goal-column))) | |
641 | |
642 (defun vc-dir-unmark-all-files (arg) | |
643 "Unmark all files with the same state as the current one. | |
644 With a prefix argument unmark all files. | |
645 If the current entry is a directory, unmark all the child files. | |
646 | |
647 The commands operate on files that are on the same state. | |
648 This command is intended to make it easy to deselect all files | |
649 that share the same state." | |
650 (interactive "P") | |
651 (if arg | |
652 (ewoc-map | |
653 (lambda (filearg) | |
654 (when (vc-dir-fileinfo->marked filearg) | |
655 (setf (vc-dir-fileinfo->marked filearg) nil) | |
656 t)) | |
657 vc-ewoc) | |
658 (let* ((crt (ewoc-locate vc-ewoc)) | |
659 (data (ewoc-data crt))) | |
660 (if (vc-dir-fileinfo->directory data) | |
661 ;; It's a directory, unmark child files. | |
662 (while (setq crt (ewoc-next vc-ewoc crt)) | |
663 (let ((crt-data (ewoc-data crt))) | |
664 (unless (vc-dir-fileinfo->directory crt-data) | |
665 (setf (vc-dir-fileinfo->marked crt-data) nil) | |
666 (ewoc-invalidate vc-ewoc crt)))) | |
667 ;; It's a file | |
668 (let ((crt-state (vc-dir-fileinfo->state (ewoc-data crt)))) | |
669 (ewoc-map | |
670 (lambda (filearg) | |
671 (when (and (vc-dir-fileinfo->marked filearg) | |
672 (eq (vc-dir-fileinfo->state filearg) crt-state)) | |
673 (setf (vc-dir-fileinfo->marked filearg) nil) | |
674 t)) | |
675 vc-ewoc)))))) | |
676 | |
677 (defun vc-dir-toggle-mark-file () | |
678 (let* ((crt (ewoc-locate vc-ewoc)) | |
679 (file (ewoc-data crt))) | |
680 (if (vc-dir-fileinfo->marked file) | |
681 (vc-dir-unmark-file) | |
682 (vc-dir-mark-file)))) | |
683 | |
684 (defun vc-dir-toggle-mark (e) | |
685 (interactive "e") | |
100483
15455ea10b4a
(vc-dir-at-event): Rename from vc-at-event. Change
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100475
diff
changeset
|
686 (vc-dir-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file))) |
96203 | 687 |
688 (defun vc-dir-delete-file () | |
689 "Delete the marked files, or the current file if no marks." | |
690 (interactive) | |
691 (mapc 'vc-delete-file (or (vc-dir-marked-files) | |
692 (list (vc-dir-current-file))))) | |
693 | |
694 (defun vc-dir-find-file () | |
695 "Find the file on the current line." | |
696 (interactive) | |
697 (find-file (vc-dir-current-file))) | |
698 | |
101924
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
699 (defun vc-dir-find-file-other-window (&optional event) |
96203 | 700 "Find the file on the current line, in another window." |
101924
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
701 (interactive (list last-nonmenu-event)) |
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
702 (if event (posn-set-point (event-end event))) |
96203 | 703 (find-file-other-window (vc-dir-current-file))) |
704 | |
96964
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
705 (defun vc-dir-isearch () |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
706 "Search for a string through all marked buffers using Isearch." |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
707 (interactive) |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
708 (multi-isearch-files |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
709 (mapcar 'car (vc-dir-marked-only-files-and-states)))) |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
710 |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
711 (defun vc-dir-isearch-regexp () |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
712 "Search for a regexp through all marked buffers using Isearch." |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
713 (interactive) |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
714 (multi-isearch-files-regexp |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
715 (mapcar 'car (vc-dir-marked-only-files-and-states)))) |
bd2850789ce2
(vc-dir-search, vc-dir-isearch)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96963
diff
changeset
|
716 |
96963
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
717 (defun vc-dir-search (regexp) |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
718 "Search through all marked files for a match for REGEXP. |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
719 For marked directories, use the files displayed from those directories. |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
720 Stops when a match is found. |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
721 To continue searching for next match, use command \\[tags-loop-continue]." |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
722 (interactive "sSearch marked files (regexp): ") |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
723 (tags-search regexp '(mapcar 'car (vc-dir-marked-only-files-and-states)))) |
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
724 |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
725 (defun vc-dir-query-replace-regexp (from to &optional delimited) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
726 "Do `query-replace-regexp' of FROM with TO, on all marked files. |
96963
4abff057d348
(vc-dir-search): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96888
diff
changeset
|
727 For marked directories, use the files displayed from those directories. |
96500
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
728 If a directory is marked, then use the files displayed for that directory. |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
729 Third arg DELIMITED (prefix arg) means replace only word-delimited matches. |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
730 If you exit (\\[keyboard-quit], RET or q), you can resume the query replace |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
731 with the command \\[tags-loop-continue]." |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
732 ;; FIXME: this is almost a copy of `dired-do-replace-regexp'. This |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
733 ;; should probably be made generic and used in both places instead of |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
734 ;; duplicating it here. |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
735 (interactive |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
736 (let ((common |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
737 (query-replace-read-args |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
738 "Query replace regexp in marked files" t t))) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
739 (list (nth 0 common) (nth 1 common) (nth 2 common)))) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
740 (dolist (file (mapcar 'car (vc-dir-marked-only-files-and-states))) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
741 (let ((buffer (get-file-buffer file))) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
742 (if (and buffer (with-current-buffer buffer |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
743 buffer-read-only)) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
744 (error "File `%s' is visited read-only" file)))) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
745 (tags-query-replace from to delimited |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
746 '(mapcar 'car (vc-dir-marked-only-files-and-states)))) |
4c68d664c39b
(vc-dir-query-replace-regexp): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96474
diff
changeset
|
747 |
96203 | 748 (defun vc-dir-current-file () |
749 (let ((node (ewoc-locate vc-ewoc))) | |
750 (unless node | |
751 (error "No file available")) | |
752 (expand-file-name (vc-dir-fileinfo->name (ewoc-data node))))) | |
753 | |
754 (defun vc-dir-marked-files () | |
755 "Return the list of marked files." | |
756 (mapcar | |
757 (lambda (elem) (expand-file-name (vc-dir-fileinfo->name elem))) | |
758 (ewoc-collect vc-ewoc 'vc-dir-fileinfo->marked))) | |
759 | |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
760 (defun vc-dir-marked-only-files-and-states () |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
761 "Return the list of conses (FILE . STATE) for the marked files. |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
762 For marked directories return the corresponding conses for the |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
763 child files." |
96203 | 764 (let ((crt (ewoc-nth vc-ewoc 0)) |
765 result) | |
766 (while crt | |
767 (let ((crt-data (ewoc-data crt))) | |
768 (if (vc-dir-fileinfo->marked crt-data) | |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
769 ;; FIXME: use vc-dir-child-files-and-states here instead of duplicating it. |
96203 | 770 (if (vc-dir-fileinfo->directory crt-data) |
771 (let* ((dir (vc-dir-fileinfo->directory crt-data)) | |
772 (dirlen (length dir)) | |
773 data) | |
774 (while | |
775 (and (setq crt (ewoc-next vc-ewoc crt)) | |
776 (vc-string-prefix-p dir | |
777 (progn | |
778 (setq data (ewoc-data crt)) | |
779 (vc-dir-node-directory crt)))) | |
780 (unless (vc-dir-fileinfo->directory data) | |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
781 (push |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
782 (cons (expand-file-name (vc-dir-fileinfo->name data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
783 (vc-dir-fileinfo->state data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
784 result)))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
785 (push (cons (expand-file-name (vc-dir-fileinfo->name crt-data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
786 (vc-dir-fileinfo->state crt-data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
787 result) |
96203 | 788 (setq crt (ewoc-next vc-ewoc crt))) |
789 (setq crt (ewoc-next vc-ewoc crt))))) | |
97696
5d466e3c0ab7
(vc-dir-marked-only-files-and-states):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97660
diff
changeset
|
790 (nreverse result))) |
96203 | 791 |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
792 (defun vc-dir-child-files-and-states () |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
793 "Return the list of conses (FILE . STATE) for child files of the current entry if it's a directory. |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
794 If it is a file, return the corresponding cons for the file itself." |
96203 | 795 (let* ((crt (ewoc-locate vc-ewoc)) |
796 (crt-data (ewoc-data crt)) | |
797 result) | |
798 (if (vc-dir-fileinfo->directory crt-data) | |
799 (let* ((dir (vc-dir-fileinfo->directory crt-data)) | |
800 (dirlen (length dir)) | |
801 data) | |
802 (while | |
803 (and (setq crt (ewoc-next vc-ewoc crt)) | |
804 (vc-string-prefix-p dir (progn | |
805 (setq data (ewoc-data crt)) | |
806 (vc-dir-node-directory crt)))) | |
807 (unless (vc-dir-fileinfo->directory data) | |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
808 (push |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
809 (cons (expand-file-name (vc-dir-fileinfo->name data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
810 (vc-dir-fileinfo->state data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
811 result)))) |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
812 (push |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
813 (cons (expand-file-name (vc-dir-fileinfo->name crt-data)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
814 (vc-dir-fileinfo->state crt-data)) result)) |
97696
5d466e3c0ab7
(vc-dir-marked-only-files-and-states):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97660
diff
changeset
|
815 (nreverse result))) |
96203 | 816 |
96520
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
817 (defun vc-dir-recompute-file-state (fname def-dir) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
818 (let* ((file-short (file-relative-name fname def-dir)) |
96880
938dd02137bc
(vc-dir-recompute-file-state): Add workaround for CVS.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96541
diff
changeset
|
819 (remove-me-when-CVS-works |
938dd02137bc
(vc-dir-recompute-file-state): Add workaround for CVS.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96541
diff
changeset
|
820 (when (eq vc-dir-backend 'CVS) |
938dd02137bc
(vc-dir-recompute-file-state): Add workaround for CVS.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96541
diff
changeset
|
821 ;; FIXME: Warning: UGLY HACK. The CVS backend caches the state |
938dd02137bc
(vc-dir-recompute-file-state): Add workaround for CVS.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96541
diff
changeset
|
822 ;; info, this forces the backend to update it. |
96888
32da3745adc8
Fixed mismatched parenthesis in vc-dir.el.
Bastien Guerry <bzg@altern.org>
parents:
96880
diff
changeset
|
823 (vc-call-backend vc-dir-backend 'registered fname))) |
96520
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
824 (state (vc-call-backend vc-dir-backend 'state fname)) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
825 (extra (vc-call-backend vc-dir-backend |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
826 'status-fileinfo-extra fname))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
827 (list file-short state extra))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
828 |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
829 (defun vc-dir-find-child-files (dirname) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
830 ;; Give a DIRNAME string return the list of all child files shown in |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
831 ;; the current *vc-dir* buffer. |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
832 (let ((crt (ewoc-nth vc-ewoc 0)) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
833 children |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
834 dname) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
835 ;; Find DIR |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
836 (while (and crt (not (vc-string-prefix-p |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
837 dirname (vc-dir-node-directory crt)))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
838 (setq crt (ewoc-next vc-ewoc crt))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
839 (while (and crt (vc-string-prefix-p |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
840 dirname |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
841 (setq dname (vc-dir-node-directory crt)))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
842 (let ((data (ewoc-data crt))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
843 (unless (vc-dir-fileinfo->directory data) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
844 (push (expand-file-name (vc-dir-fileinfo->name data)) children))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
845 (setq crt (ewoc-next vc-ewoc crt))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
846 children)) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
847 |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
848 (defun vc-dir-resync-directory-files (dirname) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
849 ;; Update the entries for all the child files of DIRNAME shown in |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
850 ;; the current *vc-dir* buffer. |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
851 (let ((files (vc-dir-find-child-files dirname)) |
105293
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
852 (ddir default-directory) |
96520
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
853 fileentries) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
854 (when files |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
855 (dolist (crt files) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
856 (push (vc-dir-recompute-file-state crt ddir) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
857 fileentries)) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
858 (vc-dir-update fileentries (current-buffer))))) |
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
859 |
96203 | 860 (defun vc-dir-resynch-file (&optional fname) |
101642
a2281d8c22e0
* vc-dir.el (vc-dir-menu-map, vc-dir-at-event, vc-dir-resynch-file):
Juanma Barranquero <lekktu@gmail.com>
parents:
100908
diff
changeset
|
861 "Update the entries for FNAME in any directory buffers that list it." |
96520
00812d11af93
* vc-dir.el (vc-dir-find-child-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96500
diff
changeset
|
862 (let ((file (or fname (expand-file-name buffer-file-name))) |
105293
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
863 (drop '())) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
864 (save-current-buffer |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
865 ;; look for a vc-dir buffer that might show this file. |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
866 (dolist (status-buf vc-dir-buffers) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
867 (if (not (buffer-live-p status-buf)) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
868 (push status-buf drop) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
869 (set-buffer status-buf) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
870 (if (not (derived-mode-p 'vc-dir-mode)) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
871 (push status-buf drop) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
872 (let ((ddir default-directory)) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
873 (when (vc-string-prefix-p ddir file) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
874 (if (file-directory-p file) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
875 (vc-dir-resync-directory-files file) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
876 (let ((state (vc-dir-recompute-file-state file ddir))) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
877 (vc-dir-update |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
878 (list state) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
879 status-buf (eq (cadr state) 'up-to-date)))))))))) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
880 ;; Remove out-of-date entries from vc-dir-buffers. |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
881 (dolist (b drop) (setq vc-dir-buffers (delq b vc-dir-buffers))))) |
96203 | 882 |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
883 (defvar use-vc-backend) ;; dynamically bound |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
884 |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
885 (define-derived-mode vc-dir-mode special-mode "VC dir" |
97210 | 886 "Major mode for VC directory buffers. |
96203 | 887 Marking/Unmarking key bindings and actions: |
101718
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
888 m - mark a file/directory |
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
889 - if the region is active, mark all the files in region. |
96203 | 890 Restrictions: - a file cannot be marked if any parent directory is marked |
891 - a directory cannot be marked if any child file or | |
892 directory is marked | |
101718
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
893 u - unmark a file/directory |
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
894 - if the region is active, unmark all the files in region. |
96203 | 895 M - if the cursor is on a file: mark all the files with the same state as |
896 the current file | |
897 - if the cursor is on a directory: mark all child files | |
898 - with a prefix argument: mark all files | |
899 U - if the cursor is on a file: unmark all the files with the same state | |
900 as the current file | |
901 - if the cursor is on a directory: unmark all child files | |
902 - with a prefix argument: unmark all files | |
101718
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
903 mouse-2 - toggles the mark state |
96203 | 904 |
97210 | 905 VC commands |
101718
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
906 VC commands in the `C-x v' prefix can be used. |
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
907 VC commands act on the marked entries. If nothing is marked, VC |
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
908 commands act on the current entry. |
97210 | 909 |
910 Search & Replace | |
911 S - searches the marked files | |
912 Q - does a query replace on the marked files | |
913 M-s a C-s - does an isearch on the marked files | |
97315
b51913497dd3
(vc-dir-mode): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97210
diff
changeset
|
914 M-s a C-M-s - does a regexp isearch on the marked files |
97210 | 915 If nothing is marked, these commands act on the current entry. |
916 When a directory is current or marked, the Search & Replace | |
101718
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
917 commands act on the child files of that directory that are displayed in |
e5e2e4109ea1
(vc-dir-mode): Fix docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101717
diff
changeset
|
918 the *vc-dir* buffer. |
96203 | 919 |
920 \\{vc-dir-mode-map}" | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
921 (set (make-local-variable 'vc-dir-backend) use-vc-backend) |
96203 | 922 (setq buffer-read-only t) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
923 (when (boundp 'tool-bar-map) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
924 (set (make-local-variable 'tool-bar-map) vc-dir-tool-bar-map)) |
96203 | 925 (let ((buffer-read-only nil)) |
926 (erase-buffer) | |
927 (set (make-local-variable 'vc-dir-process-buffer) nil) | |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
928 (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-printer)) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
929 (set (make-local-variable 'revert-buffer-function) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
930 'vc-dir-revert-buffer-function) |
105293
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
931 (setq list-buffers-directory default-directory) |
8bfe20e0336c
* vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105196
diff
changeset
|
932 (add-to-list 'vc-dir-buffers (current-buffer)) |
96203 | 933 ;; Make sure that if the directory buffer is killed, the update |
934 ;; process running in the background is also killed. | |
935 (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t) | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
936 (vc-dir-refresh))) |
96203 | 937 |
938 (defun vc-dir-headers (backend dir) | |
939 "Display the headers in the *VC dir* buffer. | |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
940 It calls the `dir-extra-headers' backend method to display backend |
96203 | 941 specific headers." |
942 (concat | |
99367
ce0076e88ed4
(vc-dir-headers): Undo previous change.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99361
diff
changeset
|
943 ;; First layout the common headers. |
96203 | 944 (propertize "VC backend : " 'face 'font-lock-type-face) |
945 (propertize (format "%s\n" backend) 'face 'font-lock-variable-name-face) | |
946 (propertize "Working dir: " 'face 'font-lock-type-face) | |
99367
ce0076e88ed4
(vc-dir-headers): Undo previous change.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99361
diff
changeset
|
947 (propertize (format "%s\n" dir) 'face 'font-lock-variable-name-face) |
ce0076e88ed4
(vc-dir-headers): Undo previous change.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99361
diff
changeset
|
948 ;; Then the backend specific ones. |
ce0076e88ed4
(vc-dir-headers): Undo previous change.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99361
diff
changeset
|
949 (vc-call-backend backend 'dir-extra-headers dir) |
ce0076e88ed4
(vc-dir-headers): Undo previous change.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99361
diff
changeset
|
950 "\n")) |
96203 | 951 |
952 (defun vc-dir-refresh-files (files default-state) | |
953 "Refresh some files in the *VC-dir* buffer." | |
954 (let ((def-dir default-directory) | |
955 (backend vc-dir-backend)) | |
956 (vc-set-mode-line-busy-indicator) | |
957 ;; Call the `dir-status-file' backend function. | |
958 ;; `dir-status-file' is supposed to be asynchronous. | |
959 ;; It should compute the results, and then call the function | |
960 ;; passed as an argument in order to update the vc-dir buffer | |
961 ;; with the results. | |
962 (unless (buffer-live-p vc-dir-process-buffer) | |
963 (setq vc-dir-process-buffer | |
964 (generate-new-buffer (format " *VC-%s* tmp status" backend)))) | |
965 (lexical-let ((buffer (current-buffer))) | |
966 (with-current-buffer vc-dir-process-buffer | |
967 (cd def-dir) | |
968 (erase-buffer) | |
969 (vc-call-backend | |
970 backend 'dir-status-files def-dir files default-state | |
971 (lambda (entries &optional more-to-come) | |
972 ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items. | |
973 ;; If MORE-TO-COME is true, then more updates will come from | |
974 ;; the asynchronous process. | |
975 (with-current-buffer buffer | |
976 (vc-dir-update entries buffer) | |
977 (unless more-to-come | |
978 (setq mode-line-process nil) | |
979 ;; Remove the ones that haven't been updated at all. | |
980 ;; Those not-updated are those whose state is nil because the | |
981 ;; file/dir doesn't exist and isn't versioned. | |
982 (ewoc-filter vc-ewoc | |
983 (lambda (info) | |
984 ;; The state for directory entries might | |
985 ;; have been changed to 'up-to-date, | |
986 ;; reset it, othewise it will be removed when doing 'x' | |
987 ;; next time. | |
988 ;; FIXME: There should be a more elegant way to do this. | |
989 (when (and (vc-dir-fileinfo->directory info) | |
990 (eq (vc-dir-fileinfo->state info) | |
991 'up-to-date)) | |
992 (setf (vc-dir-fileinfo->state info) nil)) | |
993 | |
994 (not (vc-dir-fileinfo->needs-update info)))))))))))) | |
995 | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
996 (defun vc-dir-revert-buffer-function (&optional ignore-auto noconfirm) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
997 (vc-dir-refresh)) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
998 |
96203 | 999 (defun vc-dir-refresh () |
1000 "Refresh the contents of the *VC-dir* buffer. | |
1001 Throw an error if another update process is in progress." | |
1002 (interactive) | |
1003 (if (vc-dir-busy) | |
1004 (error "Another update process is in progress, cannot run two at a time") | |
1005 (let ((def-dir default-directory) | |
1006 (backend vc-dir-backend)) | |
1007 (vc-set-mode-line-busy-indicator) | |
1008 ;; Call the `dir-status' backend function. | |
1009 ;; `dir-status' is supposed to be asynchronous. | |
1010 ;; It should compute the results, and then call the function | |
1011 ;; passed as an argument in order to update the vc-dir buffer | |
1012 ;; with the results. | |
1013 | |
1014 ;; Create a buffer that can be used by `dir-status' and call | |
1015 ;; `dir-status' with this buffer as the current buffer. Use | |
1016 ;; `vc-dir-process-buffer' to remember this buffer, so that | |
1017 ;; it can be used later to kill the update process in case it | |
1018 ;; takes too long. | |
1019 (unless (buffer-live-p vc-dir-process-buffer) | |
1020 (setq vc-dir-process-buffer | |
1021 (generate-new-buffer (format " *VC-%s* tmp status" backend)))) | |
96541
d39625535543
(vc-dir-refresh): Only update files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96520
diff
changeset
|
1022 ;; set the needs-update flag on all non-directory entries |
d39625535543
(vc-dir-refresh): Only update files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96520
diff
changeset
|
1023 (ewoc-map (lambda (info) |
d39625535543
(vc-dir-refresh): Only update files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96520
diff
changeset
|
1024 (unless (vc-dir-fileinfo->directory info) |
d39625535543
(vc-dir-refresh): Only update files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96520
diff
changeset
|
1025 (setf (vc-dir-fileinfo->needs-update info) t) nil)) |
96203 | 1026 vc-ewoc) |
1027 (lexical-let ((buffer (current-buffer))) | |
1028 (with-current-buffer vc-dir-process-buffer | |
1029 (cd def-dir) | |
1030 (erase-buffer) | |
1031 (vc-call-backend | |
1032 backend 'dir-status def-dir | |
1033 (lambda (entries &optional more-to-come) | |
1034 ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items. | |
1035 ;; If MORE-TO-COME is true, then more updates will come from | |
1036 ;; the asynchronous process. | |
1037 (with-current-buffer buffer | |
1038 (vc-dir-update entries buffer) | |
1039 (unless more-to-come | |
1040 (let ((remaining | |
1041 (ewoc-collect | |
1042 vc-ewoc 'vc-dir-fileinfo->needs-update))) | |
1043 (if remaining | |
1044 (vc-dir-refresh-files | |
1045 (mapcar 'vc-dir-fileinfo->name remaining) | |
1046 'up-to-date) | |
98471
497018549116
(vc-dir-mode): Don't create the ewoc header here.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97696
diff
changeset
|
1047 (setq mode-line-process nil))))))))) |
497018549116
(vc-dir-mode): Don't create the ewoc header here.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97696
diff
changeset
|
1048 (ewoc-set-hf vc-ewoc (vc-dir-headers backend def-dir) "")))) |
96203 | 1049 |
1050 (defun vc-dir-show-fileentry (file) | |
1051 "Insert an entry for a specific file into the current *VC-dir* listing. | |
1052 This is typically used if the file is up-to-date (or has been added | |
1053 outside of VC) and one wants to do some operation on it." | |
1054 (interactive "fShow file: ") | |
1055 (vc-dir-update (list (list (file-relative-name file) (vc-state file))) (current-buffer))) | |
1056 | |
1057 (defun vc-dir-hide-up-to-date () | |
1058 "Hide up-to-date items from display." | |
1059 (interactive) | |
96390
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1060 (let ((crt (ewoc-nth vc-ewoc -1)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1061 (first (ewoc-nth vc-ewoc 0))) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1062 ;; Go over from the last item to the first and remove the |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1063 ;; up-to-date files and directories with no child files. |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1064 (while (not (eq crt first)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1065 (let* ((data (ewoc-data crt)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1066 (dir (vc-dir-fileinfo->directory data)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1067 (next (ewoc-next vc-ewoc crt)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1068 (prev (ewoc-prev vc-ewoc crt)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1069 ;; ewoc-delete does not work without this... |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1070 (inhibit-read-only t)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1071 (when (or |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1072 ;; Remove directories with no child files. |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1073 (and dir |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1074 (or |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1075 ;; Nothing follows this directory. |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1076 (not next) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1077 ;; Next item is a directory. |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1078 (vc-dir-fileinfo->directory (ewoc-data next)))) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1079 ;; Remove files in the up-to-date state. |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1080 (eq (vc-dir-fileinfo->state data) 'up-to-date)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1081 (ewoc-delete vc-ewoc crt)) |
02d657f45045
* vc-dir.el (vc-dir-hide-up-to-date): Also hide empty directories.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96388
diff
changeset
|
1082 (setq crt prev))))) |
96203 | 1083 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
1084 (defun vc-dir-printer (fileentry) |
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
1085 (vc-call-backend vc-dir-backend 'dir-printer fileentry)) |
96203 | 1086 |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1087 (defun vc-dir-deduce-fileset (&optional state-model-only-files) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1088 (let ((marked (vc-dir-marked-files)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1089 files |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1090 only-files-list |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1091 state |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1092 model) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1093 (if marked |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1094 (progn |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1095 (setq files marked) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1096 (when state-model-only-files |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1097 (setq only-files-list (vc-dir-marked-only-files-and-states)))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1098 (let ((crt (vc-dir-current-file))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1099 (setq files (list crt)) |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
1100 (when state-model-only-files |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1101 (setq only-files-list (vc-dir-child-files-and-states))))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1102 |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1103 (when state-model-only-files |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1104 (setq state (cdar only-files-list)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1105 ;; Check that all files are in a consistent state, since we use that |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1106 ;; state to decide which operation to perform. |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1107 (dolist (crt (cdr only-files-list)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1108 (unless (vc-compatible-state (cdr crt) state) |
102660
ab984696947f
(vc-dir-deduce-fileset): Make the error message more explicit.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
102260
diff
changeset
|
1109 (error "When applying VC operations to multiple files, the files are required\nto be in similar VC states.\n%s in state %s clashes with %s in state %s" |
96256
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1110 (car crt) (cdr crt) (caar only-files-list) state))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1111 (setq only-files-list (mapcar 'car only-files-list)) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1112 (when (and state (not (eq state 'unregistered))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1113 (setq model (vc-checkout-model vc-dir-backend only-files-list)))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1114 (list vc-dir-backend files only-files-list state model))) |
a56e02fe83fc
* vc-dir.el (vc-dir-marked-only-files-and-states): Rename from
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96216
diff
changeset
|
1115 |
96203 | 1116 ;;;###autoload |
96411
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1117 (defun vc-dir (dir &optional backend) |
102929
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1118 "Show the VC status for \"interesting\" files in and below DIR. |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1119 This allows you to mark files and perform VC operations on them. |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1120 The list omits files which are up to date, with no changes in your copy |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1121 or the repository, if there is nothing in particular to say about them. |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1122 |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1123 Preparing the list of file status takes time; when the buffer |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1124 first appears, it has only the first few lines of summary information. |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1125 The file lines appear later. |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1126 |
96411
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1127 Optional second argument BACKEND specifies the VC backend to use. |
102929
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1128 Interactively, a prefix argument means to ask for the backend. |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1129 |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1130 These are the commands available for use in the file status buffer: |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1131 |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1132 \\<vc-dir-mode-map>" |
6be674ea734e
* vc-dir.el (vc-dir): Dox fix.
Richard M. Stallman <rms@gnu.org>
parents:
102660
diff
changeset
|
1133 |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1134 (interactive |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1135 (list |
97118
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1136 ;; When you hit C-x v d in a visited VC file, |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1137 ;; the *vc-dir* buffer visits the directory under its truename; |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1138 ;; therefore it makes sense to always do that. |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1139 ;; Otherwise if you do C-x v d -> C-x C-f -> C-c v d |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1140 ;; you may get a new *vc-dir* buffer, different from the original |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1141 (file-truename (read-file-name "VC status for directory: " |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1142 default-directory default-directory t |
48b4d1b43ea2
(vc-dir): Call file-truename on the dir argument.
Sam Steingold <sds@gnu.org>
parents:
97117
diff
changeset
|
1143 nil #'file-directory-p)) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1144 (if current-prefix-arg |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1145 (intern |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1146 (completing-read |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1147 "Use VC backend: " |
96411
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1148 (mapcar (lambda (b) (list (symbol-name b))) |
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1149 vc-handled-backends) |
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1150 nil t nil nil))))) |
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1151 (unless backend |
31e595cb6c02
(vc-dir): Make backend argument optional and use
Andreas Schwab <schwab@suse.de>
parents:
96390
diff
changeset
|
1152 (setq backend (vc-responsible-backend dir))) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1153 (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir backend)) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1154 (if (derived-mode-p 'vc-dir-mode) |
96203 | 1155 (vc-dir-refresh) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1156 ;; FIXME: find a better way to pass the backend to `vc-dir-mode'. |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1157 (let ((use-vc-backend backend)) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1158 (vc-dir-mode)))) |
96203 | 1159 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
1160 (defun vc-default-dir-extra-headers (backend dir) |
96203 | 1161 ;; Be loud by default to remind people to add code to display |
1162 ;; backend specific headers. | |
1163 ;; XXX: change this to return nil before the release. | |
1164 (concat | |
1165 (propertize "Extra : " 'face 'font-lock-type-face) | |
1166 (propertize "Please add backend specific headers here. It's easy!" | |
1167 'face 'font-lock-warning-face))) | |
1168 | |
101940
dea4466580a6
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101924
diff
changeset
|
1169 (defvar vc-dir-filename-mouse-map |
101924
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
1170 (let ((map (make-sparse-keymap))) |
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
1171 (define-key map [mouse-2] 'vc-dir-find-file-other-window) |
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
1172 map) |
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
1173 "Local keymap for visiting a file.") |
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
1174 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99133
diff
changeset
|
1175 (defun vc-default-dir-printer (backend fileentry) |
96203 | 1176 "Pretty print FILEENTRY." |
1177 ;; If you change the layout here, change vc-dir-move-to-goal-column. | |
101940
dea4466580a6
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101924
diff
changeset
|
1178 ;; VC backends can implement backend specific versions of this |
dea4466580a6
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101924
diff
changeset
|
1179 ;; function. Changes here might need to be reflected in the |
dea4466580a6
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101924
diff
changeset
|
1180 ;; vc-BACKEND-dir-printer functions. |
96203 | 1181 (let* ((isdir (vc-dir-fileinfo->directory fileentry)) |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1182 (state (if isdir "" (vc-dir-fileinfo->state fileentry))) |
96203 | 1183 (filename (vc-dir-fileinfo->name fileentry))) |
1184 (insert | |
1185 (propertize | |
1186 (format "%c" (if (vc-dir-fileinfo->marked fileentry) ?* ? )) | |
1187 'face 'font-lock-type-face) | |
1188 " " | |
1189 (propertize | |
1190 (format "%-20s" state) | |
1191 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) | |
1192 ((memq state '(missing conflict)) 'font-lock-warning-face) | |
1193 (t 'font-lock-variable-name-face)) | |
1194 'mouse-face 'highlight) | |
1195 " " | |
1196 (propertize | |
1197 (format "%s" filename) | |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1198 'face |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1199 (if isdir 'font-lock-comment-delimiter-face 'font-lock-function-name-face) |
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1200 'help-echo |
96388
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
1201 (if isdir |
7ed97437d100
* vc-dir.el (vc-dir): Complete only directory names.
Juanma Barranquero <lekktu@gmail.com>
parents:
96310
diff
changeset
|
1202 "Directory\nVC operations can be applied to it\nmouse-3: Pop-up menu" |
96216
0c3be806e711
(vc-client-object): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96204
diff
changeset
|
1203 "File\nmouse-3: Pop-up menu") |
101924
c1950714465b
(vc-dir-find-file-other-window): Allow mouse events.
Nick Roberts <nickrob@snap.net.nz>
parents:
101718
diff
changeset
|
1204 'mouse-face 'highlight |
101940
dea4466580a6
* vc-dir.el (vc-dir-filename-mouse-map): Rename from vc-dir-mouse-map.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101924
diff
changeset
|
1205 'keymap vc-dir-filename-mouse-map)))) |
96203 | 1206 |
1207 (defun vc-default-extra-status-menu (backend) | |
1208 nil) | |
1209 | |
1210 (defun vc-default-status-fileinfo-extra (backend file) | |
1211 "Default absence of extra information returned for a file." | |
1212 nil) | |
1213 | |
1214 (provide 'vc-dir) | |
1215 | |
96204 | 1216 ;; arch-tag: 0274a2e3-e8e9-4b1a-a73c-e8b9129d5d15 |
96203 | 1217 ;;; vc-dir.el ends here |