annotate lisp/vc-dir.el @ 96204:d4a46d5d6f08

Add arch tagline
author Miles Bader <miles@gnu.org>
date Mon, 23 Jun 2008 00:13:34 +0000
parents 30bbe1648bcf
children 0c3be806e711
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
96203
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1 ;;; vc-dir.el --- Directory status display under VC
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
2
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
3 ;; Copyright (C) 2007, 2008
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
4 ;; Free Software Foundation, Inc.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
5
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
6 ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
7 ;; Keywords: tools
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
8
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
10
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
14 ;; (at your option) any later version.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
15
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
19 ;; GNU General Public License for more details.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
20
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
23
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
24 ;;; Credits:
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
25
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
26 ;; The original VC directory status implementation was based on dired.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
27 ;; This implementation was inspired by PCL-CVS.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
28 ;; Many people contributed comments, ideas and code to this
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
29 ;; implementation. These include:
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
30 ;;
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
31 ;; Alexandre Julliard <julliard@winehq.org>
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
32 ;; Stefan Monnier <monnier@iro.umontreal.ca>
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
33 ;; Tom Tromey <tromey@redhat.com>
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
34
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
35 ;;; Commentary:
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
36 ;;
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
37
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
38 ;;; Todo: see vc.el.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
39
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
40 (require 'vc-hooks)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
41 (require 'vc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
42 (require 'ewoc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
43
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
44 ;;; Code:
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
45 (eval-when-compile
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
46 (require 'cl))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
47
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
48 (defcustom vc-dir-mode-hook nil
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
49 "Normal hook run by `vc-dir-mode'.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
50 See `run-hooks'."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
51 :type 'hook
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
52 :group 'vc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
53
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
54 ;; Used to store information for the files displayed in the directory buffer.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
55 ;; Each item displayed corresponds to one of these defstructs.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
56 (defstruct (vc-dir-fileinfo
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
57 (:copier nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
58 (:type list) ;So we can use `member' on lists of FIs.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
59 (:constructor
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
60 ;; We could define it as an alias for `list'.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
61 vc-dir-create-fileinfo (name state &optional extra marked directory))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
62 (:conc-name vc-dir-fileinfo->))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
63 name ;Keep it as first, for `member'.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
64 state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
65 ;; For storing client-mode specific information.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
66 extra
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
67 marked
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
68 ;; To keep track of not updated files during a global refresh
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
69 needs-update
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
70 ;; To distinguish files and directories.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
71 directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
72
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
73 ;; Used to describe a dispatcher client mode.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
74 (defstruct (vc-client-object
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
75 (:copier nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
76 (:constructor
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
77 vc-create-client-object (name
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
78 headers
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
79 file-to-info
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
80 file-to-state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
81 file-to-extra
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
82 updater
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
83 extra-menu))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
84 (:conc-name vc-client-object->))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
85 name
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
86 headers
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
87 file-to-info
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
88 file-to-state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
89 file-to-extra
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
90 updater
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
91 extra-menu)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
92
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
93 (defvar vc-ewoc nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
94 (defvar vc-dir-process-buffer nil
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
95 "The buffer used for the asynchronous call that computes status.")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
96
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
97 (defun vc-dir-move-to-goal-column ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
98 ;; Used to keep the cursor on the file name column.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
99 (beginning-of-line)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
100 (unless (eolp)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
101 ;; Must be in sync with vc-default-status-printer.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
102 (forward-char 25)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
103
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
104 (defun vc-dir-prepare-status-buffer (bname dir &optional create-new)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
105 "Find a buffer named BNAME showing DIR, or create a new one."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
106 (setq dir (expand-file-name dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
107 (let*
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
108 ;; Look for another buffer name BNAME visiting the same directory.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
109 ((buf (save-excursion
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
110 (unless create-new
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
111 (dolist (buffer (buffer-list))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
112 (set-buffer buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
113 (when (and (vc-dispatcher-browsing)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
114 (string= (expand-file-name default-directory) dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
115 (return buffer)))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
116 (or buf
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
117 ;; Create a new buffer named BNAME.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
118 (with-current-buffer (create-file-buffer bname)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
119 (cd dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
120 (vc-setup-buffer (current-buffer))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
121 ;; Reset the vc-parent-buffer-name so that it does not appear
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
122 ;; in the mode-line.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
123 (setq vc-parent-buffer-name nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
124 (current-buffer)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
125
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
126 (defvar vc-dir-menu-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
127 (let ((map (make-sparse-keymap "VC-dir")))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
128 (define-key map [quit]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
129 '(menu-item "Quit" quit-window
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
130 :help "Quit"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
131 (define-key map [kill]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
132 '(menu-item "Kill Update Command" vc-dir-kill-dir-status-process
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
133 :enable (vc-dir-busy)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
134 :help "Kill the command that updates the directory buffer"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
135 (define-key map [refresh]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
136 '(menu-item "Refresh" vc-dir-refresh
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
137 :enable (not (vc-dir-busy))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
138 :help "Refresh the contents of the directory buffer"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
139 ;; Movement.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
140 (define-key map [sepmv] '("--"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
141 (define-key map [next-line]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
142 '(menu-item "Next line" vc-dir-next-line
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
143 :help "Go to the next line" :keys "n"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
144 (define-key map [previous-line]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
145 '(menu-item "Previous line" vc-dir-previous-line
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
146 :help "Go to the previous line"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
147 ;; Marking.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
148 (define-key map [sepmrk] '("--"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
149 (define-key map [unmark-all]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
150 '(menu-item "Unmark All" vc-dir-unmark-all-files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
151 :help "Unmark all files that are in the same state as the current file\
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
152 \nWith prefix argument unmark all files"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
153 (define-key map [unmark-previous]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
154 '(menu-item "Unmark previous " vc-dir-unmark-file-up
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
155 :help "Move to the previous line and unmark the file"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
156
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
157 (define-key map [mark-all]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
158 '(menu-item "Mark All" vc-dir-mark-all-files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
159 :help "Mark all files that are in the same state as the current file\
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
160 \nWith prefix argument mark all files"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
161 (define-key map [unmark]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
162 '(menu-item "Unmark" vc-dir-unmark
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
163 :help "Unmark the current file or all files in the region"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
164
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
165 (define-key map [mark]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
166 '(menu-item "Mark" vc-dir-mark
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
167 :help "Mark the current file or all files in the region"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
168
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
169 (define-key map [sepopn] '("--"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
170 (define-key map [open-other]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
171 '(menu-item "Open in other window" vc-dir-find-file-other-window
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
172 :help "Find the file on the current line, in another window"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
173 (define-key map [open]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
174 '(menu-item "Open file" vc-dir-find-file
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
175 :help "Find the file on the current line"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
176 map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
177 "Menu for dispatcher status")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
178
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
179 (defvar vc-client-mode)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
180
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
181 ;; This is used so that client modes can add mode-specific menu
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
182 ;; items to vc-dir-menu-map.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
183 (defun vc-dir-menu-map-filter (orig-binding)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
184 (when (and (symbolp orig-binding) (fboundp orig-binding))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
185 (setq orig-binding (indirect-function orig-binding)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
186 (let ((ext-binding
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
187 ;; This may be executed at load-time for tool-bar-local-item-from-menu
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
188 ;; but at that time vc-client-mode is not known (or even bound) yet.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
189 (when (and (boundp 'vc-client-mode) vc-client-mode)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
190 (funcall (vc-client-object->extra-menu vc-client-mode)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
191 (if (null ext-binding)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
192 orig-binding
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
193 (append orig-binding
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
194 '("----")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
195 ext-binding))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
196
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
197 (defvar vc-dir-mode-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
198 (let ((map (make-keymap)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
199 (suppress-keymap map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
200 ;; Marking.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
201 (define-key map "m" 'vc-dir-mark)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
202 (define-key map "M" 'vc-dir-mark-all-files)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
203 (define-key map "u" 'vc-dir-unmark)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
204 (define-key map "U" 'vc-dir-unmark-all-files)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
205 (define-key map "\C-?" 'vc-dir-unmark-file-up)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
206 (define-key map "\M-\C-?" 'vc-dir-unmark-all-files)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
207 ;; Movement.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
208 (define-key map "n" 'vc-dir-next-line)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
209 (define-key map " " 'vc-dir-next-line)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
210 (define-key map "\t" 'vc-dir-next-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
211 (define-key map "p" 'vc-dir-previous-line)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
212 (define-key map [backtab] 'vc-dir-previous-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
213 ;;; Rebind paragraph-movement commands.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
214 (define-key map "\M-}" 'vc-dir-next-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
215 (define-key map "\M-{" 'vc-dir-previous-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
216 (define-key map [C-down] 'vc-dir-next-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
217 (define-key map [C-up] 'vc-dir-previous-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
218 ;; The remainder.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
219 (define-key map "f" 'vc-dir-find-file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
220 (define-key map "\C-m" 'vc-dir-find-file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
221 (define-key map "o" 'vc-dir-find-file-other-window)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
222 (define-key map "q" 'quit-window)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
223 (define-key map "g" 'vc-dir-refresh)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
224 (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
225 (define-key map [down-mouse-3] 'vc-dir-menu)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
226 (define-key map [mouse-2] 'vc-dir-toggle-mark)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
227
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
228 ;; Hook up the menu.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
229 (define-key map [menu-bar vc-dir-mode]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
230 `(menu-item
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
231 ;; This is used so that client modes can add mode-specific
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
232 ;; menu items to vc-dir-menu-map.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
233 "VC-dir" ,vc-dir-menu-map :filter vc-dir-menu-map-filter))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
234 map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
235 "Keymap for directory buffer.")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
236
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
237 (defmacro vc-at-event (event &rest body)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
238 "Evaluate `body' with point located at event-start of `event'.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
239 If `body' uses `event', it should be a variable,
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
240 otherwise it will be evaluated twice."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
241 (let ((posn (make-symbol "vc-at-event-posn")))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
242 `(let ((,posn (event-start ,event)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
243 (save-excursion
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
244 (set-buffer (window-buffer (posn-window ,posn)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
245 (goto-char (posn-point ,posn))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
246 ,@body))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
247
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
248 (defun vc-dir-menu (e)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
249 "Popup the dispatcher status menu."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
250 (interactive "e")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
251 (vc-at-event e (popup-menu vc-dir-menu-map e)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
252
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
253 (defvar vc-dir-tool-bar-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
254 (let ((map (make-sparse-keymap)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
255 (tool-bar-local-item-from-menu 'vc-dir-find-file "open"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
256 map vc-dir-mode-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
257 (tool-bar-local-item "bookmark_add"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
258 'vc-dir-toggle-mark 'vc-dir-toggle-mark map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
259 :help "Toggle mark on current item")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
260 (tool-bar-local-item-from-menu 'vc-dir-previous-line "left-arrow"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
261 map vc-dir-mode-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
262 :rtl "right-arrow")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
263 (tool-bar-local-item-from-menu 'vc-dir-next-line "right-arrow"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
264 map vc-dir-mode-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
265 :rtl "left-arrow")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
266 (tool-bar-local-item-from-menu 'vc-print-log "info"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
267 map vc-dir-mode-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
268 (tool-bar-local-item-from-menu 'vc-dir-refresh "refresh"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
269 map vc-dir-mode-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
270 (tool-bar-local-item-from-menu 'nonincremental-search-forward
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
271 "search" map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
272 (tool-bar-local-item-from-menu 'vc-dir-kill-dir-status-process "cancel"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
273 map vc-dir-mode-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
274 (tool-bar-local-item-from-menu 'quit-window "exit"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
275 map vc-dir-mode-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
276 map))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
277
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
278 (defun vc-dir-node-directory (node)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
279 ;; Compute the directory for NODE.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
280 ;; If it's a directory node, get it from the the node.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
281 (let ((data (ewoc-data node)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
282 (or (vc-dir-fileinfo->directory data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
283 ;; Otherwise compute it from the file name.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
284 (file-name-directory
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
285 (expand-file-name
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
286 (vc-dir-fileinfo->name data))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
287
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
288 (defun vc-dir-update (entries buffer &optional noinsert)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
289 "Update BUFFER's ewoc from the list of ENTRIES.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
290 If NOINSERT, ignore elements on ENTRIES which are not in the ewoc."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
291 ;; Add ENTRIES to the vc-dir buffer BUFFER.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
292 (with-current-buffer buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
293 ;; Insert the entries sorted by name into the ewoc.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
294 ;; We assume the ewoc is sorted too, which should be the
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
295 ;; case if we always add entries with vc-dir-update.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
296 (setq entries
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
297 ;; Sort: first files and then subdirectories.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
298 ;; XXX: this is VERY inefficient, it computes the directory
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
299 ;; names too many times
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
300 (sort entries
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
301 (lambda (entry1 entry2)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
302 (let ((dir1 (file-name-directory (expand-file-name (car entry1))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
303 (dir2 (file-name-directory (expand-file-name (car entry2)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
304 (cond
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
305 ((string< dir1 dir2) t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
306 ((not (string= dir1 dir2)) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
307 ((string< (car entry1) (car entry2))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
308 ;; Insert directory entries in the right places.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
309 (let ((entry (car entries))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
310 (node (ewoc-nth vc-ewoc 0)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
311 ;; Insert . if it is not present.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
312 (unless node
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
313 (let ((rd (file-relative-name default-directory)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
314 (ewoc-enter-last
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
315 vc-ewoc (vc-dir-create-fileinfo
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
316 rd nil nil nil (expand-file-name default-directory))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
317 (setq node (ewoc-nth vc-ewoc 0)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
318
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
319 (while (and entry node)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
320 (let* ((entryfile (car entry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
321 (entrydir (file-name-directory (expand-file-name entryfile)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
322 (nodedir (vc-dir-node-directory node)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
323 (cond
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
324 ;; First try to find the directory.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
325 ((string-lessp nodedir entrydir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
326 (setq node (ewoc-next vc-ewoc node)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
327 ((string-equal nodedir entrydir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
328 ;; Found the directory, find the place for the file name.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
329 (let ((nodefile (vc-dir-fileinfo->name (ewoc-data node))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
330 (cond
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
331 ((string-lessp nodefile entryfile)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
332 (setq node (ewoc-next vc-ewoc node)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
333 ((string-equal nodefile entryfile)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
334 (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
335 (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
336 (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
337 (ewoc-invalidate vc-ewoc node)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
338 (setq entries (cdr entries))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
339 (setq entry (car entries))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
340 (setq node (ewoc-next vc-ewoc node)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
341 (t
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
342 (ewoc-enter-before vc-ewoc node
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
343 (apply 'vc-dir-create-fileinfo entry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
344 (setq entries (cdr entries))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
345 (setq entry (car entries))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
346 (t
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
347 ;; We might need to insert a directory node if the
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
348 ;; previous node was in a different directory.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
349 (let* ((rd (file-relative-name entrydir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
350 (prev-node (ewoc-prev vc-ewoc node))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
351 (prev-dir (vc-dir-node-directory prev-node)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
352 (unless (string-equal entrydir prev-dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
353 (ewoc-enter-before
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
354 vc-ewoc node (vc-dir-create-fileinfo rd nil nil nil entrydir))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
355 ;; Now insert the node itself.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
356 (ewoc-enter-before vc-ewoc node
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
357 (apply 'vc-dir-create-fileinfo entry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
358 (setq entries (cdr entries) entry (car entries))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
359 ;; We're past the last node, all remaining entries go to the end.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
360 (unless (or node noinsert)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
361 (let ((lastdir (vc-dir-node-directory (ewoc-nth vc-ewoc -1))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
362 (dolist (entry entries)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
363 (let ((entrydir (file-name-directory (expand-file-name (car entry)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
364 ;; Insert a directory node if needed.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
365 (unless (string-equal lastdir entrydir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
366 (setq lastdir entrydir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
367 (let ((rd (file-relative-name entrydir)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
368 (ewoc-enter-last
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
369 vc-ewoc (vc-dir-create-fileinfo rd nil nil nil entrydir))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
370 ;; Now insert the node itself.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
371 (ewoc-enter-last vc-ewoc
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
372 (apply 'vc-dir-create-fileinfo entry)))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
373
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
374 (defun vc-dir-busy ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
375 (and (buffer-live-p vc-dir-process-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
376 (get-buffer-process vc-dir-process-buffer)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
377
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
378 (defun vc-dir-kill-dir-status-process ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
379 "Kill the temporary buffer and associated process."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
380 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
381 (when (buffer-live-p vc-dir-process-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
382 (let ((proc (get-buffer-process vc-dir-process-buffer)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
383 (when proc (delete-process proc))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
384 (setq vc-dir-process-buffer nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
385 (setq mode-line-process nil))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
386
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
387 (defun vc-dir-kill-query ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
388 ;; Make sure that when the status buffer is killed the update
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
389 ;; process running in background is also killed.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
390 (if (vc-dir-busy)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
391 (when (y-or-n-p "Status update process running, really kill status buffer? ")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
392 (vc-dir-kill-dir-status-process)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
393 t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
394 t))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
395
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
396 (defun vc-dir-next-line (arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
397 "Go to the next line.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
398 If a prefix argument is given, move by that many lines."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
399 (interactive "p")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
400 (with-no-warnings
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
401 (ewoc-goto-next vc-ewoc arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
402 (vc-dir-move-to-goal-column)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
403
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
404 (defun vc-dir-previous-line (arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
405 "Go to the previous line.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
406 If a prefix argument is given, move by that many lines."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
407 (interactive "p")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
408 (ewoc-goto-prev vc-ewoc arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
409 (vc-dir-move-to-goal-column))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
410
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
411 (defun vc-dir-next-directory ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
412 "Go to the next directory."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
413 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
414 (let ((orig (point)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
415 (if
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
416 (catch 'foundit
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
417 (while t
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
418 (let* ((next (ewoc-next vc-ewoc (ewoc-locate vc-ewoc))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
419 (cond ((not next)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
420 (throw 'foundit t))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
421 (t
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
422 (progn
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
423 (ewoc-goto-node vc-ewoc next)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
424 (vc-dir-move-to-goal-column)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
425 (if (vc-dir-fileinfo->directory (ewoc-data next))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
426 (throw 'foundit nil))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
427 (goto-char orig))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
428
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
429 (defun vc-dir-previous-directory ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
430 "Go to the previous directory."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
431 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
432 (let ((orig (point)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
433 (if
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
434 (catch 'foundit
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
435 (while t
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
436 (let* ((prev (ewoc-prev vc-ewoc (ewoc-locate vc-ewoc))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
437 (cond ((not prev)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
438 (throw 'foundit t))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
439 (t
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
440 (progn
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
441 (ewoc-goto-node vc-ewoc prev)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
442 (vc-dir-move-to-goal-column)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
443 (if (vc-dir-fileinfo->directory (ewoc-data prev))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
444 (throw 'foundit nil))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
445 (goto-char orig))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
446
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
447 (defun vc-dir-mark-unmark (mark-unmark-function)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
448 (if (use-region-p)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
449 (let ((firstl (line-number-at-pos (region-beginning)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
450 (lastl (line-number-at-pos (region-end))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
451 (save-excursion
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
452 (goto-char (region-beginning))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
453 (while (<= (line-number-at-pos) lastl)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
454 (funcall mark-unmark-function))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
455 (funcall mark-unmark-function)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
456
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
457 (defun vc-string-prefix-p (prefix string)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
458 (let ((lpref (length prefix)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
459 (and (>= (length string) lpref)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
460 (eq t (compare-strings prefix nil nil string nil lpref)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
461
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
462 (defun vc-dir-parent-marked-p (arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
463 ;; Return nil if none of the parent directories of arg is marked.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
464 (let* ((argdir (vc-dir-node-directory arg))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
465 (arglen (length argdir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
466 (crt arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
467 data dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
468 ;; Go through the predecessors, checking if any directory that is
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
469 ;; a parent is marked.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
470 (while (setq crt (ewoc-prev vc-ewoc crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
471 (setq data (ewoc-data crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
472 (setq dir (vc-dir-node-directory crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
473 (when (and (vc-dir-fileinfo->directory data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
474 (vc-string-prefix-p dir argdir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
475 (when (vc-dir-fileinfo->marked data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
476 (error "Cannot mark `%s', parent directory `%s' marked"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
477 (vc-dir-fileinfo->name (ewoc-data arg))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
478 (vc-dir-fileinfo->name data)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
479 nil))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
480
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
481 (defun vc-dir-children-marked-p (arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
482 ;; Return nil if none of the children of arg is marked.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
483 (let* ((argdir-re (concat "\\`" (regexp-quote (vc-dir-node-directory arg))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
484 (is-child t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
485 (crt arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
486 data dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
487 (while (and is-child (setq crt (ewoc-next vc-ewoc crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
488 (setq data (ewoc-data crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
489 (setq dir (vc-dir-node-directory crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
490 (if (string-match argdir-re dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
491 (when (vc-dir-fileinfo->marked data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
492 (error "Cannot mark `%s', child `%s' marked"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
493 (vc-dir-fileinfo->name (ewoc-data arg))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
494 (vc-dir-fileinfo->name data)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
495 ;; We are done, we got to an entry that is not a child of `arg'.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
496 (setq is-child nil)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
497 nil))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
498
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
499 (defun vc-dir-mark-file (&optional arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
500 ;; Mark ARG or the current file and move to the next line.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
501 (let* ((crt (or arg (ewoc-locate vc-ewoc)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
502 (file (ewoc-data crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
503 (isdir (vc-dir-fileinfo->directory file)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
504 (when (or (and isdir (not (vc-dir-children-marked-p crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
505 (and (not isdir) (not (vc-dir-parent-marked-p crt))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
506 (setf (vc-dir-fileinfo->marked file) t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
507 (ewoc-invalidate vc-ewoc crt)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
508 (unless (or arg (mouse-event-p last-command-event))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
509 (vc-dir-next-line 1)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
510
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
511 (defun vc-dir-mark ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
512 "Mark the current file or all files in the region.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
513 If the region is active, mark all the files in the region.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
514 Otherwise mark the file on the current line and move to the next
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
515 line."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
516 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
517 (vc-dir-mark-unmark 'vc-dir-mark-file))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
518
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
519 (defun vc-dir-mark-all-files (arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
520 "Mark all files with the same state as the current one.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
521 With a prefix argument mark all files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
522 If the current entry is a directory, mark all child files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
523
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
524 The commands operate on files that are on the same state.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
525 This command is intended to make it easy to select all files that
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
526 share the same state."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
527 (interactive "P")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
528 (if arg
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
529 ;; Mark all files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
530 (progn
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
531 ;; First check that no directory is marked, we can't mark
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
532 ;; files in that case.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
533 (ewoc-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
534 (lambda (filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
535 (when (and (vc-dir-fileinfo->directory filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
536 (vc-dir-fileinfo->marked filearg))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
537 (error "Cannot mark all files, directory `%s' marked"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
538 (vc-dir-fileinfo->name filearg))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
539 vc-ewoc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
540 (ewoc-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
541 (lambda (filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
542 (unless (vc-dir-fileinfo->marked filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
543 (setf (vc-dir-fileinfo->marked filearg) t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
544 t))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
545 vc-ewoc))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
546 (let ((data (ewoc-data (ewoc-locate vc-ewoc))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
547 (if (vc-dir-fileinfo->directory data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
548 ;; It's a directory, mark child files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
549 (let ((crt (ewoc-locate vc-ewoc)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
550 (unless (vc-dir-children-marked-p crt)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
551 (while (setq crt (ewoc-next vc-ewoc crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
552 (let ((crt-data (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
553 (unless (vc-dir-fileinfo->directory crt-data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
554 (setf (vc-dir-fileinfo->marked crt-data) t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
555 (ewoc-invalidate vc-ewoc crt))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
556 ;; It's a file
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
557 (let ((state (vc-dir-fileinfo->state data))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
558 (crt (ewoc-nth vc-ewoc 0)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
559 (while crt
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
560 (let ((crt-data (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
561 (when (and (not (vc-dir-fileinfo->marked crt-data))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
562 (eq (vc-dir-fileinfo->state crt-data) state)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
563 (not (vc-dir-fileinfo->directory crt-data)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
564 (vc-dir-mark-file crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
565 (setq crt (ewoc-next vc-ewoc crt))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
566
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
567 (defun vc-dir-unmark-file ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
568 ;; Unmark the current file and move to the next line.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
569 (let* ((crt (ewoc-locate vc-ewoc))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
570 (file (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
571 (setf (vc-dir-fileinfo->marked file) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
572 (ewoc-invalidate vc-ewoc crt)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
573 (unless (mouse-event-p last-command-event)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
574 (vc-dir-next-line 1))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
575
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
576 (defun vc-dir-unmark ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
577 "Unmark the current file or all files in the region.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
578 If the region is active, unmark all the files in the region.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
579 Otherwise mark the file on the current line and move to the next
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
580 line."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
581 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
582 (vc-dir-mark-unmark 'vc-dir-unmark-file))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
583
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
584 (defun vc-dir-unmark-file-up ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
585 "Move to the previous line and unmark the file."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
586 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
587 ;; If we're on the first line, we won't move up, but we will still
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
588 ;; remove the mark. This seems a bit odd but it is what buffer-menu
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
589 ;; does.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
590 (let* ((prev (ewoc-goto-prev vc-ewoc 1))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
591 (file (ewoc-data prev)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
592 (setf (vc-dir-fileinfo->marked file) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
593 (ewoc-invalidate vc-ewoc prev)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
594 (vc-dir-move-to-goal-column)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
595
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
596 (defun vc-dir-unmark-all-files (arg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
597 "Unmark all files with the same state as the current one.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
598 With a prefix argument unmark all files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
599 If the current entry is a directory, unmark all the child files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
600
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
601 The commands operate on files that are on the same state.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
602 This command is intended to make it easy to deselect all files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
603 that share the same state."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
604 (interactive "P")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
605 (if arg
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
606 (ewoc-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
607 (lambda (filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
608 (when (vc-dir-fileinfo->marked filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
609 (setf (vc-dir-fileinfo->marked filearg) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
610 t))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
611 vc-ewoc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
612 (let* ((crt (ewoc-locate vc-ewoc))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
613 (data (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
614 (if (vc-dir-fileinfo->directory data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
615 ;; It's a directory, unmark child files.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
616 (while (setq crt (ewoc-next vc-ewoc crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
617 (let ((crt-data (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
618 (unless (vc-dir-fileinfo->directory crt-data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
619 (setf (vc-dir-fileinfo->marked crt-data) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
620 (ewoc-invalidate vc-ewoc crt))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
621 ;; It's a file
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
622 (let ((crt-state (vc-dir-fileinfo->state (ewoc-data crt))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
623 (ewoc-map
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
624 (lambda (filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
625 (when (and (vc-dir-fileinfo->marked filearg)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
626 (eq (vc-dir-fileinfo->state filearg) crt-state))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
627 (setf (vc-dir-fileinfo->marked filearg) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
628 t))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
629 vc-ewoc))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
630
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
631 (defun vc-dir-toggle-mark-file ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
632 (let* ((crt (ewoc-locate vc-ewoc))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
633 (file (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
634 (if (vc-dir-fileinfo->marked file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
635 (vc-dir-unmark-file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
636 (vc-dir-mark-file))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
637
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
638 (defun vc-dir-toggle-mark (e)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
639 (interactive "e")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
640 (vc-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
641
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
642 (defun vc-dir-delete-file ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
643 "Delete the marked files, or the current file if no marks."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
644 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
645 (mapc 'vc-delete-file (or (vc-dir-marked-files)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
646 (list (vc-dir-current-file)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
647
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
648 (defun vc-dir-find-file ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
649 "Find the file on the current line."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
650 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
651 (find-file (vc-dir-current-file)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
652
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
653 (defun vc-dir-find-file-other-window ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
654 "Find the file on the current line, in another window."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
655 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
656 (find-file-other-window (vc-dir-current-file)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
657
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
658 (defun vc-dir-current-file ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
659 (let ((node (ewoc-locate vc-ewoc)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
660 (unless node
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
661 (error "No file available"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
662 (expand-file-name (vc-dir-fileinfo->name (ewoc-data node)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
663
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
664 (defun vc-dir-marked-files ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
665 "Return the list of marked files."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
666 (mapcar
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
667 (lambda (elem) (expand-file-name (vc-dir-fileinfo->name elem)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
668 (ewoc-collect vc-ewoc 'vc-dir-fileinfo->marked)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
669
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
670 (defun vc-dir-marked-only-files ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
671 "Return the list of marked files, for marked directories return child files."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
672 (let ((crt (ewoc-nth vc-ewoc 0))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
673 result)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
674 (while crt
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
675 (let ((crt-data (ewoc-data crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
676 (if (vc-dir-fileinfo->marked crt-data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
677 ;; FIXME: use vc-dir-child-files here instead of duplicating it.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
678 (if (vc-dir-fileinfo->directory crt-data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
679 (let* ((dir (vc-dir-fileinfo->directory crt-data))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
680 (dirlen (length dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
681 data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
682 (while
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
683 (and (setq crt (ewoc-next vc-ewoc crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
684 (vc-string-prefix-p dir
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
685 (progn
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
686 (setq data (ewoc-data crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
687 (vc-dir-node-directory crt))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
688 (unless (vc-dir-fileinfo->directory data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
689 (push (expand-file-name (vc-dir-fileinfo->name data)) result))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
690 (push (expand-file-name (vc-dir-fileinfo->name crt-data)) result)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
691 (setq crt (ewoc-next vc-ewoc crt)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
692 (setq crt (ewoc-next vc-ewoc crt)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
693 result))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
694
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
695 (defun vc-dir-child-files ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
696 "Return the list of child files for the current entry if it's a directory.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
697 If it is a file, return the file itself."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
698 (let* ((crt (ewoc-locate vc-ewoc))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
699 (crt-data (ewoc-data crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
700 result)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
701 (if (vc-dir-fileinfo->directory crt-data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
702 (let* ((dir (vc-dir-fileinfo->directory crt-data))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
703 (dirlen (length dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
704 data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
705 (while
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
706 (and (setq crt (ewoc-next vc-ewoc crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
707 (vc-string-prefix-p dir (progn
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
708 (setq data (ewoc-data crt))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
709 (vc-dir-node-directory crt))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
710 (unless (vc-dir-fileinfo->directory data)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
711 (push (expand-file-name (vc-dir-fileinfo->name data)) result))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
712 (push (expand-file-name (vc-dir-fileinfo->name crt-data)) result))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
713 result))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
714
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
715 (defun vc-dir-resynch-file (&optional fname)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
716 "Update the entries for FILE in any directory buffers that list it."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
717 (let ((file (or fname (expand-file-name buffer-file-name))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
718 (if (file-directory-p file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
719 ;; FIXME: Maybe this should never happen?
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
720 ;; FIXME: But it is useful to update the state of a directory
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
721 ;; (more precisely the files in the directory) after some VC
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
722 ;; operations.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
723 nil
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
724 (let ((found-vc-dir-buf nil))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
725 (save-excursion
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
726 (dolist (status-buf (buffer-list))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
727 (set-buffer status-buf)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
728 ;; look for a vc-dir buffer that might show this file.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
729 (when (derived-mode-p 'vc-dir-mode)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
730 (setq found-vc-dir-buf t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
731 (let ((ddir (expand-file-name default-directory)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
732 (when (vc-string-prefix-p ddir file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
733 (let*
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
734 ;; FIXME: Any reason we don't use file-relative-name?
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
735 ((file-short (substring file (length ddir)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
736 (state (funcall (vc-client-object->file-to-state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
737 vc-client-mode)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
738 file))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
739 (extra (funcall (vc-client-object->file-to-extra
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
740 vc-client-mode)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
741 file))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
742 (entry
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
743 (list file-short state extra)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
744 (vc-dir-update (list entry) status-buf))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
745 ;; We didn't find any vc-dir buffers, remove the hook, it is
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
746 ;; not needed.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
747 (unless found-vc-dir-buf
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
748 (remove-hook 'after-save-hook 'vc-dir-resynch-file)))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
749
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
750 (defun vc-dir-mode (client-object)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
751 "Major mode for dispatcher directory buffers.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
752 Marking/Unmarking key bindings and actions:
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
753 m - marks a file/directory or if the region is active, mark all the files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
754 in region.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
755 Restrictions: - a file cannot be marked if any parent directory is marked
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
756 - a directory cannot be marked if any child file or
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
757 directory is marked
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
758 u - marks a file/directory or if the region is active, unmark all the files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
759 in region.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
760 M - if the cursor is on a file: mark all the files with the same state as
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
761 the current file
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
762 - if the cursor is on a directory: mark all child files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
763 - with a prefix argument: mark all files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
764 U - if the cursor is on a file: unmark all the files with the same state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
765 as the current file
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
766 - if the cursor is on a directory: unmark all child files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
767 - with a prefix argument: unmark all files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
768
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
769
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
770 \\{vc-dir-mode-map}"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
771 (setq mode-name (vc-client-object->name client-object))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
772 (setq major-mode 'vc-dir-mode)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
773 (setq buffer-read-only t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
774 (use-local-map vc-dir-mode-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
775 (if (boundp 'tool-bar-map)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
776 (set (make-local-variable 'tool-bar-map) vc-dir-tool-bar-map))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
777 (set (make-local-variable 'vc-client-mode) client-object)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
778 (let ((buffer-read-only nil))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
779 (erase-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
780 (set (make-local-variable 'vc-dir-process-buffer) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
781 (set (make-local-variable 'vc-ewoc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
782 (ewoc-create (vc-client-object->file-to-info client-object)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
783 (vc-client-object->headers client-object)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
784 (add-hook 'after-save-hook 'vc-dir-resynch-file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
785 ;; Make sure that if the directory buffer is killed, the update
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
786 ;; process running in the background is also killed.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
787 (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
788 (funcall (vc-client-object->updater client-object)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
789 (run-hooks 'vc-dir-mode-hook))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
790
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
791 (put 'vc-dir-mode 'mode-class 'special)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
792
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
793 (defvar vc-dir-backend nil
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
794 "The backend used by the current *vc-dir* buffer.")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
795
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
796 (defun vc-dir-headers (backend dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
797 "Display the headers in the *VC dir* buffer.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
798 It calls the `status-extra-headers' backend method to display backend
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
799 specific headers."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
800 (concat
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
801 (propertize "VC backend : " 'face 'font-lock-type-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
802 (propertize (format "%s\n" backend) 'face 'font-lock-variable-name-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
803 (propertize "Working dir: " 'face 'font-lock-type-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
804 (propertize (format "%s\n" dir) 'face 'font-lock-variable-name-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
805 (vc-call-backend backend 'status-extra-headers dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
806 "\n"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
807
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
808 (defun vc-dir-refresh-files (files default-state)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
809 "Refresh some files in the *VC-dir* buffer."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
810 (let ((def-dir default-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
811 (backend vc-dir-backend))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
812 (vc-set-mode-line-busy-indicator)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
813 ;; Call the `dir-status-file' backend function.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
814 ;; `dir-status-file' is supposed to be asynchronous.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
815 ;; It should compute the results, and then call the function
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
816 ;; passed as an argument in order to update the vc-dir buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
817 ;; with the results.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
818 (unless (buffer-live-p vc-dir-process-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
819 (setq vc-dir-process-buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
820 (generate-new-buffer (format " *VC-%s* tmp status" backend))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
821 (lexical-let ((buffer (current-buffer)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
822 (with-current-buffer vc-dir-process-buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
823 (cd def-dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
824 (erase-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
825 (vc-call-backend
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
826 backend 'dir-status-files def-dir files default-state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
827 (lambda (entries &optional more-to-come)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
828 ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
829 ;; If MORE-TO-COME is true, then more updates will come from
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
830 ;; the asynchronous process.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
831 (with-current-buffer buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
832 (vc-dir-update entries buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
833 (unless more-to-come
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
834 (setq mode-line-process nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
835 ;; Remove the ones that haven't been updated at all.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
836 ;; Those not-updated are those whose state is nil because the
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
837 ;; file/dir doesn't exist and isn't versioned.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
838 (ewoc-filter vc-ewoc
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
839 (lambda (info)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
840 ;; The state for directory entries might
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
841 ;; have been changed to 'up-to-date,
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
842 ;; reset it, othewise it will be removed when doing 'x'
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
843 ;; next time.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
844 ;; FIXME: There should be a more elegant way to do this.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
845 (when (and (vc-dir-fileinfo->directory info)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
846 (eq (vc-dir-fileinfo->state info)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
847 'up-to-date))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
848 (setf (vc-dir-fileinfo->state info) nil))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
849
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
850 (not (vc-dir-fileinfo->needs-update info))))))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
851
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
852 (defun vc-dir-refresh ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
853 "Refresh the contents of the *VC-dir* buffer.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
854 Throw an error if another update process is in progress."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
855 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
856 (if (vc-dir-busy)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
857 (error "Another update process is in progress, cannot run two at a time")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
858 (let ((def-dir default-directory)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
859 (backend vc-dir-backend))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
860 (vc-set-mode-line-busy-indicator)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
861 ;; Call the `dir-status' backend function.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
862 ;; `dir-status' is supposed to be asynchronous.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
863 ;; It should compute the results, and then call the function
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
864 ;; passed as an argument in order to update the vc-dir buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
865 ;; with the results.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
866
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
867 ;; Create a buffer that can be used by `dir-status' and call
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
868 ;; `dir-status' with this buffer as the current buffer. Use
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
869 ;; `vc-dir-process-buffer' to remember this buffer, so that
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
870 ;; it can be used later to kill the update process in case it
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
871 ;; takes too long.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
872 (unless (buffer-live-p vc-dir-process-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
873 (setq vc-dir-process-buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
874 (generate-new-buffer (format " *VC-%s* tmp status" backend))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
875 ;; set the needs-update flag on all entries
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
876 (ewoc-map (lambda (info) (setf (vc-dir-fileinfo->needs-update info) t) nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
877 vc-ewoc)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
878 (lexical-let ((buffer (current-buffer)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
879 (with-current-buffer vc-dir-process-buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
880 (cd def-dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
881 (erase-buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
882 (vc-call-backend
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
883 backend 'dir-status def-dir
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
884 (lambda (entries &optional more-to-come)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
885 ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
886 ;; If MORE-TO-COME is true, then more updates will come from
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
887 ;; the asynchronous process.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
888 (with-current-buffer buffer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
889 (vc-dir-update entries buffer)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
890 (unless more-to-come
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
891 (let ((remaining
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
892 (ewoc-collect
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
893 vc-ewoc 'vc-dir-fileinfo->needs-update)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
894 (if remaining
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
895 (vc-dir-refresh-files
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
896 (mapcar 'vc-dir-fileinfo->name remaining)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
897 'up-to-date)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
898 (setq mode-line-process nil))))))))))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
899
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
900 (defun vc-dir-show-fileentry (file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
901 "Insert an entry for a specific file into the current *VC-dir* listing.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
902 This is typically used if the file is up-to-date (or has been added
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
903 outside of VC) and one wants to do some operation on it."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
904 (interactive "fShow file: ")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
905 (vc-dir-update (list (list (file-relative-name file) (vc-state file))) (current-buffer)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
906
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
907 (defun vc-dir-hide-up-to-date ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
908 "Hide up-to-date items from display."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
909 (interactive)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
910 (ewoc-filter
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
911 vc-ewoc
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
912 (lambda (crt) (not (eq (vc-dir-fileinfo->state crt) 'up-to-date)))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
913
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
914 ;; FIXME: Replace these with a more efficient dispatch
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
915
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
916 (defun vc-generic-status-printer (fileentry)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
917 (vc-call-backend vc-dir-backend 'status-printer fileentry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
918
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
919 (defun vc-generic-state (file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
920 (vc-call-backend vc-dir-backend 'state file))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
921
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
922 (defun vc-generic-status-fileinfo-extra (file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
923 (vc-call-backend vc-dir-backend 'status-fileinfo-extra file))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
924
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
925 (defun vc-dir-extra-menu ()
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
926 (vc-call-backend vc-dir-backend 'extra-status-menu))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
927
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
928 (defun vc-make-backend-object (file-or-dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
929 "Create the backend capability object needed by vc-dispatcher."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
930 (vc-create-client-object
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
931 "VC dir"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
932 (vc-dir-headers vc-dir-backend file-or-dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
933 #'vc-generic-status-printer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
934 #'vc-generic-state
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
935 #'vc-generic-status-fileinfo-extra
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
936 #'vc-dir-refresh
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
937 #'vc-dir-extra-menu))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
938
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
939 ;;;###autoload
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
940 (defun vc-dir (dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
941 "Show the VC status for DIR."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
942 (interactive "DVC status for directory: ")
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
943 (pop-to-buffer (vc-dir-prepare-status-buffer "*vc-dir*" dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
944 (if (and (derived-mode-p 'vc-dir-mode) (boundp 'client-object))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
945 (vc-dir-refresh)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
946 ;; Otherwise, initialize a new view using the dispatcher layer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
947 (progn
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
948 (set (make-local-variable 'vc-dir-backend) (vc-responsible-backend dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
949 ;; Build a capability object and hand it to the dispatcher initializer
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
950 (vc-dir-mode (vc-make-backend-object dir))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
951 ;; FIXME: Make a derived-mode instead.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
952 ;; Add VC-specific keybindings
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
953 (let ((map (current-local-map)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
954 (define-key map "v" 'vc-next-action) ;; C-x v v
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
955 (define-key map "=" 'vc-diff) ;; C-x v =
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
956 (define-key map "i" 'vc-register) ;; C-x v i
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
957 (define-key map "+" 'vc-update) ;; C-x v +
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
958 (define-key map "l" 'vc-print-log) ;; C-x v l
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
959 ;; More confusing than helpful, probably
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
960 ;(define-key map "R" 'vc-revert) ;; u is taken by dispatcher unmark.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
961 ;(define-key map "A" 'vc-annotate) ;; g is taken by dispatcher refresh
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
962 (define-key map "x" 'vc-dir-hide-up-to-date))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
963 )
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
964 ;; FIXME: Needs to alter a buffer-local map, otherwise clients may clash
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
965 (let ((map vc-dir-menu-map))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
966 ;; VC info details
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
967 (define-key map [sepvcdet] '("--"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
968 (define-key map [remup]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
969 '(menu-item "Hide up-to-date" vc-dir-hide-up-to-date
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
970 :help "Hide up-to-date items from display"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
971 ;; FIXME: This needs a key binding. And maybe a better name
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
972 ;; ("Insert" like PCL-CVS uses does not sound that great either)...
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
973 (define-key map [ins]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
974 '(menu-item "Show File" vc-dir-show-fileentry
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
975 :help "Show a file in the VC status listing even though it might be up to date"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
976 (define-key map [annotate]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
977 '(menu-item "Annotate" vc-annotate
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
978 :help "Display the edit history of the current file using colors"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
979 (define-key map [diff]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
980 '(menu-item "Compare with Base Version" vc-diff
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
981 :help "Compare file set with the base version"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
982 (define-key map [log]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
983 '(menu-item "Show history" vc-print-log
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
984 :help "List the change log of the current file set in a window"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
985 ;; VC commands.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
986 (define-key map [sepvccmd] '("--"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
987 (define-key map [update]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
988 '(menu-item "Update to latest version" vc-update
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
989 :help "Update the current fileset's files to their tip revisions"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
990 (define-key map [revert]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
991 '(menu-item "Revert to base version" vc-revert
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
992 :help "Revert working copies of the selected fileset to their repository contents."))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
993 (define-key map [next-action]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
994 ;; FIXME: This really really really needs a better name!
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
995 ;; And a key binding too.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
996 '(menu-item "Check In/Out" vc-next-action
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
997 :help "Do the next logical version control operation on the current fileset"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
998 (define-key map [register]
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
999 '(menu-item "Register" vc-dir-register
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1000 :help "Register file set into the version control system"))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1001 )))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1002
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1003 (defun vc-default-status-extra-headers (backend dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1004 ;; Be loud by default to remind people to add code to display
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1005 ;; backend specific headers.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1006 ;; XXX: change this to return nil before the release.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1007 (concat
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1008 (propertize "Extra : " 'face 'font-lock-type-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1009 (propertize "Please add backend specific headers here. It's easy!"
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1010 'face 'font-lock-warning-face)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1011
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1012 (defun vc-default-status-printer (backend fileentry)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1013 "Pretty print FILEENTRY."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1014 ;; If you change the layout here, change vc-dir-move-to-goal-column.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1015 (let* ((isdir (vc-dir-fileinfo->directory fileentry))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1016 (state (if isdir 'DIRECTORY (vc-dir-fileinfo->state fileentry)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1017 (filename (vc-dir-fileinfo->name fileentry)))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1018 ;; FIXME: Backends that want to print the state in a different way
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1019 ;; can do it by defining the `status-printer' function. Using
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1020 ;; `prettify-state-info' adds two extra vc-calls per item, which
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1021 ;; is too expensive.
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1022 ;;(prettified (if isdir state (vc-call-backend backend 'prettify-state-info filename))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1023 (insert
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1024 (propertize
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1025 (format "%c" (if (vc-dir-fileinfo->marked fileentry) ?* ? ))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1026 'face 'font-lock-type-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1027 " "
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1028 (propertize
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1029 (format "%-20s" state)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1030 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1031 ((memq state '(missing conflict)) 'font-lock-warning-face)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1032 (t 'font-lock-variable-name-face))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1033 'mouse-face 'highlight)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1034 " "
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1035 (propertize
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1036 (format "%s" filename)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1037 'face 'font-lock-function-name-face
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1038 'mouse-face 'highlight))))
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1039
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1040 (defun vc-default-extra-status-menu (backend)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1041 nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1042
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1043 (defun vc-default-status-fileinfo-extra (backend file)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1044 "Default absence of extra information returned for a file."
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1045 nil)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1046
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1047 (provide 'vc-dir)
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1048
96204
d4a46d5d6f08 Add arch tagline
Miles Bader <miles@gnu.org>
parents: 96203
diff changeset
1049 ;; arch-tag: 0274a2e3-e8e9-4b1a-a73c-e8b9129d5d15
96203
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents:
diff changeset
1050 ;;; vc-dir.el ends here