Mercurial > emacs
annotate lisp/vc-dispatcher.el @ 94571:61cca370b8f5
vc-dispatcher layer separation.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Sat, 03 May 2008 07:06:34 +0000 |
parents | |
children | 3bdffe280ad3 |
rev | line source |
---|---|
94571
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1 ;;; vc-dispatcher.el -- generic command-dispatcher facility. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
2 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
3 ;; Copyright (C) 2008 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
5 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
6 ;; Author: FSF (see below for full credits) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
7 ;; Maintainer: Eric S. Raymond <esr@thyrsus.com> |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
8 ;; Keywords: tools |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
9 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
10 ;; This file is part of GNU Emacs. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
11 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
14 ;; the Free Software Foundation; either version 3, or (at your option) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
15 ;; any later version. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
16 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
20 ;; GNU General Public License for more details. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
21 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
25 ;; Boston, MA 02110-1301, USA. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
26 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
27 ;;; Credits: |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
28 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
29 ;; Designed and implemented by Eric S. Raymond, originally as part of VC mode. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
30 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
31 ;;; Commentary: |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
32 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
33 ;; Goals: |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
34 ;; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
35 ;; There is a class of front-ending problems that Emacs might be used |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
36 ;; to address that involves selecting sets of files, or possibly |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
37 ;; directories, and passing the selection set to slave commands. The |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
38 ;; prototypical example, from which this code is derived, is talking |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
39 ;; to version-control systems. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
40 ;; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
41 ;; vc-dispatcher.el is written to decouple the UI issues in such front |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
42 ;; ends from their application-specific logic. It also provides a |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
43 ;; service layer for running the slave commands either synchronously |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
44 ;; or asynchronously and managing the message/error logs from the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
45 ;; command runs. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
46 ;; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
47 ;; Similar UI problems can be expected to come up in applications |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
48 ;; areas other than VCSes; IDEs and document search are two obvious ones. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
49 ;; This mode is intended to ensure that the Emacs interfaces for all such |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
50 ;; beasts are consistent and carefully designed. But even if nothing |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
51 ;; but VC ever uses it, getting the layer separation right will be |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
52 ;; a valuable thing. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
53 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
54 ;; Dispatcher's universe: |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
55 ;; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
56 ;; The universe consists of the file tree rooted at the current |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
57 ;; directory. The dispatcher's upper layer deduces some subset |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
58 ;; of the file tree from the state of the currently visited buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
59 ;; and returns that subset, presumably to a client mode. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
60 ;; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
61 ;; The user may be attempting to select one of three contexts: an |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
62 ;; explicitly selected fileset, the current working directory, or a |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
63 ;; global (null) context. The user may be looking at either of two |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
64 ;; different views; a buffer visiting a file, or a directory buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
65 ;; generated by vc-dispatcher. The main UI problem connected with |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
66 ;; this mode is that the user may need to be able to select any of |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
67 ;; these three contexts from either view. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
68 ;; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
69 ;; The lower layer of this mode runs commands in subprocesses, either |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
70 ;; synchronously or asynchronously. Commands may be launched in one |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
71 ;; of two ways: they may be run immediately, or the calling mode can |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
72 ;; create a closure associated with a text-entry buffer, to be |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
73 ;; executed when the user types C-c to ship the buffer contents. In |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
74 ;; either case the command messages and error (if any) will remain |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
75 ;; available in a status buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
76 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
77 (provide 'vc-dispatcher) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
78 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
79 (eval-when-compile |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
80 (require 'cl) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
81 (require 'dired) ; for dired-map-over-marks macro |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
82 (require 'dired-aux)) ; for dired-kill-{line,tree} |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
83 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
84 (defcustom vc-delete-logbuf-window t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
85 "If non-nil, delete the *VC-log* buffer and window after each logical action. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
86 If nil, bury that buffer instead. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
87 This is most useful if you have multiple windows on a frame and would like to |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
88 preserve the setting." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
89 :type 'boolean |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
90 :group 'vc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
91 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
92 (defcustom vc-command-messages nil |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
93 "If non-nil, display run messages from back-end commands." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
94 :type 'boolean |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
95 :group 'vc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
96 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
97 (defcustom vc-dired-listing-switches "-al" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
98 "Switches passed to `ls' for vc-dired. MUST contain the `l' option." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
99 :type 'string |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
100 :group 'vc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
101 :version "21.1") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
102 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
103 (defcustom vc-dired-recurse t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
104 "If non-nil, show directory trees recursively in VC Dired." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
105 :type 'boolean |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
106 :group 'vc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
107 :version "20.3") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
108 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
109 (defcustom vc-dired-terse-display t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
110 "If non-nil, show only locked or locally modified files in VC Dired." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
111 :type 'boolean |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
112 :group 'vc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
113 :version "20.3") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
114 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
115 (defcustom vc-dir-mode-hook nil |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
116 "Normal hook run by `vc-dir-mode'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
117 See `run-hooks'." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
118 :type 'hook |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
119 :group 'vc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
120 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
121 (defvar vc-log-fileset) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
122 (defvar vc-dired-mode nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
123 (make-variable-buffer-local 'vc-dired-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
124 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
125 ;; Common command execution logic |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
126 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
127 (defun vc-process-filter (p s) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
128 "An alternative output filter for async process P. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
129 One difference with the default filter is that this inserts S after markers. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
130 Another is that undo information is not kept." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
131 (let ((buffer (process-buffer p))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
132 (when (buffer-live-p buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
133 (with-current-buffer buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
134 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
135 (let ((buffer-undo-list t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
136 (inhibit-read-only t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
137 (goto-char (process-mark p)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
138 (insert s) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
139 (set-marker (process-mark p) (point)))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
140 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
141 (defun vc-setup-buffer (&optional buf) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
142 "Prepare BUF for executing a VC command and make it current. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
143 BUF defaults to \"*vc*\", can be a string and will be created if necessary." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
144 (unless buf (setq buf "*vc*")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
145 (let ((camefrom (current-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
146 (olddir default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
147 (set-buffer (get-buffer-create buf)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
148 (kill-all-local-variables) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
149 (set (make-local-variable 'vc-parent-buffer) camefrom) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
150 (set (make-local-variable 'vc-parent-buffer-name) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
151 (concat " from " (buffer-name camefrom))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
152 (setq default-directory olddir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
153 (let ((buffer-undo-list t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
154 (inhibit-read-only t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
155 (erase-buffer)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
156 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
157 (defvar vc-sentinel-movepoint) ;Dynamically scoped. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
158 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
159 (defun vc-process-sentinel (p s) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
160 (let ((previous (process-get p 'vc-previous-sentinel)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
161 (buf (process-buffer p))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
162 ;; Impatient users sometime kill "slow" buffers; check liveness |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
163 ;; to avoid "error in process sentinel: Selecting deleted buffer". |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
164 (when (buffer-live-p buf) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
165 (when previous (funcall previous p s)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
166 (with-current-buffer buf |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
167 (setq mode-line-process |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
168 (let ((status (process-status p))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
169 ;; Leave mode-line uncluttered, normally. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
170 (unless (eq 'exit status) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
171 (format " (%s)" status)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
172 (let (vc-sentinel-movepoint) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
173 ;; Normally, we want async code such as sentinels to not move point. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
174 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
175 (goto-char (process-mark p)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
176 (let ((cmds (process-get p 'vc-sentinel-commands))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
177 (process-put p 'vc-sentinel-commands nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
178 (dolist (cmd cmds) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
179 ;; Each sentinel may move point and the next one should be run |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
180 ;; at that new point. We could get the same result by having |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
181 ;; each sentinel read&set process-mark, but since `cmd' needs |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
182 ;; to work both for async and sync processes, this would be |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
183 ;; difficult to achieve. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
184 (vc-exec-after cmd)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
185 ;; But sometimes the sentinels really want to move point. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
186 (when vc-sentinel-movepoint |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
187 (let ((win (get-buffer-window (current-buffer) 0))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
188 (if (not win) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
189 (goto-char vc-sentinel-movepoint) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
190 (with-selected-window win |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
191 (goto-char vc-sentinel-movepoint)))))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
192 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
193 (defun vc-set-mode-line-busy-indicator () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
194 (setq mode-line-process |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
195 (concat " " (propertize "[waiting...]" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
196 'face 'mode-line-emphasis |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
197 'help-echo |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
198 "A VC command is in progress in this buffer")))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
199 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
200 (defun vc-exec-after (code) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
201 "Eval CODE when the current buffer's process is done. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
202 If the current buffer has no process, just evaluate CODE. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
203 Else, add CODE to the process' sentinel." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
204 (let ((proc (get-buffer-process (current-buffer)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
205 (cond |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
206 ;; If there's no background process, just execute the code. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
207 ;; We used to explicitly call delete-process on exited processes, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
208 ;; but this led to timing problems causing process output to be |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
209 ;; lost. Terminated processes get deleted automatically |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
210 ;; anyway. -- cyd |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
211 ((or (null proc) (eq (process-status proc) 'exit)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
212 ;; Make sure we've read the process's output before going further. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
213 (when proc (accept-process-output proc)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
214 (eval code)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
215 ;; If a process is running, add CODE to the sentinel |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
216 ((eq (process-status proc) 'run) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
217 (vc-set-mode-line-busy-indicator) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
218 (let ((previous (process-sentinel proc))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
219 (unless (eq previous 'vc-process-sentinel) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
220 (process-put proc 'vc-previous-sentinel previous)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
221 (set-process-sentinel proc 'vc-process-sentinel)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
222 (process-put proc 'vc-sentinel-commands |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
223 ;; We keep the code fragments in the order given |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
224 ;; so that vc-diff-finish's message shows up in |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
225 ;; the presence of non-nil vc-command-messages. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
226 (append (process-get proc 'vc-sentinel-commands) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
227 (list code)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
228 (t (error "Unexpected process state")))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
229 nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
230 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
231 (defvar vc-post-command-functions nil |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
232 "Hook run at the end of `vc-do-command'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
233 Each function is called inside the buffer in which the command was run |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
234 and is passed 3 arguments: the COMMAND, the FILES and the FLAGS.") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
235 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
236 (defvar w32-quote-process-args) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
237 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
238 (defun vc-delistify (filelist) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
239 "Smash a FILELIST into a file list string suitable for info messages." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
240 ;; FIXME what about file names with spaces? |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
241 (if (not filelist) "." (mapconcat 'identity filelist " "))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
242 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
243 ;;;###autoload |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
244 (defun vc-do-command (buffer okstatus command file-or-list &rest flags) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
245 "Execute a VC command, notifying user and checking for errors. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
246 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
247 current buffer if BUFFER is t. If the destination buffer is not |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
248 already current, set it up properly and erase it. The command is |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
249 considered successful if its exit status does not exceed OKSTATUS (if |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
250 OKSTATUS is nil, that means to ignore error status, if it is `async', that |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
251 means not to wait for termination of the subprocess; if it is t it means to |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
252 ignore all execution errors). FILE-OR-LIST is the name of a working file; |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
253 it may be a list of files or be nil (to execute commands that don't expect |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
254 a file name or set of files). If an optional list of FLAGS is present, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
255 that is inserted into the command line before the filename." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
256 ;; FIXME: file-relative-name can return a bogus result because |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
257 ;; it doesn't look at the actual file-system to see if symlinks |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
258 ;; come into play. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
259 (let* ((files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
260 (mapcar (lambda (f) (file-relative-name (expand-file-name f))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
261 (if (listp file-or-list) file-or-list (list file-or-list)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
262 (full-command |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
263 ;; What we're doing here is preparing a version of the command |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
264 ;; for display in a debug-progess message. If it's fewer than |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
265 ;; 20 characters display the entire command (without trailing |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
266 ;; newline). Otherwise display the first 20 followed by an ellipsis. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
267 (concat (if (string= (substring command -1) "\n") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
268 (substring command 0 -1) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
269 command) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
270 " " |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
271 (vc-delistify (mapcar (lambda (s) (if (> (length s) 20) (concat (substring s 0 2) "...") s)) flags)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
272 " " (vc-delistify files)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
273 (save-current-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
274 (unless (or (eq buffer t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
275 (and (stringp buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
276 (string= (buffer-name) buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
277 (eq buffer (current-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
278 (vc-setup-buffer buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
279 ;; If there's some previous async process still running, just kill it. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
280 (let ((oldproc (get-buffer-process (current-buffer)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
281 ;; If we wanted to wait for oldproc to finish before doing |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
282 ;; something, we'd have used vc-eval-after. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
283 ;; Use `delete-process' rather than `kill-process' because we don't |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
284 ;; want any of its output to appear from now on. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
285 (if oldproc (delete-process oldproc))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
286 (let ((squeezed (remq nil flags)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
287 (inhibit-read-only t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
288 (status 0)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
289 (when files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
290 (setq squeezed (nconc squeezed files))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
291 (let ((exec-path (append vc-path exec-path)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
292 ;; Add vc-path to PATH for the execution of this command. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
293 (process-environment |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
294 (cons (concat "PATH=" (getenv "PATH") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
295 path-separator |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
296 (mapconcat 'identity vc-path path-separator)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
297 process-environment)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
298 (w32-quote-process-args t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
299 (when (and (eq okstatus 'async) (file-remote-p default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
300 ;; start-process does not support remote execution |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
301 (setq okstatus nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
302 (if (eq okstatus 'async) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
303 ;; Run asynchronously. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
304 (let ((proc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
305 (let ((process-connection-type nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
306 (apply 'start-file-process command (current-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
307 command squeezed)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
308 (if vc-command-messages |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
309 (message "Running %s in background..." full-command)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
310 ;;(set-process-sentinel proc (lambda (p msg) (delete-process p))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
311 (set-process-filter proc 'vc-process-filter) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
312 (vc-exec-after |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
313 `(if vc-command-messages |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
314 (message "Running %s in background... done" ',full-command)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
315 ;; Run synchrously |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
316 (when vc-command-messages |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
317 (message "Running %s in foreground..." full-command)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
318 (let ((buffer-undo-list t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
319 (setq status (apply 'process-file command nil t nil squeezed))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
320 (when (and (not (eq t okstatus)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
321 (or (not (integerp status)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
322 (and okstatus (< okstatus status)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
323 (unless (eq ?\s (aref (buffer-name (current-buffer)) 0)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
324 (pop-to-buffer (current-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
325 (goto-char (point-min)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
326 (shrink-window-if-larger-than-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
327 (error "Running %s...FAILED (%s)" full-command |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
328 (if (integerp status) (format "status %d" status) status)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
329 ;; We're done. But don't emit a status message if running |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
330 ;; asychronously, it would just mislead. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
331 (if (and vc-command-messages (not (eq okstatus 'async))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
332 (message "Running %s...OK = %d" full-command status))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
333 (vc-exec-after |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
334 `(run-hook-with-args 'vc-post-command-functions |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
335 ',command ',file-or-list ',flags)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
336 status)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
337 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
338 ;; Context management |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
339 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
340 (defun vc-position-context (posn) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
341 "Save a bit of the text around POSN in the current buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
342 Used to help us find the corresponding position again later |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
343 if markers are destroyed or corrupted." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
344 ;; A lot of this was shamelessly lifted from Sebastian Kremer's |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
345 ;; rcs.el mode. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
346 (list posn |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
347 (buffer-size) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
348 (buffer-substring posn |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
349 (min (point-max) (+ posn 100))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
350 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
351 (defun vc-find-position-by-context (context) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
352 "Return the position of CONTEXT in the current buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
353 If CONTEXT cannot be found, return nil." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
354 (let ((context-string (nth 2 context))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
355 (if (equal "" context-string) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
356 (point-max) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
357 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
358 (let ((diff (- (nth 1 context) (buffer-size)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
359 (when (< diff 0) (setq diff (- diff))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
360 (goto-char (nth 0 context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
361 (if (or (search-forward context-string nil t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
362 ;; Can't use search-backward since the match may continue |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
363 ;; after point. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
364 (progn (goto-char (- (point) diff (length context-string))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
365 ;; goto-char doesn't signal an error at |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
366 ;; beginning of buffer like backward-char would |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
367 (search-forward context-string nil t))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
368 ;; to beginning of OSTRING |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
369 (- (point) (length context-string)))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
370 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
371 (defun vc-context-matches-p (posn context) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
372 "Return t if POSN matches CONTEXT, nil otherwise." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
373 (let* ((context-string (nth 2 context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
374 (len (length context-string)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
375 (end (+ posn len))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
376 (if (> end (1+ (buffer-size))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
377 nil |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
378 (string= context-string (buffer-substring posn end))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
379 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
380 (defun vc-buffer-context () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
381 "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE). |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
382 Used by `vc-restore-buffer-context' to later restore the context." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
383 (let ((point-context (vc-position-context (point))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
384 ;; Use mark-marker to avoid confusion in transient-mark-mode. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
385 (mark-context (when (eq (marker-buffer (mark-marker)) (current-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
386 (vc-position-context (mark-marker)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
387 ;; Make the right thing happen in transient-mark-mode. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
388 (mark-active nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
389 ;; The new compilation code does not use compilation-error-list any |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
390 ;; more, so the code below is now ineffective and might as well |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
391 ;; be disabled. -- Stef |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
392 ;; ;; We may want to reparse the compilation buffer after revert |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
393 ;; (reparse (and (boundp 'compilation-error-list) ;compile loaded |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
394 ;; ;; Construct a list; each elt is nil or a buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
395 ;; ;; if that buffer is a compilation output buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
396 ;; ;; that contains markers into the current buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
397 ;; (save-current-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
398 ;; (mapcar (lambda (buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
399 ;; (set-buffer buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
400 ;; (let ((errors (or |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
401 ;; compilation-old-error-list |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
402 ;; compilation-error-list)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
403 ;; (buffer-error-marked-p nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
404 ;; (while (and (consp errors) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
405 ;; (not buffer-error-marked-p)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
406 ;; (and (markerp (cdr (car errors))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
407 ;; (eq buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
408 ;; (marker-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
409 ;; (cdr (car errors)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
410 ;; (setq buffer-error-marked-p t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
411 ;; (setq errors (cdr errors))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
412 ;; (if buffer-error-marked-p buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
413 ;; (buffer-list))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
414 (reparse nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
415 (list point-context mark-context reparse))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
416 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
417 (defun vc-restore-buffer-context (context) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
418 "Restore point/mark, and reparse any affected compilation buffers. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
419 CONTEXT is that which `vc-buffer-context' returns." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
420 (let ((point-context (nth 0 context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
421 (mark-context (nth 1 context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
422 ;; (reparse (nth 2 context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
423 ) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
424 ;; The new compilation code does not use compilation-error-list any |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
425 ;; more, so the code below is now ineffective and might as well |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
426 ;; be disabled. -- Stef |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
427 ;; ;; Reparse affected compilation buffers. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
428 ;; (while reparse |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
429 ;; (if (car reparse) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
430 ;; (with-current-buffer (car reparse) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
431 ;; (let ((compilation-last-buffer (current-buffer)) ;select buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
432 ;; ;; Record the position in the compilation buffer of |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
433 ;; ;; the last error next-error went to. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
434 ;; (error-pos (marker-position |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
435 ;; (car (car-safe compilation-error-list))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
436 ;; ;; Reparse the error messages as far as they were parsed before. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
437 ;; (compile-reinitialize-errors '(4) compilation-parsing-end) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
438 ;; ;; Move the pointer up to find the error we were at before |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
439 ;; ;; reparsing. Now next-error should properly go to the next one. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
440 ;; (while (and compilation-error-list |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
441 ;; (/= error-pos (car (car compilation-error-list)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
442 ;; (setq compilation-error-list (cdr compilation-error-list)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
443 ;; (setq reparse (cdr reparse))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
444 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
445 ;; if necessary, restore point and mark |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
446 (if (not (vc-context-matches-p (point) point-context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
447 (let ((new-point (vc-find-position-by-context point-context))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
448 (when new-point (goto-char new-point)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
449 (and mark-active |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
450 mark-context |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
451 (not (vc-context-matches-p (mark) mark-context)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
452 (let ((new-mark (vc-find-position-by-context mark-context))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
453 (when new-mark (set-mark new-mark)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
454 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
455 (defvar vc-dired-window-configuration) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
456 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
457 ;; Command closures |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
458 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
459 ;; FIXME: The rev argument is VCS-specific and needs to be factored out |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
460 (defun vc-start-entry (files rev comment initial-contents msg action &optional after-hook) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
461 "Accept a comment for an operation on FILES revision REV. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
462 If COMMENT is nil, pop up a VC-log buffer, emit MSG, and set the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
463 action on close to ACTION. If COMMENT is a string and |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
464 INITIAL-CONTENTS is non-nil, then COMMENT is used as the initial |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
465 contents of the log entry buffer. If COMMENT is a string and |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
466 INITIAL-CONTENTS is nil, do action immediately as if the user had |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
467 entered COMMENT. If COMMENT is t, also do action immediately with an |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
468 empty comment. Remember the file's buffer in `vc-parent-buffer' |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
469 \(current one if no file). AFTER-HOOK specifies the local value |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
470 for `vc-log-after-operation-hook'." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
471 (let ((parent |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
472 (if (or (eq major-mode 'vc-dired-mode) (eq major-mode 'vc-dir-mode)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
473 ;; If we are called from VC dired, the parent buffer is |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
474 ;; the current buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
475 (current-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
476 (if (and files (equal (length files) 1)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
477 (get-file-buffer (car files)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
478 (current-buffer))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
479 (when vc-before-checkin-hook |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
480 (if files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
481 (with-current-buffer parent |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
482 (run-hooks 'vc-before-checkin-hook)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
483 (run-hooks 'vc-before-checkin-hook))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
484 (if (and comment (not initial-contents)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
485 (set-buffer (get-buffer-create "*VC-log*")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
486 (pop-to-buffer (get-buffer-create "*VC-log*"))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
487 (set (make-local-variable 'vc-parent-buffer) parent) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
488 (set (make-local-variable 'vc-parent-buffer-name) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
489 (concat " from " (buffer-name vc-parent-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
490 ;;(if file (vc-mode-line file)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
491 (vc-log-edit files) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
492 (make-local-variable 'vc-log-after-operation-hook) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
493 (when after-hook |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
494 (setq vc-log-after-operation-hook after-hook)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
495 (setq vc-log-operation action) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
496 (setq vc-log-revision rev) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
497 (when comment |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
498 (erase-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
499 (when (stringp comment) (insert comment))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
500 (if (or (not comment) initial-contents) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
501 (message "%s Type C-c C-c when done" msg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
502 (vc-finish-logentry (eq comment t))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
503 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
504 ;; FIXME: Reference to vc-call-backend should go. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
505 (defun vc-finish-logentry (&optional nocomment) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
506 "Complete the operation implied by the current log entry. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
507 Use the contents of the current buffer as a check-in or registration |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
508 comment. If the optional arg NOCOMMENT is non-nil, then don't check |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
509 the buffer contents as a comment." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
510 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
511 ;; Check and record the comment, if any. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
512 (unless nocomment |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
513 ;; Comment too long? |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
514 (vc-call-backend (or (when vc-log-fileset (vc-backend vc-log-fileset)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
515 (vc-responsible-backend default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
516 'logentry-check) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
517 (run-hooks 'vc-logentry-check-hook)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
518 ;; Sync parent buffer in case the user modified it while editing the comment. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
519 ;; But not if it is a vc-dired buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
520 (with-current-buffer vc-parent-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
521 (or vc-dired-mode (eq major-mode 'vc-dir-mode) (vc-buffer-sync))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
522 (unless vc-log-operation |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
523 (error "No log operation is pending")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
524 ;; save the parameters held in buffer-local variables |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
525 (let ((log-operation vc-log-operation) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
526 (log-fileset vc-log-fileset) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
527 (log-revision vc-log-revision) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
528 (log-entry (buffer-string)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
529 (after-hook vc-log-after-operation-hook) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
530 (tmp-vc-parent-buffer vc-parent-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
531 (pop-to-buffer vc-parent-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
532 ;; OK, do it to it |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
533 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
534 (funcall log-operation |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
535 log-fileset |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
536 log-revision |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
537 log-entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
538 ;; Remove checkin window (after the checkin so that if that fails |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
539 ;; we don't zap the *VC-log* buffer and the typing therein). |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
540 ;; -- IMO this should be replaced with quit-window |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
541 (let ((logbuf (get-buffer "*VC-log*"))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
542 (cond ((and logbuf vc-delete-logbuf-window) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
543 (delete-windows-on logbuf (selected-frame)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
544 ;; Kill buffer and delete any other dedicated windows/frames. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
545 (kill-buffer logbuf)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
546 (logbuf (pop-to-buffer "*VC-log*") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
547 (bury-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
548 (pop-to-buffer tmp-vc-parent-buffer)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
549 ;; Now make sure we see the expanded headers |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
550 (when log-fileset |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
551 (mapc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
552 (lambda (file) (vc-resynch-buffer file vc-keep-workfiles t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
553 log-fileset)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
554 (when vc-dired-mode |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
555 (dired-move-to-filename)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
556 (when (eq major-mode 'vc-dir-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
557 (vc-dir-move-to-goal-column)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
558 (run-hooks after-hook 'vc-finish-logentry-hook))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
559 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
560 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
561 ;; The VC directory major mode. Coopt Dired for this. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
562 ;; All VC commands get mapped into logical equivalents. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
563 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
564 (defvar vc-dired-switches) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
565 (defvar vc-dired-terse-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
566 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
567 (defvar vc-dired-mode-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
568 (let ((map (make-sparse-keymap)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
569 (vmap (make-sparse-keymap))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
570 (define-key map "\C-xv" vmap) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
571 (define-key map "v" vmap) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
572 (set-keymap-parent vmap vc-prefix-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
573 (define-key vmap "t" 'vc-dired-toggle-terse-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
574 map)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
575 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
576 (define-derived-mode vc-dired-mode dired-mode "Dired under " |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
577 "The major mode used in VC directory buffers. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
578 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
579 It works like Dired, but lists only files under version control, with |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
580 the current VC state of each file being indicated in the place of the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
581 file's link count, owner, group and size. Subdirectories are also |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
582 listed, and you may insert them into the buffer as desired, like in |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
583 Dired. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
584 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
585 All Dired commands operate normally, with the exception of `v', which |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
586 is redefined as the version control prefix, so that you can type |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
587 `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
588 the file named in the current Dired buffer line. `vv' invokes |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
589 `vc-next-action' on this file, or on all files currently marked. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
590 There is a special command, `*l', to mark all files currently locked." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
591 ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
592 ;; We do it here because dired might not be loaded yet |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
593 ;; when vc-dired-mode-map is initialized. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
594 (set-keymap-parent vc-dired-mode-map dired-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
595 (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
596 ;; The following is slightly modified from files.el, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
597 ;; because file lines look a bit different in vc-dired-mode |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
598 ;; (the column before the date does not end in a digit). |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
599 ;; albinus: It should be done in the original declaration. Problem |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
600 ;; is the optional empty state-info; otherwise ")" would be good |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
601 ;; enough as delimeter. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
602 (set (make-local-variable 'directory-listing-before-filename-regexp) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
603 (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
604 ;; In some locales, month abbreviations are as short as 2 letters, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
605 ;; and they can be followed by ".". |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
606 (month (concat l l "+\\.?")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
607 (s " ") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
608 (yyyy "[0-9][0-9][0-9][0-9]") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
609 (dd "[ 0-3][0-9]") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
610 (HH:MM "[ 0-2][0-9]:[0-5][0-9]") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
611 (seconds "[0-6][0-9]\\([.,][0-9]+\\)?") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
612 (zone "[-+][0-2][0-9][0-5][0-9]") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
613 (iso-mm-dd "[01][0-9]-[0-3][0-9]") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
614 (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
615 (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
616 "\\|" yyyy "-" iso-mm-dd "\\)")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
617 (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
618 s "+" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
619 "\\(" HH:MM "\\|" yyyy "\\)")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
620 (western-comma (concat month s "+" dd "," s "+" yyyy)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
621 ;; Japanese MS-Windows ls-lisp has one-digit months, and |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
622 ;; omits the Kanji characters after month and day-of-month. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
623 (mm "[ 0-1]?[0-9]") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
624 (japanese |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
625 (concat mm l "?" s dd l "?" s "+" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
626 "\\(" HH:MM "\\|" yyyy l "?" "\\)"))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
627 ;; the .* below ensures that we find the last match on a line |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
628 (concat ".*" s |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
629 "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
630 s "+"))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
631 (and (boundp 'vc-dired-switches) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
632 vc-dired-switches |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
633 (set (make-local-variable 'dired-actual-switches) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
634 vc-dired-switches)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
635 (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
636 ;; FIXME: This needs to be factored out |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
637 (let ((backend-name (symbol-name (vc-responsible-backend |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
638 default-directory)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
639 (setq mode-name (concat mode-name backend-name)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
640 ;; Add menu after `vc-dired-mode-map' has `dired-mode-map' as the parent. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
641 (let ((vc-dire-menu-map (copy-keymap vc-menu-map))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
642 (define-key-after (lookup-key vc-dired-mode-map [menu-bar]) [vc] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
643 (cons backend-name vc-dire-menu-map) 'subdir))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
644 (setq vc-dired-mode t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
645 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
646 (defun vc-dired-toggle-terse-mode () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
647 "Toggle terse display in VC Dired." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
648 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
649 (if (not vc-dired-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
650 nil |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
651 (setq vc-dired-terse-mode (not vc-dired-terse-mode)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
652 (if vc-dired-terse-mode |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
653 (vc-dired-hook) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
654 (revert-buffer)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
655 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
656 (defun vc-dired-mark-locked () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
657 "Mark all files currently locked." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
658 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
659 (dired-mark-if (let ((f (dired-get-filename nil t))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
660 (and f |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
661 (not (file-directory-p f)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
662 (not (vc-up-to-date-p f)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
663 "locked file")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
664 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
665 (define-key vc-dired-mode-map "*l" 'vc-dired-mark-locked) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
666 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
667 (defun vc-dired-reformat-line (vc-info) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
668 "Reformat a directory-listing line. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
669 Replace various columns with version control information, VC-INFO. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
670 This code, like dired, assumes UNIX -l format." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
671 (beginning-of-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
672 (when (re-search-forward |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
673 ;; Match link count, owner, group, size. Group may be missing, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
674 ;; and only the size is present in OS/2 -l format. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
675 "^..[drwxlts-]+ \\( *[0-9]+\\( [^ ]+ +\\([^ ]+ +\\)?[0-9]+\\)?\\) " |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
676 (line-end-position) t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
677 (replace-match (substring (concat vc-info " ") 0 10) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
678 t t nil 1))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
679 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
680 ;; FIXME: VCS-specific knowledge in here needs to be factored out |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
681 (defun vc-dired-ignorable-p (filename) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
682 "Should FILENAME be ignored in VC-Dired listings?" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
683 (catch t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
684 ;; Ignore anything that wouldn't be found by completion (.o, .la, etc.) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
685 (dolist (ignorable completion-ignored-extensions) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
686 (let ((ext (substring filename |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
687 (- (length filename) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
688 (length ignorable))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
689 (if (string= ignorable ext) (throw t t)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
690 ;; Ignore Makefiles derived from something else |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
691 (when (string= (file-name-nondirectory filename) "Makefile") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
692 (let* ((dir (file-name-directory filename)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
693 (peers (directory-files (or dir default-directory)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
694 (if (or (member "Makefile.in" peers) (member "Makefile.am" peers)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
695 (throw t t)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
696 nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
697 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
698 (defun vc-dired-purge () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
699 "Remove empty subdirs." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
700 (goto-char (point-min)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
701 (while (dired-get-subdir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
702 (forward-line 2) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
703 (if (dired-get-filename nil t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
704 (if (not (dired-next-subdir 1 t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
705 (goto-char (point-max))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
706 (forward-line -2) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
707 (if (not (string= (dired-current-directory) default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
708 (dired-do-kill-lines t "") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
709 ;; We cannot remove the top level directory. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
710 ;; Just make it look a little nicer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
711 (forward-line 1) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
712 (or (eobp) (kill-line)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
713 (if (not (dired-next-subdir 1 t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
714 (goto-char (point-max)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
715 (goto-char (point-min))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
716 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
717 (defun vc-dired-buffers-for-dir (dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
718 "Return a list of all vc-dired buffers that currently display DIR." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
719 (let (result) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
720 ;; Check whether dired is loaded. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
721 (when (fboundp 'dired-buffers-for-dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
722 (dolist (buffer (dired-buffers-for-dir dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
723 (with-current-buffer buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
724 (when vc-dired-mode |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
725 (push buffer result))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
726 (nreverse result))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
727 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
728 (defun vc-directory-resynch-file (file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
729 "Update the entries for FILE in any VC Dired buffers that list it." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
730 ;;FIXME This needs to be implemented so it works for vc-dir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
731 (let ((buffers (vc-dired-buffers-for-dir (file-name-directory file)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
732 (when buffers |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
733 (mapcar (lambda (buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
734 (with-current-buffer buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
735 (when (dired-goto-file file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
736 ;; bind vc-dired-terse-mode to nil so that |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
737 ;; files won't vanish when they are checked in |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
738 (let ((vc-dired-terse-mode nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
739 (dired-do-redisplay 1))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
740 buffers)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
741 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
742 ;;;###autoload |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
743 (defun vc-directory (dir read-switches) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
744 "Create a buffer in VC Dired Mode for directory DIR. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
745 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
746 See Info node `VC Dired Mode'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
747 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
748 With prefix arg READ-SWITCHES, specify a value to override |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
749 `dired-listing-switches' when generating the listing." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
750 (interactive "DDired under VC (directory): \nP") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
751 (let ((vc-dired-switches (concat vc-dired-listing-switches |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
752 (if vc-dired-recurse "R" "")))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
753 (if read-switches |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
754 (setq vc-dired-switches |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
755 (read-string "Dired listing switches: " |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
756 vc-dired-switches))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
757 (require 'dired) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
758 (require 'dired-aux) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
759 (switch-to-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
760 (dired-internal-noselect (expand-file-name (file-name-as-directory dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
761 vc-dired-switches |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
762 'vc-dired-mode)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
763 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
764 ;; VC status implementation |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
765 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
766 ;; Used to store information for the files displayed in the *VC status* buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
767 ;; Each item displayed corresponds to one of these defstructs. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
768 (defstruct (vc-dir-fileinfo |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
769 (:copier nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
770 (:type list) ;So we can use `member' on lists of FIs. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
771 (:constructor |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
772 ;; We could define it as an alias for `list'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
773 vc-dir-create-fileinfo (name state &optional extra marked directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
774 (:conc-name vc-dir-fileinfo->)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
775 name ;Keep it as first, for `member'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
776 state |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
777 ;; For storing backend specific information. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
778 extra |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
779 marked |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
780 ;; To keep track of not updated files during a global refresh |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
781 needs-update |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
782 ;; To distinguish files and directories. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
783 directory) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
784 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
785 (defvar vc-ewoc nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
786 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
787 (defun vc-default-status-extra-headers (backend dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
788 ;; Be loud by default to remind people to add coded to display |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
789 ;; backend specific headers. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
790 ;; XXX: change this to return nil before the release. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
791 "Extra : Add backend specific headers here") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
792 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
793 (defun vc-dir-headers (backend dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
794 "Display the headers in the *VC status* buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
795 It calls the `status-extra-headers' backend method to display backend |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
796 specific headers." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
797 (concat |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
798 (propertize "VC backend : " 'face 'font-lock-type-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
799 (propertize (format "%s\n" backend) 'face 'font-lock-variable-name-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
800 (propertize "Working dir: " 'face 'font-lock-type-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
801 (propertize (format "%s\n" dir) 'face 'font-lock-variable-name-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
802 (vc-call-backend backend 'status-extra-headers dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
803 "\n")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
804 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
805 (defun vc-default-status-printer (backend fileentry) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
806 "Pretty print FILEENTRY." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
807 ;; If you change the layout here, change vc-dir-move-to-goal-column. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
808 (let ((state |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
809 (if (vc-dir-fileinfo->directory fileentry) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
810 'DIRECTORY |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
811 (vc-dir-fileinfo->state fileentry)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
812 (insert |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
813 (propertize |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
814 (format "%c" (if (vc-dir-fileinfo->marked fileentry) ?* ? )) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
815 'face 'font-lock-type-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
816 " " |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
817 (propertize |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
818 (format "%-20s" state) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
819 'face (cond ((eq state 'up-to-date) 'font-lock-builtin-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
820 ((memq state '(missing conflict)) 'font-lock-warning-face) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
821 (t 'font-lock-variable-name-face)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
822 'mouse-face 'highlight) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
823 " " |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
824 (propertize |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
825 (format "%s" (vc-dir-fileinfo->name fileentry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
826 'face 'font-lock-function-name-face |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
827 'mouse-face 'highlight)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
828 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
829 (defun vc-dir-printer (fileentry) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
830 (let ((backend (vc-responsible-backend default-directory))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
831 (vc-call-backend backend 'status-printer fileentry))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
832 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
833 (defun vc-dir-move-to-goal-column () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
834 ;; Used to keep the cursor on the file name column. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
835 (beginning-of-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
836 ;; Must be in sync with vc-default-status-printer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
837 (forward-char 25)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
838 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
839 (defun vc-dir-prepare-status-buffer (dir &optional create-new) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
840 "Find a *vc-dir* buffer showing DIR, or create a new one." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
841 (setq dir (expand-file-name dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
842 (let* ((bname "*vc-dir*") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
843 ;; Look for another *vc-dir* buffer visiting the same directory. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
844 (buf (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
845 (unless create-new |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
846 (dolist (buffer (buffer-list)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
847 (set-buffer buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
848 (when (and (eq major-mode 'vc-dir-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
849 (string= (expand-file-name default-directory) dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
850 (return buffer))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
851 (or buf |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
852 ;; Create a new *vc-dir* buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
853 (with-current-buffer (create-file-buffer bname) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
854 (cd dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
855 (vc-setup-buffer (current-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
856 ;; Reset the vc-parent-buffer-name so that it does not appear |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
857 ;; in the mode-line. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
858 (setq vc-parent-buffer-name nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
859 (current-buffer))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
860 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
861 ;;;###autoload |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
862 (defun vc-dir (dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
863 "Show the VC status for DIR." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
864 (interactive "DVC status for directory: ") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
865 (pop-to-buffer (vc-dir-prepare-status-buffer dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
866 (if (eq major-mode 'vc-dir-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
867 (vc-dir-refresh) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
868 (vc-dir-mode))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
869 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
870 (defvar vc-dir-menu-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
871 (let ((map (make-sparse-keymap "VC-dir"))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
872 (define-key map [quit] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
873 '(menu-item "Quit" quit-window |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
874 :help "Quit")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
875 (define-key map [kill] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
876 '(menu-item "Kill Update Command" vc-dir-kill-dir-status-process |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
877 :enable (vc-dir-busy) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
878 :help "Kill the command that updates VC status buffer")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
879 (define-key map [refresh] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
880 '(menu-item "Refresh" vc-dir-refresh |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
881 :enable (not (vc-dir-busy)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
882 :help "Refresh the contents of the VC status buffer")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
883 (define-key map [remup] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
884 '(menu-item "Hide up-to-date" vc-dir-hide-up-to-date |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
885 :help "Hide up-to-date items from display")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
886 ;; Movement. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
887 (define-key map [sepmv] '("--")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
888 (define-key map [next-line] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
889 '(menu-item "Next line" vc-dir-next-line |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
890 :help "Go to the next line" :keys "n")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
891 (define-key map [previous-line] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
892 '(menu-item "Previous line" vc-dir-previous-line |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
893 :help "Go to the previous line")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
894 ;; Marking. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
895 (define-key map [sepmrk] '("--")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
896 (define-key map [unmark-all] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
897 '(menu-item "Unmark All" vc-dir-unmark-all-files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
898 :help "Unmark all files that are in the same state as the current file\ |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
899 \nWith prefix argument unmark all files")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
900 (define-key map [unmark-previous] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
901 '(menu-item "Unmark previous " vc-dir-unmark-file-up |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
902 :help "Move to the previous line and unmark the file")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
903 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
904 (define-key map [mark-all] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
905 '(menu-item "Mark All" vc-dir-mark-all-files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
906 :help "Mark all files that are in the same state as the current file\ |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
907 \nWith prefix argument mark all files")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
908 (define-key map [unmark] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
909 '(menu-item "Unmark" vc-dir-unmark |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
910 :help "Unmark the current file or all files in the region")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
911 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
912 (define-key map [mark] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
913 '(menu-item "Mark" vc-dir-mark |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
914 :help "Mark the current file or all files in the region")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
915 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
916 (define-key map [sepopn] '("--")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
917 (define-key map [open-other] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
918 '(menu-item "Open in other window" vc-dir-find-file-other-window |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
919 :help "Find the file on the current line, in another window")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
920 (define-key map [open] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
921 '(menu-item "Open file" vc-dir-find-file |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
922 :help "Find the file on the current line")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
923 ;; VC info details |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
924 (define-key map [sepvcdet] '("--")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
925 ;; FIXME: This needs a key binding. And maybe a better name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
926 ;; ("Insert" like PCL-CVS uses does not sound that great either)... |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
927 (define-key map [ins] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
928 '(menu-item "Show File" vc-dir-show-fileentry |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
929 :help "Show a file in the VC status listing even though it might be up to date")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
930 (define-key map [annotate] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
931 '(menu-item "Annotate" vc-annotate |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
932 :help "Display the edit history of the current file using colors")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
933 (define-key map [diff] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
934 '(menu-item "Compare with Base Version" vc-diff |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
935 :help "Compare file set with the base version")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
936 (define-key map [log] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
937 '(menu-item "Show history" vc-print-log |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
938 :help "List the change log of the current file set in a window")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
939 ;; VC commands. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
940 (define-key map [sepvccmd] '("--")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
941 (define-key map [update] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
942 '(menu-item "Update to latest version" vc-update |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
943 :help "Update the current fileset's files to their tip revisions")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
944 (define-key map [revert] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
945 '(menu-item "Revert to base version" vc-revert |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
946 :help "Revert working copies of the selected fileset to their repository contents.")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
947 (define-key map [next-action] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
948 ;; FIXME: This really really really needs a better name! |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
949 ;; And a key binding too. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
950 '(menu-item "Check In/Out" vc-next-action |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
951 :help "Do the next logical version control operation on the current fileset")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
952 (define-key map [register] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
953 '(menu-item "Register" vc-dir-register |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
954 :help "Register file set into the version control system")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
955 map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
956 "Menu for VC status") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
957 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
958 (defalias 'vc-dir-menu-map vc-dir-menu-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
959 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
960 (defvar vc-dir-mode-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
961 (let ((map (make-keymap))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
962 (suppress-keymap map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
963 ;; Marking. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
964 (define-key map "m" 'vc-dir-mark) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
965 (define-key map "M" 'vc-dir-mark-all-files) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
966 (define-key map "u" 'vc-dir-unmark) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
967 (define-key map "U" 'vc-dir-unmark-all-files) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
968 (define-key map "\C-?" 'vc-dir-unmark-file-up) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
969 (define-key map "\M-\C-?" 'vc-dir-unmark-all-files) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
970 ;; Movement. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
971 (define-key map "n" 'vc-dir-next-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
972 (define-key map " " 'vc-dir-next-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
973 (define-key map "\t" 'vc-dir-next-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
974 (define-key map "p" 'vc-dir-previous-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
975 (define-key map [backtab] 'vc-dir-previous-line) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
976 ;; VC commands. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
977 (define-key map "=" 'vc-diff) ;; C-x v = |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
978 (define-key map "a" 'vc-dir-register) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
979 (define-key map "+" 'vc-update) ;; C-x v + |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
980 (define-key map "R" 'vc-revert) ;; u is taken by unmark. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
981 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
982 ;; Can't be "g" (as in vc map), so "A" for "Annotate". |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
983 (define-key map "A" 'vc-annotate) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
984 (define-key map "l" 'vc-print-log) ;; C-x v l |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
985 ;; The remainder. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
986 (define-key map "f" 'vc-dir-find-file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
987 (define-key map "\C-m" 'vc-dir-find-file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
988 (define-key map "o" 'vc-dir-find-file-other-window) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
989 (define-key map "x" 'vc-dir-hide-up-to-date) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
990 (define-key map "q" 'quit-window) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
991 (define-key map "g" 'vc-dir-refresh) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
992 (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
993 (define-key map [(down-mouse-3)] 'vc-dir-menu) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
994 (define-key map [(mouse-2)] 'vc-dir-toggle-mark) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
995 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
996 ;; Hook up the menu. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
997 (define-key map [menu-bar vc-dir-mode] |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
998 '(menu-item |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
999 ;; This is used to that VC backends could add backend specific |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1000 ;; menu items to vc-dir-menu-map. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1001 "VC Status" vc-dir-menu-map :filter vc-dir-menu-map-filter)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1002 map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1003 "Keymap for VC status") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1004 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1005 (defun vc-default-extra-status-menu (backend) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1006 nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1007 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1008 ;; This is used to that VC backends could add backend specific menu |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1009 ;; items to vc-dir-menu-map. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1010 (defun vc-dir-menu-map-filter (orig-binding) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1011 (when (and (symbolp orig-binding) (fboundp orig-binding)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1012 (setq orig-binding (indirect-function orig-binding))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1013 (let ((ext-binding |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1014 (vc-call-backend (vc-responsible-backend default-directory) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1015 'extra-status-menu))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1016 (if (null ext-binding) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1017 orig-binding |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1018 (append orig-binding |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1019 '("----") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1020 ext-binding)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1021 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1022 (defmacro vc-at-event (event &rest body) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1023 "Evaluate `body' wich point located at event-start of `event'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1024 If `body' uses `event', it should be a variable, |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1025 otherwise it will be evaluated twice." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1026 (let ((posn (gensym "vc-at-event-posn"))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1027 `(let ((,posn (event-start ,event))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1028 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1029 (set-buffer (window-buffer (posn-window ,posn))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1030 (goto-char (posn-point ,posn)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1031 ,@body)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1032 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1033 (defun vc-dir-menu (e) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1034 "Popup the VC status menu." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1035 (interactive "e") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1036 (vc-at-event e (popup-menu vc-dir-menu-map e))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1037 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1038 (defvar vc-dir-tool-bar-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1039 (let ((map (make-sparse-keymap))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1040 (tool-bar-local-item-from-menu 'vc-dir-find-file "open" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1041 map vc-dir-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1042 (tool-bar-local-item "bookmark_add" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1043 'vc-dir-toggle-mark 'vc-dir-toggle-mark map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1044 :help "Toggle mark on current item") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1045 (tool-bar-local-item-from-menu 'vc-dir-previous-line "left-arrow" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1046 map vc-dir-mode-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1047 :rtl "right-arrow") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1048 (tool-bar-local-item-from-menu 'vc-dir-next-line "right-arrow" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1049 map vc-dir-mode-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1050 :rtl "left-arrow") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1051 (tool-bar-local-item-from-menu 'vc-print-log "info" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1052 map vc-dir-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1053 (tool-bar-local-item-from-menu 'vc-dir-refresh "refresh" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1054 map vc-dir-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1055 (tool-bar-local-item-from-menu 'nonincremental-search-forward |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1056 "search" map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1057 (tool-bar-local-item-from-menu 'vc-dir-kill-dir-status-process "cancel" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1058 map vc-dir-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1059 (tool-bar-local-item-from-menu 'quit-window "exit" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1060 map vc-dir-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1061 map)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1062 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1063 (defvar vc-dir-process-buffer nil |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1064 "The buffer used for the asynchronous call that computes the VC status.") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1065 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1066 (defun vc-dir-mode () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1067 "Major mode for showing the VC status for a directory. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1068 Marking/Unmarking key bindings and actions: |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1069 m - marks a file/directory or ff the region is active, mark all the files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1070 in region. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1071 Restrictions: - a file cannot be marked if any parent directory is marked |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1072 - a directory cannot be marked if any child file or |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1073 directory is marked |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1074 u - marks a file/directory or if the region is active, unmark all the files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1075 in region. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1076 M - if the cursor is on a file: mark all the files with the same VC state as |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1077 the current file |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1078 - if the cursor is on a directory: mark all child files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1079 - with a prefix argument: mark all files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1080 U - if the cursor is on a file: unmark all the files with the same VC state |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1081 as the current file |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1082 - if the cursor is on a directory: unmark all child files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1083 - with a prefix argument: unmark all files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1084 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1085 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1086 \\{vc-dir-mode-map}" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1087 (setq mode-name "VC Status") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1088 (setq major-mode 'vc-dir-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1089 (setq buffer-read-only t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1090 (use-local-map vc-dir-mode-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1091 (set (make-local-variable 'tool-bar-map) vc-dir-tool-bar-map) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1092 (let ((buffer-read-only nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1093 (backend (vc-responsible-backend default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1094 entries) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1095 (erase-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1096 (set (make-local-variable 'vc-dir-process-buffer) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1097 (set (make-local-variable 'vc-ewoc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1098 (ewoc-create #'vc-dir-printer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1099 (vc-dir-headers backend default-directory))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1100 (add-hook 'after-save-hook 'vc-dir-mark-buffer-changed) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1101 ;; Make sure that if the VC status buffer is killed, the update |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1102 ;; process running in the background is also killed. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1103 (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1104 (vc-dir-refresh)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1105 (run-hooks 'vc-dir-mode-hook)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1106 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1107 (put 'vc-dir-mode 'mode-class 'special) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1108 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1109 ;; t if directories should be shown in vc-dir. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1110 ;; WORK IN PROGRESS! DO NOT SET this! ONLY set it if you want to help |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1111 ;; write code for this feature. This variable will likely disappear |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1112 ;; when the work is done. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1113 (defvar vc-dir-insert-directories nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1114 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1115 (defun vc-dir-update (entries buffer &optional noinsert) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1116 "Update BUFFER's ewoc from the list of ENTRIES. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1117 If NOINSERT, ignore elements on ENTRIES which are not in the ewoc." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1118 ;; Add ENTRIES to the vc-dir buffer BUFFER. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1119 (with-current-buffer buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1120 ;; Insert the entries sorted by name into the ewoc. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1121 ;; We assume the ewoc is sorted too, which should be the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1122 ;; case if we always add entries with vc-dir-update. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1123 (setq entries |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1124 ;; Sort: first files and then subdirectories. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1125 ;; XXX: this is VERY inefficient, it computes the directory |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1126 ;; names too many times |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1127 (sort entries |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1128 (lambda (entry1 entry2) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1129 (let ((dir1 (file-name-directory (expand-file-name (car entry1)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1130 (dir2 (file-name-directory (expand-file-name (car entry2))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1131 (cond |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1132 ((string< dir1 dir2) t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1133 ((not (string= dir1 dir2)) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1134 ((string< (car entry1) (car entry2)))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1135 (if (not vc-dir-insert-directories) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1136 (let ((entry (car entries)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1137 (node (ewoc-nth vc-ewoc 0))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1138 (while (and entry node) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1139 (let ((entryfile (car entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1140 (nodefile (vc-dir-fileinfo->name (ewoc-data node)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1141 (cond |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1142 ((string-lessp nodefile entryfile) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1143 (setq node (ewoc-next vc-ewoc node))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1144 ((string-lessp entryfile nodefile) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1145 (unless noinsert |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1146 (ewoc-enter-before vc-ewoc node |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1147 (apply 'vc-dir-create-fileinfo entry))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1148 (setq entries (cdr entries) entry (car entries))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1149 (t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1150 (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1151 (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1152 (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1153 (ewoc-invalidate vc-ewoc node) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1154 (setq entries (cdr entries) entry (car entries)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1155 (setq node (ewoc-next vc-ewoc node)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1156 (unless (or node noinsert) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1157 ;; We're past the last node, all remaining entries go to the end. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1158 (while entries |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1159 (ewoc-enter-last vc-ewoc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1160 (apply 'vc-dir-create-fileinfo (pop entries)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1161 ;; Insert directory entries in the right places. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1162 (let ((entry (car entries)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1163 (node (ewoc-nth vc-ewoc 0))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1164 ;; Insert . if it is not present. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1165 (unless node |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1166 (let ((rd (file-relative-name default-directory))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1167 (ewoc-enter-last |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1168 vc-ewoc (vc-dir-create-fileinfo |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1169 rd nil nil nil (expand-file-name default-directory)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1170 (setq node (ewoc-nth vc-ewoc 0))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1171 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1172 (while (and entry node) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1173 (let* ((entryfile (car entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1174 (entrydir (file-name-directory (expand-file-name entryfile))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1175 (nodedir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1176 (or (vc-dir-fileinfo->directory (ewoc-data node)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1177 (file-name-directory |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1178 (expand-file-name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1179 (vc-dir-fileinfo->name (ewoc-data node))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1180 (cond |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1181 ;; First try to find the directory. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1182 ((string-lessp nodedir entrydir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1183 (setq node (ewoc-next vc-ewoc node))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1184 ((string-equal nodedir entrydir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1185 ;; Found the directory, find the place for the file name. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1186 (let ((nodefile (vc-dir-fileinfo->name (ewoc-data node)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1187 (cond |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1188 ((string-lessp nodefile entryfile) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1189 (setq node (ewoc-next vc-ewoc node))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1190 ((string-equal nodefile entryfile) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1191 (setf (vc-dir-fileinfo->state (ewoc-data node)) (nth 1 entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1192 (setf (vc-dir-fileinfo->extra (ewoc-data node)) (nth 2 entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1193 (setf (vc-dir-fileinfo->needs-update (ewoc-data node)) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1194 (ewoc-invalidate vc-ewoc node) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1195 (setq entries (cdr entries) entry (car entries)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1196 (setq node (ewoc-next vc-ewoc node))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1197 (t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1198 (ewoc-enter-before vc-ewoc node |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1199 (apply 'vc-dir-create-fileinfo entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1200 (setq entries (cdr entries) entry (car entries)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1201 (t |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1202 ;; We need to insert a directory node |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1203 (let ((rd (file-relative-name entrydir))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1204 (ewoc-enter-last |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1205 vc-ewoc (vc-dir-create-fileinfo rd nil nil nil entrydir))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1206 ;; Now insert the node itself. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1207 (ewoc-enter-before vc-ewoc node |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1208 (apply 'vc-dir-create-fileinfo entry)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1209 (setq entries (cdr entries) entry (car entries)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1210 ;; We're past the last node, all remaining entries go to the end. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1211 (unless (or node noinsert) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1212 (let* ((lastnode (ewoc-nth vc-ewoc -1)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1213 (lastdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1214 (or (vc-dir-fileinfo->directory (ewoc-data lastnode)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1215 (file-name-directory |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1216 (expand-file-name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1217 (vc-dir-fileinfo->name (ewoc-data lastnode))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1218 (dolist (entry entries) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1219 (let ((entrydir (file-name-directory (expand-file-name (car entry))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1220 ;; Insert a directory node if needed. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1221 (unless (string-equal lastdir entrydir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1222 (setq lastdir entrydir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1223 (let ((rd (file-relative-name entrydir))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1224 (ewoc-enter-last |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1225 vc-ewoc (vc-dir-create-fileinfo rd nil nil nil entrydir)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1226 ;; Now insert the node itself. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1227 (ewoc-enter-last vc-ewoc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1228 (apply 'vc-dir-create-fileinfo entry)))))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1229 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1230 (defun vc-dir-busy () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1231 (and (buffer-live-p vc-dir-process-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1232 (get-buffer-process vc-dir-process-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1233 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1234 (defun vc-dir-refresh-files (files default-state) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1235 "Refresh some files in the VC status buffer." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1236 (let ((backend (vc-responsible-backend default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1237 (status-buffer (current-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1238 (def-dir default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1239 (vc-set-mode-line-busy-indicator) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1240 ;; Call the `dir-status-file' backend function. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1241 ;; `dir-status-file' is supposed to be asynchronous. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1242 ;; It should compute the results, and then call the function |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1243 ;; passed as an argument in order to update the vc-dir buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1244 ;; with the results. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1245 (unless (buffer-live-p vc-dir-process-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1246 (setq vc-dir-process-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1247 (generate-new-buffer (format " *VC-%s* tmp status" backend)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1248 (lexical-let ((buffer (current-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1249 (with-current-buffer vc-dir-process-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1250 (cd def-dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1251 (erase-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1252 (vc-call-backend |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1253 backend 'dir-status-files def-dir files default-state |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1254 (lambda (entries &optional more-to-come) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1255 ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1256 ;; If MORE-TO-COME is true, then more updates will come from |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1257 ;; the asynchronous process. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1258 (with-current-buffer buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1259 (vc-dir-update entries buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1260 (unless more-to-come |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1261 (setq mode-line-process nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1262 ;; Remove the ones that haven't been updated at all. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1263 ;; Those not-updated are those whose state is nil because the |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1264 ;; file/dir doesn't exist and isn't versioned. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1265 (ewoc-filter vc-ewoc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1266 (lambda (info) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1267 (not (vc-dir-fileinfo->needs-update info)))))))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1268 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1269 (defun vc-dir-refresh () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1270 "Refresh the contents of the VC status buffer. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1271 Throw an error if another update process is in progress." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1272 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1273 (if (vc-dir-busy) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1274 (error "Another update process is in progress, cannot run two at a time") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1275 (let ((backend (vc-responsible-backend default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1276 (status-buffer (current-buffer)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1277 (def-dir default-directory)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1278 (vc-set-mode-line-busy-indicator) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1279 ;; Call the `dir-status' backend function. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1280 ;; `dir-status' is supposed to be asynchronous. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1281 ;; It should compute the results, and then call the function |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1282 ;; passed as an argument in order to update the vc-dir buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1283 ;; with the results. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1284 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1285 ;; Create a buffer that can be used by `dir-status' and call |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1286 ;; `dir-status' with this buffer as the current buffer. Use |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1287 ;; `vc-dir-process-buffer' to remember this buffer, so that |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1288 ;; it can be used later to kill the update process in case it |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1289 ;; takes too long. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1290 (unless (buffer-live-p vc-dir-process-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1291 (setq vc-dir-process-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1292 (generate-new-buffer (format " *VC-%s* tmp status" backend)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1293 ;; set the needs-update flag on all entries |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1294 (ewoc-map (lambda (info) (setf (vc-dir-fileinfo->needs-update info) t) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1295 vc-ewoc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1296 (lexical-let ((buffer (current-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1297 (with-current-buffer vc-dir-process-buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1298 (cd def-dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1299 (erase-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1300 (vc-call-backend |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1301 backend 'dir-status def-dir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1302 (lambda (entries &optional more-to-come) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1303 ;; ENTRIES is a list of (FILE VC_STATE EXTRA) items. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1304 ;; If MORE-TO-COME is true, then more updates will come from |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1305 ;; the asynchronous process. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1306 (with-current-buffer buffer |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1307 (vc-dir-update entries buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1308 (unless more-to-come |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1309 (let ((remaining |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1310 (ewoc-collect |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1311 vc-ewoc 'vc-dir-fileinfo->needs-update))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1312 (if remaining |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1313 (vc-dir-refresh-files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1314 (mapcar 'vc-dir-fileinfo->name remaining) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1315 'up-to-date) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1316 (setq mode-line-process nil)))))))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1317 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1318 (defun vc-dir-kill-dir-status-process () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1319 "Kill the temporary buffer and associated process." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1320 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1321 (when (buffer-live-p vc-dir-process-buffer) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1322 (let ((proc (get-buffer-process vc-dir-process-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1323 (when proc (delete-process proc)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1324 (setq vc-dir-process-buffer nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1325 (setq mode-line-process nil)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1326 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1327 (defun vc-dir-kill-query () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1328 ;; Make sure that when the VC status buffer is killed the update |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1329 ;; process running in background is also killed. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1330 (if (vc-dir-busy) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1331 (when (y-or-n-p "Status update process running, really kill status buffer?") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1332 (vc-dir-kill-dir-status-process) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1333 t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1334 t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1335 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1336 (defun vc-dir-next-line (arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1337 "Go to the next line. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1338 If a prefix argument is given, move by that many lines." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1339 (interactive "p") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1340 (ewoc-goto-next vc-ewoc arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1341 (vc-dir-move-to-goal-column)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1342 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1343 (defun vc-dir-previous-line (arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1344 "Go to the previous line. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1345 If a prefix argument is given, move by that many lines." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1346 (interactive "p") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1347 (ewoc-goto-prev vc-ewoc arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1348 (vc-dir-move-to-goal-column)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1349 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1350 (defun vc-dir-mark-unmark (mark-unmark-function) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1351 (if (use-region-p) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1352 (let ((firstl (line-number-at-pos (region-beginning))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1353 (lastl (line-number-at-pos (region-end)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1354 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1355 (goto-char (region-beginning)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1356 (while (<= (line-number-at-pos) lastl) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1357 (funcall mark-unmark-function)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1358 (funcall mark-unmark-function))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1359 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1360 (defun vc-dir-parent-marked-p (arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1361 (when vc-dir-insert-directories |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1362 ;; Return nil if none of the parent directories of arg is marked. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1363 (let* ((argdata (ewoc-data arg)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1364 (argdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1365 (let ((crtdir (vc-dir-fileinfo->directory argdata))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1366 (if crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1367 crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1368 (file-name-directory (expand-file-name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1369 (vc-dir-fileinfo->name argdata)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1370 (arglen (length argdir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1371 (crt arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1372 data dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1373 ;; Go through the predecessors, checking if any directory that is |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1374 ;; a parent is marked. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1375 (while (setq crt (ewoc-prev vc-ewoc crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1376 (setq data (ewoc-data crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1377 (setq dir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1378 (let ((crtdir (vc-dir-fileinfo->directory data))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1379 (if crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1380 crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1381 (file-name-directory (expand-file-name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1382 (vc-dir-fileinfo->name data)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1383 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1384 (when (and (vc-dir-fileinfo->directory data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1385 (string-equal (substring argdir 0 (length dir)) dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1386 (when (vc-dir-fileinfo->marked data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1387 (error "Cannot mark `%s', parent directory `%s' marked" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1388 (vc-dir-fileinfo->name argdata) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1389 (vc-dir-fileinfo->name data))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1390 nil))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1391 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1392 (defun vc-dir-children-marked-p (arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1393 ;; Return nil if none of the children of arg is marked. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1394 (when vc-dir-insert-directories |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1395 (let* ((argdata (ewoc-data arg)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1396 (argdir (vc-dir-fileinfo->directory argdata)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1397 (arglen (length argdir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1398 (is-child t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1399 (crt arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1400 data dir) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1401 (while (and is-child (setq crt (ewoc-next vc-ewoc crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1402 (setq data (ewoc-data crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1403 (setq dir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1404 (let ((crtdir (vc-dir-fileinfo->directory data))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1405 (if crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1406 crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1407 (file-name-directory (expand-file-name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1408 (vc-dir-fileinfo->name data)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1409 (if (string-equal argdir (substring dir 0 arglen)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1410 (when (vc-dir-fileinfo->marked data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1411 (error "Cannot mark `%s', child `%s' marked" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1412 (vc-dir-fileinfo->name argdata) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1413 (vc-dir-fileinfo->name data))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1414 ;; We are done, we got to an entry that is not a child of `arg'. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1415 (setq is-child nil))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1416 nil))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1417 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1418 (defun vc-dir-mark-file (&optional arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1419 ;; Mark ARG or the current file and move to the next line. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1420 (let* ((crt (or arg (ewoc-locate vc-ewoc))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1421 (file (ewoc-data crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1422 (isdir (vc-dir-fileinfo->directory file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1423 (when (or (and isdir (not (vc-dir-children-marked-p crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1424 (and (not isdir) (not (vc-dir-parent-marked-p crt)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1425 (setf (vc-dir-fileinfo->marked file) t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1426 (ewoc-invalidate vc-ewoc crt) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1427 (unless (or arg (mouse-event-p last-command-event)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1428 (vc-dir-next-line 1))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1429 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1430 (defun vc-dir-mark () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1431 "Mark the current file or all files in the region. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1432 If the region is active, mark all the files in the region. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1433 Otherwise mark the file on the current line and move to the next |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1434 line." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1435 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1436 (vc-dir-mark-unmark 'vc-dir-mark-file)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1437 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1438 (defun vc-dir-mark-all-files (arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1439 "Mark all files with the same state as the current one. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1440 With a prefix argument mark all files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1441 If the current entry is a directory, mark all child files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1442 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1443 The VC commands operate on files that are on the same state. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1444 This command is intended to make it easy to select all files that |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1445 share the same state." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1446 (interactive "P") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1447 (if arg |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1448 ;; Mark all files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1449 (progn |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1450 ;; First check that no directory is marked, we can't mark |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1451 ;; files in that case. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1452 (ewoc-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1453 (lambda (filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1454 (when (and (vc-dir-fileinfo->directory filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1455 (vc-dir-fileinfo->directory filearg)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1456 (error "Cannot mark all files, directory `%s' marked" |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1457 (vc-dir-fileinfo->name filearg)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1458 vc-ewoc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1459 (ewoc-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1460 (lambda (filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1461 (unless (vc-dir-fileinfo->marked filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1462 (setf (vc-dir-fileinfo->marked filearg) t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1463 t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1464 vc-ewoc)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1465 (let ((data (ewoc-data (ewoc-locate vc-ewoc)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1466 (if (vc-dir-fileinfo->directory data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1467 ;; It's a directory, mark child files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1468 (let ((crt (ewoc-locate vc-ewoc))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1469 (unless (vc-dir-children-marked-p crt) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1470 (while (setq crt (ewoc-next vc-ewoc crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1471 (let ((crt-data (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1472 (unless (vc-dir-fileinfo->directory crt-data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1473 (setf (vc-dir-fileinfo->marked crt-data) t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1474 (ewoc-invalidate vc-ewoc crt)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1475 ;; It's a file |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1476 (let ((state (vc-dir-fileinfo->state data)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1477 (crt (ewoc-nth vc-ewoc 0))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1478 (while crt |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1479 (let ((crt-data (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1480 (when (and (not (vc-dir-fileinfo->marked crt-data)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1481 (eq (vc-dir-fileinfo->state crt-data) state) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1482 (not (vc-dir-fileinfo->directory crt-data))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1483 (vc-dir-mark-file crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1484 (setq crt (ewoc-next vc-ewoc crt)))))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1485 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1486 (defun vc-dir-unmark-file () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1487 ;; Unmark the current file and move to the next line. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1488 (let* ((crt (ewoc-locate vc-ewoc)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1489 (file (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1490 (setf (vc-dir-fileinfo->marked file) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1491 (ewoc-invalidate vc-ewoc crt) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1492 (unless (mouse-event-p last-command-event) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1493 (vc-dir-next-line 1)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1494 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1495 (defun vc-dir-unmark () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1496 "Unmark the current file or all files in the region. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1497 If the region is active, unmark all the files in the region. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1498 Otherwise mark the file on the current line and move to the next |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1499 line." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1500 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1501 (vc-dir-mark-unmark 'vc-dir-unmark-file)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1502 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1503 (defun vc-dir-unmark-file-up () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1504 "Move to the previous line and unmark the file." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1505 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1506 ;; If we're on the first line, we won't move up, but we will still |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1507 ;; remove the mark. This seems a bit odd but it is what buffer-menu |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1508 ;; does. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1509 (let* ((prev (ewoc-goto-prev vc-ewoc 1)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1510 (file (ewoc-data prev))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1511 (setf (vc-dir-fileinfo->marked file) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1512 (ewoc-invalidate vc-ewoc prev) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1513 (vc-dir-move-to-goal-column))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1514 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1515 (defun vc-dir-unmark-all-files (arg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1516 "Unmark all files with the same state as the current one. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1517 With a prefix argument unmark all files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1518 If the current entry is a directory, unmark all the child files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1519 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1520 The VC commands operate on files that are on the same state. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1521 This command is intended to make it easy to deselect all files |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1522 that share the same state." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1523 (interactive "P") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1524 (if arg |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1525 (ewoc-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1526 (lambda (filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1527 (when (vc-dir-fileinfo->marked filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1528 (setf (vc-dir-fileinfo->marked filearg) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1529 t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1530 vc-ewoc) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1531 (let* ((crt (ewoc-locate vc-ewoc)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1532 (data (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1533 (if (vc-dir-fileinfo->directory data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1534 ;; It's a directory, unmark child files. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1535 (while (setq crt (ewoc-next vc-ewoc crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1536 (let ((crt-data (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1537 (unless (vc-dir-fileinfo->directory crt-data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1538 (setf (vc-dir-fileinfo->marked crt-data) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1539 (ewoc-invalidate vc-ewoc crt)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1540 ;; It's a file |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1541 (let ((crt-state (vc-dir-fileinfo->state (ewoc-data crt)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1542 (ewoc-map |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1543 (lambda (filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1544 (when (and (vc-dir-fileinfo->marked filearg) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1545 (eq (vc-dir-fileinfo->state filearg) crt-state)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1546 (setf (vc-dir-fileinfo->marked filearg) nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1547 t)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1548 vc-ewoc)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1549 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1550 (defun vc-dir-toggle-mark-file () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1551 (let* ((crt (ewoc-locate vc-ewoc)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1552 (file (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1553 (if (vc-dir-fileinfo->marked file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1554 (vc-dir-unmark-file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1555 (vc-dir-mark-file)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1556 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1557 (defun vc-dir-toggle-mark (e) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1558 (interactive "e") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1559 (vc-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1560 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1561 (defun vc-dir-register () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1562 "Register the marked files, or the current file if no marks." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1563 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1564 ;; FIXME: Just pass the fileset to vc-register. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1565 (mapc (lambda (arg) (vc-register nil arg)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1566 (or (vc-dir-marked-files) (list (vc-dir-current-file))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1567 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1568 (defun vc-dir-delete-file () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1569 "Delete the marked files, or the current file if no marks." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1570 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1571 (mapc 'vc-delete-file (or (vc-dir-marked-files) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1572 (list (vc-dir-current-file))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1573 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1574 (defun vc-dir-show-fileentry (file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1575 "Insert an entry for a specific file into the current VC status listing. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1576 This is typically used if the file is up-to-date (or has been added |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1577 outside of VC) and one wants to do some operation on it." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1578 (interactive "fShow file: ") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1579 (vc-dir-update (list (list (file-relative-name file) (vc-state file))) (current-buffer))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1580 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1581 (defun vc-dir-find-file () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1582 "Find the file on the current line." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1583 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1584 (find-file (vc-dir-current-file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1585 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1586 (defun vc-dir-find-file-other-window () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1587 "Find the file on the current line, in another window." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1588 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1589 (find-file-other-window (vc-dir-current-file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1590 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1591 (defun vc-dir-current-file () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1592 (let ((node (ewoc-locate vc-ewoc))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1593 (unless node |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1594 (error "No file available.")) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1595 (expand-file-name (vc-dir-fileinfo->name (ewoc-data node))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1596 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1597 (defun vc-dir-marked-files () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1598 "Return the list of marked files." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1599 (mapcar |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1600 (lambda (elem) (expand-file-name (vc-dir-fileinfo->name elem))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1601 (ewoc-collect vc-ewoc 'vc-dir-fileinfo->marked))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1602 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1603 (defun vc-dir-marked-only-files () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1604 "Return the list of marked files, for marked directories, return child files." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1605 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1606 (let ((crt (ewoc-nth vc-ewoc 0)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1607 result) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1608 (while crt |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1609 (let ((crt-data (ewoc-data crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1610 (if (vc-dir-fileinfo->marked crt-data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1611 (if (vc-dir-fileinfo->directory crt-data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1612 (let* ((dir (vc-dir-fileinfo->directory crt-data)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1613 (dirlen (length dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1614 data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1615 (while |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1616 (and (setq crt (ewoc-next vc-ewoc crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1617 (string-equal |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1618 (substring |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1619 (progn |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1620 (setq data (ewoc-data crt)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1621 (let ((crtdir (vc-dir-fileinfo->directory data))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1622 (if crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1623 crtdir |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1624 (file-name-directory |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1625 (expand-file-name |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1626 (vc-dir-fileinfo->name data)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1627 0 dirlen) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1628 dir)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1629 (unless (vc-dir-fileinfo->directory data) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1630 (push (vc-dir-fileinfo->name data) result)))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1631 (push (expand-file-name (vc-dir-fileinfo->name crt-data)) result) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1632 (setq crt (ewoc-next vc-ewoc crt))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1633 (setq crt (ewoc-next vc-ewoc crt))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1634 result)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1635 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1636 (defun vc-dir-hide-up-to-date () |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1637 "Hide up-to-date items from display." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1638 (interactive) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1639 (ewoc-filter |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1640 vc-ewoc |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1641 (lambda (crt) (not (eq (vc-dir-fileinfo->state crt) 'up-to-date))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1642 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1643 ;; FIXME: VCS-specific concept of backend needs to be factored out |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1644 (defun vc-default-status-fileinfo-extra (backend file) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1645 nil) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1646 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1647 (defun vc-dir-mark-buffer-changed (&optional fname) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1648 (let* ((file (or fname (expand-file-name buffer-file-name))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1649 (found-vc-dir-buf nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1650 (save-excursion |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1651 (dolist (status-buf (buffer-list)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1652 (set-buffer status-buf) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1653 ;; look for a vc-dir buffer that might show this file. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1654 (when (eq major-mode 'vc-dir-mode) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1655 (setq found-vc-dir-buf t) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1656 (let ((ddir (expand-file-name default-directory))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1657 ;; FIXME: VCS-specific stuff needs to be factored out. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1658 ;; This test is cvs-string-prefix-p |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1659 (when (eq t (compare-strings file nil (length ddir) ddir nil nil)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1660 (let* |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1661 ((file-short (substring file (length ddir))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1662 (backend (vc-backend file)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1663 (state (and backend (vc-state file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1664 (extra |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1665 (and backend |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1666 (vc-call-backend backend 'status-fileinfo-extra file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1667 (entry |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1668 (list file-short (if state state 'unregistered) extra))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1669 (vc-dir-update (list entry) status-buf)))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1670 ;; We didn't find any vc-dir buffers, remove the hook, it is |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1671 ;; not needed. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1672 (unless found-vc-dir-buf (remove-hook 'after-save-hook 'vc-dir-mark-buffer-changed))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1673 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1674 ;; These things should probably be generally available |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1675 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1676 (defun vc-file-tree-walk (dirname func &rest args) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1677 "Walk recursively through DIRNAME. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1678 Invoke FUNC f ARGS on each VC-managed file f underneath it." |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1679 (vc-file-tree-walk-internal (expand-file-name dirname) func args) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1680 (message "Traversing directory %s...done" dirname)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1681 |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1682 (defun vc-file-tree-walk-internal (file func args) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1683 (if (not (file-directory-p file)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1684 (when (vc-backend file) (apply func file args)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1685 (message "Traversing directory %s..." (abbreviate-file-name file)) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1686 (let ((dir (file-name-as-directory file))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1687 (mapcar |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1688 (lambda (f) (or |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1689 (string-equal f ".") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1690 (string-equal f "..") |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1691 (member f vc-directory-exclusion-list) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1692 (let ((dirf (expand-file-name f dir))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1693 (or |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1694 (file-symlink-p dirf) ;; Avoid possible loops. |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1695 (vc-file-tree-walk-internal dirf func args))))) |
61cca370b8f5
vc-dispatcher layer separation.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff
changeset
|
1696 (directory-files dir))))) |