Mercurial > emacs
annotate man/pcl-cvs.texi @ 55959:d410189413d7
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sun, 06 Jun 2004 21:44:22 +0000 |
parents | 746c40973d25 |
children | 6a40a8c28db7 eb7e8d483840 |
rev | line source |
---|---|
29349 | 1 \input texinfo @c -*-texinfo-*- |
2 @c %**start of header | |
3 @setfilename ../info/pcl-cvs | |
43280
cc6f9e18567a
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43264
diff
changeset
|
4 @settitle PCL-CVS --- Emacs Front-End to CVS |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
5 @syncodeindex vr fn |
29349 | 6 @c %**end of header |
7 | |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
8 @copying |
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
9 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, |
54836
746c40973d25
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-210
Miles Bader <miles@gnu.org>
parents:
52704
diff
changeset
|
10 1999, 2000, 2002, 2004 Free Software Foundation, Inc. |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
11 |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
12 @quotation |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
13 Permission is granted to copy, distribute and/or modify this document |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
14 under the terms of the GNU Free Documentation License, Version 1.1 or |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
15 any later version published by the Free Software Foundation; with the |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
16 Invariant Sections being ``The GNU Manifesto'', ``Distribution'' and |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
17 ``GNU GENERAL PUBLIC LICENSE'', with the Front-Cover texts being ``A GNU |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
18 Manual'', and with the Back-Cover Texts as in (a) below. A copy of the |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
19 license is included in the section entitled ``GNU Free Documentation |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
20 License'' in the Emacs manual. |
29349 | 21 |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
22 This document is part of a collection distributed under the GNU Free |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
23 Documentation License. If you want to distribute this document |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
24 separately from the collection, you can do so by adding a copy of the |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
25 license to the document, as described in section 6 of the license. |
29349 | 26 |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
27 (a) The FSF's Back-Cover Text is: ``You have freedom to copy and modify |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
28 this GNU Manual, like GNU software. Copies published by the Free |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
29 Software Foundation raise funds for GNU development.'' |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
30 @end quotation |
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
31 @end copying |
29349 | 32 |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
33 @dircategory Emacs |
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
34 @direntry |
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
35 * PCL-CVS: (pcl-cvs). Emacs front-end to CVS. |
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
36 @end direntry |
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
37 |
29349 | 38 @c The titlepage section does not appear in the Info file. |
39 @titlepage | |
40 @sp 4 | |
41 @c The title is printed in a large font. | |
42 @center @titlefont{User's Guide} | |
43 @sp | |
44 @center @titlefont{to} | |
45 @sp | |
30855 | 46 @center @titlefont{PCL-CVS --- The Emacs Front-End to CVS} |
29366
603d260f7741
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29349
diff
changeset
|
47 @ignore |
29349 | 48 @sp 2 |
49 @center release 2.9 | |
50 @c -release- | |
29366
603d260f7741
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29349
diff
changeset
|
51 @end ignore |
29349 | 52 @sp 3 |
53 @center Per Cederqvist | |
54 @center Stefan Monnier | |
55 @c -date- | |
56 | |
57 @c The following two commands start the copyright page | |
58 @c for the printed manual. This will not appear in the Info file. | |
59 @page | |
60 @vskip 0pt plus 1filll | |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
61 @insertcopying |
29349 | 62 @end titlepage |
63 | |
64 @c ================================================================ | |
65 @c The real text starts here | |
66 @c ================================================================ | |
67 | |
68 @node Top, About PCL-CVS, (dir), (dir) | |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
69 @ifnottex |
29349 | 70 @top PCL-CVS |
71 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
72 This manual describes PCL-CVS, the GNU Emacs front-end to CVS. It |
29366
603d260f7741
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29349
diff
changeset
|
73 is nowhere near complete, so you are advised to use @kbd{M-x |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
74 customize-group RET pcl-cvs @key{RET}} and to look at the documentation strings |
29366
603d260f7741
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29349
diff
changeset
|
75 of the various commands and major modes for further information. |
603d260f7741
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29349
diff
changeset
|
76 @c This manual is updated to release 2.5 of PCL-CVS. |
47737
0a70200bde27
use @copying instead of @ifinfo.
Karl Berry <karl@gnu.org>
parents:
46918
diff
changeset
|
77 @end ifnottex |
29349 | 78 |
79 @menu | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
80 * About PCL-CVS:: Installation, credits, history, @dots{} |
29349 | 81 |
82 * Getting started:: An introduction with a walk-through example. | |
83 * Buffer contents:: An explanation of the buffer contents. | |
84 * Selected files:: To which files are commands applied. | |
85 * Commands:: All commands, grouped by type. | |
86 | |
36059 | 87 * Log Edit Mode:: Major mode to edit log messages. |
88 * Log View Mode:: Major mode to browse log changes. | |
34950
95f07a5e1ee6
(Miscellaneous commands, Miscellaneous commands)
Dave Love <fx@gnu.org>
parents:
34304
diff
changeset
|
89 @c * CVS Status Mode:: Major mode to view CVS' status output. |
29349 | 90 * Customization:: How you can tailor PCL-CVS to suit your needs. |
91 * Bugs:: Bugs (known and unknown). | |
92 | |
93 * Function and Variable Index:: List of functions and variables. | |
94 * Concept Index:: List of concepts. | |
95 * Key Index:: List of keystrokes. | |
96 | |
97 @detailmenu | |
98 --- The Detailed Node Listing --- | |
99 | |
100 About PCL-CVS | |
101 | |
102 * Contributors:: Contributors to PCL-CVS. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
103 * Installation:: |
29349 | 104 |
105 Commands | |
106 | |
107 * Entering PCL-CVS:: Commands to invoke PCL-CVS | |
108 * Setting flags:: Setting flags for CVS commands | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
109 * Updating the buffer:: |
29349 | 110 * Movement commands:: How to move up and down in the buffer |
111 * Marking files:: How to mark files that other commands | |
112 will later operate on. | |
113 * Committing changes:: Checking in your modifications to the | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
114 CVS repository. |
29349 | 115 * Editing files:: Loading files into Emacs. |
116 * Getting info about files:: Display the log and status of files. | |
117 * Adding and removing files:: Adding and removing files | |
118 * Undoing changes:: Undoing changes | |
119 * Removing handled entries:: Uninteresting lines can easily be removed. | |
120 * Ignoring files:: Telling CVS to ignore generated files. | |
121 * Viewing differences:: Commands to @samp{diff} different versions. | |
122 * Invoking Ediff:: Running @samp{ediff} from @samp{*cvs*} buffer. | |
123 * Updating files:: Updating files that Need-update. | |
124 * Tagging files:: Tagging files. | |
125 * Miscellaneous commands:: Miscellaneous commands. | |
126 | |
127 Customization | |
128 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
129 * Customizing Faces:: |
29349 | 130 |
131 @end detailmenu | |
132 @end menu | |
133 | |
134 @node About PCL-CVS, Getting started, Top, Top | |
135 @chapter About PCL-CVS | |
136 @cindex About PCL-CVS | |
137 | |
138 PCL-CVS is a front-end to CVS versions 1.9 and later. | |
139 It concisely shows the present status of a checked out module in an | |
140 Emacs buffer and provides single-key access to the most frequently used CVS | |
141 commands. | |
142 For Emacs users accustomed to VC, PCL-CVS can be thought of as a replacement | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
143 for VC-dired (@pxref{VC Dired Mode, , Dired under VC, emacs, The GNU |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
144 Emacs Manual}) specifically designed for CVS. |
29349 | 145 |
146 PCL-CVS was originally written many years ago by Per Cederqvist who | |
147 proudly maintained it until January 1996, at which point he released the | |
148 beta version 2.0b2 and passed on the maintainership to Greg A Woods. | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
149 Development stayed mostly dormant for a few years during which |
29349 | 150 version 2.0 never seemed to be able to leave the ``beta'' stage while a |
29366
603d260f7741
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29349
diff
changeset
|
151 separate XEmacs version was slowly splitting away. In late 1998, |
29349 | 152 Stefan Monnier picked up development again, adding some major new |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
153 functionality and taking over the maintenance. |
29349 | 154 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
155 As of Emacs 21, PCL-CVS is part of the standard Emacs distribution. |
29349 | 156 |
157 @menu | |
158 * Contributors:: Contributors to PCL-CVS. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
159 * Installation:: |
29349 | 160 @end menu |
161 | |
162 @node Contributors, Installation, About PCL-CVS, About PCL-CVS | |
163 @section Contributors to PCL-CVS | |
164 @cindex Contributors | |
165 @cindex Authors | |
166 | |
167 Contributions to the package are welcome. I have limited time to work | |
168 on this project, but I will gladly add any code that you contribute to | |
169 me to this package (@pxref{Bugs}). | |
170 | |
171 The following persons have made contributions to PCL-CVS. | |
172 | |
173 @itemize @bullet | |
174 @item | |
175 Brian Berliner wrote CVS, together with some other contributors. | |
176 Without his work on CVS this package would be useless@dots{} | |
177 | |
178 @item | |
179 Per Cederqvist wrote most of the otherwise unattributed functions in | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
180 PCL-CVS as well as all the documentation. |
29349 | 181 |
182 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
183 @email{inge@@lysator.liu.se, Inge Wallin} wrote the skeleton of |
29349 | 184 @file{pcl-cvs.texi}, and gave useful comments on it. He also wrote |
185 the files @file{elib-node.el} and @file{compile-all.el}. The file | |
186 @file{cookie.el} was inspired by Inge.@refill | |
187 | |
188 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
189 @email{linus@@lysator.liu.se, Linus Tolke} contributed useful comments |
29349 | 190 on both the functionality and the documentation.@refill |
191 | |
192 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
193 @email{jwz@@jwz.com, Jamie Zawinski} contributed |
29349 | 194 @file{pcl-cvs-lucid.el}, which was later renamed to |
195 @file{pcl-cvs-xemacs.el}.@refill | |
196 | |
197 @item | |
46918
82d113655734
Minor spelling and grammar corrections.
Paul Eggert <eggert@twinsun.com>
parents:
44464
diff
changeset
|
198 Leif Lonnblad contributed RCVS support (since superseded by the new |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
199 remote CVS support). |
29349 | 200 |
201 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
202 @email{jimb@@cyclic.com, Jim Blandy} contributed hooks to automatically |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
203 guess CVS log entries from @file{ChangeLog} contents, and initial support of |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
204 the new Cygnus / Cyclic remote CVS, as well as various sundry bug fixes |
29349 | 205 and cleanups. |
206 | |
207 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
208 @email{kingdon@@cyclic.com, Jim Kingdon} contributed lots of fixes to |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
209 the build and installation procedure. |
29349 | 210 |
211 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
212 @email{woods@@weird.com, Greg A.@: Woods} contributed code to implement |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
213 the use of per-file diff buffers, and vendor join diffs with emerge and |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
214 ediff, as well as various and sundry bug fixes and cleanups. |
29349 | 215 |
216 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
217 @email{greg.klanderman@@alum.mit.edu, Greg Klanderman} implemented |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
218 toggling of marked files, setting of CVS command flags via prefix |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
219 arguments, updated the XEmacs support, updated the manual, and fixed |
29349 | 220 numerous bugs. |
221 | |
222 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
223 @email{monnier@@cs.yale.edu, Stefan Monnier} added a slew of other |
29349 | 224 features and introduced even more new bugs. If there's any bug left, |
225 you can be sure it's his. | |
226 | |
227 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
228 @c wordy to avoid an underfull hbox |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
229 @email{masata-y@@is.aist-nara.ac.jp, Masatake YAMATO} made a gracious |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
230 contribution of his cvstree code to display a tree of tags which was later |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
231 superseded by the new @code{cvs-status-mode}. |
29349 | 232 @end itemize |
233 | |
234 Apart from these, a lot of people have sent us suggestions, ideas, | |
235 requests, bug reports and encouragement. Thanks a lot! Without you | |
236 there would be no new releases of PCL-CVS. | |
237 | |
238 | |
239 @node Installation, , Contributors, About PCL-CVS | |
240 @section Installation | |
241 @cindex Installation | |
242 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
243 As mentioned above, PCL-CVS comes bundled with Emacs version 21.1 and |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
244 later. If you're using Emacs 20, you can download an older version of |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
245 PCL-CVS from @uref{ftp://flint.cs.yale.edu/pub/monnier/pcl-cvs}. That |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
246 version also works on XEmacs. |
29349 | 247 |
248 If you are running XEmacs 21.0 or later, PCL-CVS is available in | |
249 pre-compiled package form. Please refer to the XEmacs manual for | |
250 instructions regarding package selection and installation. Currently, | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
251 that PCL-CVS package also requires you to have installed the |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
252 @file{xemacs-base}, @file{elib}, and @file{dired} packages. |
29349 | 253 |
254 If you have @TeX{} installed at your site, you can make a typeset manual | |
255 from @file{pcl-cvs.texi}. | |
256 | |
257 @enumerate | |
258 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
259 If PCL-CVS came with the Emacs distribution, type @kbd{make pcl-cvs.dvi} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
260 in the @file{man} subdirectory of the Emacs source tree. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
261 @item |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
262 Alternatively, run @TeX{} by typing @kbd{texi2dvi pcl-cvs.texi}. |
29349 | 263 @item |
264 Convert the resulting device independent file @file{pcl-cvs.dvi} to a | |
265 form which your printer can output and print it. If you have a | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
266 PostScript printer, there is a program, @code{dvi2ps}, which does. There |
29349 | 267 is also a program which comes together with @TeX{}, @code{dvips}, which |
268 you can use. | |
269 @end enumerate | |
270 | |
271 | |
272 @node Getting started, Buffer contents, About PCL-CVS, Top | |
273 @chapter Getting started | |
274 @cindex Introduction | |
275 @cindex Example run | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
276 @cindex Sample session |
29349 | 277 |
278 This document assumes that you know what CVS is, and that you at least | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
279 know the fundamental concepts of CVS. If that is not the case, you |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
280 should read the CVS documentation. Type @kbd{info -f cvs} or @kbd{man |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
281 cvs}. |
29349 | 282 |
283 PCL-CVS is only useful once you have checked out a module. So before | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
284 you invoke it, you must have a copy of a module somewhere in the file |
29349 | 285 system. |
286 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
287 You can invoke PCL-CVS by typing @kbd{M-x cvs-examine @key{RET}}. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
288 You can also invoke it via the menu bar, under @samp{Tools}. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
289 Or, if you prefer, you can also invoke PCL-CVS by simply visiting the |
29349 | 290 CVS administrative subdirectory of your module, with a prefix argument. |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
291 For example, to invoke PCL-CVS in a separate frame, type @kbd{C-u C-x 5 |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
292 f ~/my/project/CVS @key{RET}}. |
29349 | 293 |
294 The function @code{cvs-examine} will ask for a directory. The command | |
295 @samp{cvs -n update} will be run in that directory. (It should contain | |
296 files that have been checked out from a CVS archive.) The output from | |
297 @code{cvs} will be parsed and presented in a table in a buffer called | |
298 @samp{*cvs*}. It might look something like this: | |
299 | |
300 @example | |
301 Repository : /usr/CVSroot | |
302 Module : test | |
303 Working dir: /users/ceder/FOO/test | |
304 | |
305 | |
306 In directory .: | |
307 Need-Update bar | |
308 Need-Update file.txt | |
309 Modified namechange | |
310 Need-Update newer | |
311 In directory sub: | |
312 Modified ChangeLog | |
313 | |
314 --------------------- End --------------------- | |
315 -- last cmd: cvs -f -z6 -n update -d -P -- | |
316 @end example | |
317 | |
318 In this example, your repository is in @file{/usr/CVSroot} and CVS has | |
319 been run in the directory @file{/users/ceder/FOO/test}. The three files | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
320 (@file{bar}, @file{file.txt} and |
29349 | 321 @file{newer}) that are marked with @samp{Need-Update} have been changed |
322 by someone else in the CVS repository. Two files (@file{namechange} | |
323 and @file{sub/ChangeLog}) have been modified locally, and need to be | |
324 checked in. | |
325 | |
326 You can move the cursor up and down in the buffer with @kbd{C-n} and | |
327 @kbd{C-p} or @kbd{n} and @kbd{p}. If you press @kbd{c} on one of the | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
328 @samp{Modified} files, that file will be checked in to the CVS |
29349 | 329 repository. @xref{Committing changes}. You can also press @kbd{O} to |
330 update any of the files that are marked @samp{Need-Update}. You can | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
331 also run @kbd{M-x cvs-update @key{RET}} (bound to @kbd{M-u} in the |
29349 | 332 @samp{*cvs*} buffer) to update all the files.@refill |
333 | |
334 You can then press @kbd{=} to easily get a @samp{diff} between your | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
335 modified file and the base version that you started from, or you can |
29349 | 336 press @kbd{l} to get the output from @samp{cvs log}. Many more such |
337 commands are available simply by pressing a key (@pxref{Getting info | |
338 about files}). | |
339 | |
340 @node Buffer contents, Selected files, Getting started, Top | |
341 @chapter Buffer contents | |
342 @cindex Buffer contents | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
343 @cindex @code{*cvs*} buffer contents |
29349 | 344 |
345 The display contains several columns, some of which are optional. | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
346 These columns are, from left to right: |
29349 | 347 |
348 @itemize @bullet | |
349 | |
350 @item | |
351 Optionally, the head revision of the file. This is the latest version | |
352 found in the repository. It might also contain (instead of the head | |
353 revision) a sub status which typically gives further information about | |
354 how we got to the current state, for example @samp{patched}, | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
355 @samp{merged}, @dots{} |
29349 | 356 |
357 @item | |
358 An asterisk when the file is @dfn{marked} (@pxref{Selected | |
359 files}).@refill | |
360 | |
361 @item | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
362 The actual status of the file wrt the repository. See below. |
29349 | 363 |
364 @item | |
365 Optionally, the base revision of the file. This is the version | |
366 which the copy in your working directory is based upon. | |
367 | |
368 @item | |
369 The file name. | |
370 | |
371 @end itemize | |
372 | |
373 The @samp{file status} field can have the following values: | |
374 | |
375 @table @samp | |
376 @item Modified | |
377 The file is modified in your working directory, and there was no | |
378 modification to the same file in the repository. This status can have | |
379 the following substatus: | |
380 | |
381 @table @samp | |
382 @item merged | |
383 The file was modified in your working directory, and there were | |
384 modifications in the repository as well, but they were merged | |
385 successfully, without conflict, in your working directory.@refill | |
386 @end table | |
387 | |
388 @item Conflict | |
389 A conflict was detected while trying to merge your changes to @var{file} | |
390 with changes from the repository. @var{file} (the copy in your | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
391 working directory) is now the output of the @code{rcsmerge} command on |
29349 | 392 the two versions; an unmodified copy of your file is also in your |
393 working directory, with the name @file{.#@var{file}.@var{version}}, | |
394 where @var{version} is the RCS revision that your modified file started | |
395 from. @xref{Viewing differences}, for more details.@refill | |
396 | |
397 A conflict can also come from a disagreement on the existence of the file | |
398 rather than on its content. This case is indicated by the following | |
399 possible substatus: | |
400 | |
401 @table @samp | |
402 @item removed | |
403 The file is locally removed but a new revision has been committed to | |
404 the repository by someone else. | |
405 | |
406 @item added | |
407 The file is locally added and has also been added to the repository | |
408 by someone else. | |
409 | |
410 @item modified | |
411 The file is locally modified but someone else has removed it from the | |
412 repository. | |
413 @end table | |
414 | |
415 @item Added | |
416 The file has been added by you, but it still needs to be checked in to | |
417 the repository.@refill | |
418 | |
419 @item Removed | |
420 The file has been removed by you, but it still needs to be checked in to | |
421 the repository. You can resurrect it by typing @kbd{a} (@pxref{Adding | |
422 and removing files}).@refill | |
423 | |
424 @item Unknown | |
425 A file that was detected in your directory, but that neither appears in | |
426 the repository, nor is present on the list of files that CVS should | |
427 ignore.@refill | |
428 | |
429 @item Up-to-date | |
430 The file is up to date with respect to the version in the repository. | |
431 This status can have a substatus of: | |
432 | |
433 @table @samp | |
434 @item added | |
435 You have just added the file to the repository.@refill | |
436 | |
437 @item updated | |
438 The file was brought up to date with respect to the repository. This is | |
439 done for any file that exists in the repository but not in your source, | |
440 and for files that you haven't changed but are not the most recent | |
441 versions available in the repository.@refill | |
442 | |
443 @item patched | |
444 The file was brought up to date with respect to the remote repository by | |
445 way of fetching and applying a patch to the file in your source. This | |
446 is equivalent to @samp{updated} except that CVS decided to use a hopefully | |
447 more efficient method.@refill | |
448 | |
449 @item committed | |
450 You just committed the file.@refill | |
451 @end table | |
452 | |
453 @item Need-Update | |
454 Either a newer version than the one in your source is available in the | |
455 repository and you have not modified your checked out version, or the | |
456 file exists in the repository but not in your source. Use | |
457 @samp{cvs-mode-update} bound to @kbd{O} to update the file.@refill | |
458 | |
459 @item Need-Merge | |
460 You have modified the checked out version of the file, and a newer | |
461 version is available in the repository. A merge will take place when | |
462 you run a @samp{cvs-update}. | |
463 | |
464 @item Missing | |
465 The file has been unexpectedly removed from your working directory | |
466 although it has not been @samp{cvs remove}d. | |
467 @end table | |
468 | |
469 @node Selected files, Commands, Buffer contents, Top | |
470 @chapter Selected files | |
471 @cindex Selected files | |
472 @cindex Marked files | |
473 @cindex File selection | |
474 @cindex Active files | |
475 @cindex Applicable | |
476 | |
477 Many of the commands work on the current set of @dfn{selected} files | |
478 which can be either the set of marked files (if any file is marked and | |
52668
54529275b2ef
(Selected Files): Fix typo.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
52401
diff
changeset
|
479 marks are not ignored) or whichever file or directory the cursor is on. |
29349 | 480 |
481 If a directory is selected but the command cannot be applied to a | |
482 directory, then it will be applied to the set of files under this | |
483 directory which are in the @samp{*cvs*} buffer. | |
484 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
485 @findex cvs-mode-force-command |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
486 @findex cvs-allow-dir-commit |
29349 | 487 Furthermore, each command only operates on a subset of the selected |
488 files, depending on whether or not the command is @dfn{applicable} to | |
489 each file (based on the file's status). For example, | |
490 @code{cvs-mode-commit} is not applicable to a file whose status is | |
491 @samp{Need-Update}. If it should happen that PCL-CVS guesses the | |
492 applicability wrong, you can override it with the special prefix | |
493 @code{cvs-mode-force-command} normally bound to @kbd{M-f} (and file a | |
494 bug report). The applicability rule can be slightly changed with | |
495 @code{cvs-allow-dir-commit} and @code{cvs-force-dir-tag}. | |
496 | |
497 By default, marks are always in effect (you may change this, however, by | |
498 setting the variable @code{cvs-default-ignore-marks}) except for the | |
499 commands that @samp{tag} or @samp{diff} a file (which can be changed | |
500 with the variable @code{cvs-invert-ignore-marks}). | |
501 | |
502 In addition, you may use the special prefix @code{cvs-mode-toggle-marks} | |
503 normally bound to @key{T} to toggle the use of marks for the following | |
504 command. | |
505 | |
506 This scheme might seem a little complicated, but once one gets used to | |
507 it, it is quite powerful. | |
508 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
509 For commands to mark and unmark files, see @ref{Marking files}. |
29349 | 510 |
36059 | 511 @node Commands, Log Edit Mode, Selected files, Top |
29349 | 512 @chapter Commands |
513 | |
514 @iftex | |
515 This chapter describes all the commands that you can use in PCL-CVS. | |
516 @end iftex | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
517 @ifnottex |
29349 | 518 The nodes in this menu contains explanations about all the commands that |
519 you can use in PCL-CVS. They are grouped together by type. | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
520 @end ifnottex |
29349 | 521 |
522 @menu | |
523 * Entering PCL-CVS:: Commands to invoke PCL-CVS | |
524 * Setting flags:: Setting flags for CVS commands | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
525 * Updating the buffer:: |
29349 | 526 * Movement commands:: How to move up and down in the buffer |
527 * Marking files:: How to mark files that other commands | |
528 will later operate on. | |
529 * Committing changes:: Checking in your modifications to the | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
530 CVS repository. |
29349 | 531 * Editing files:: Loading files into Emacs. |
532 * Getting info about files:: Display the log and status of files. | |
533 * Adding and removing files:: Adding and removing files | |
534 * Undoing changes:: Undoing changes | |
535 * Removing handled entries:: Uninteresting lines can easily be removed. | |
536 * Ignoring files:: Telling CVS to ignore generated files. | |
537 * Viewing differences:: Commands to @samp{diff} different versions. | |
538 * Invoking Ediff:: Running @samp{ediff} from @samp{*cvs*} buffer. | |
539 * Updating files:: Updating files that Need-update. | |
540 * Tagging files:: Tagging files. | |
541 * Miscellaneous commands:: Miscellaneous commands. | |
542 @end menu | |
543 | |
544 | |
545 @node Entering PCL-CVS, Setting flags, Commands, Commands | |
546 @section Entering PCL-CVS | |
547 @findex cvs-update | |
548 @findex cvs-examine | |
549 @findex cvs-status | |
550 @findex cvs-checkout | |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
551 @findex cvs-quickdir |
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
552 @cindex Creating the *cvs* buffer |
29349 | 553 |
554 Most commands in PCL-CVS require that you have a @samp{*cvs*} | |
555 buffer. The commands that you use to get one are listed below. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
556 For each, a @samp{cvs} process will be run, the output will be parsed by |
29349 | 557 PCL-CVS, and the result will be printed in the @samp{*cvs*} buffer (see |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
558 @ref{Buffer contents}, for a description of the buffer's contents). |
29349 | 559 |
560 @table @kbd | |
561 @item M-x cvs-update | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
562 Run a @samp{cvs update} command. You will be asked for the directory |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
563 in which the @samp{cvs update} will be run. |
29349 | 564 |
565 @item M-x cvs-examine | |
566 Run a @samp{cvs -n update} command. This is identical to the previous | |
567 command, except that it will only check what needs to be done but will | |
568 not change anything. You will be asked for the directory in | |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
569 which the @samp{cvs -n update} will be run. |
29349 | 570 |
571 @item M-x cvs-status | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
572 Run a @samp{cvs status} command. You will be asked for the directory |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
573 in which the @samp{cvs status} will be run. |
29349 | 574 |
575 @item M-x cvs-checkout | |
576 Run a @samp{cvs checkout} command. You will be asked for the directory | |
577 in which the @samp{cvs update} will be run and the module to be checked | |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
578 out. |
29349 | 579 |
580 @item M-x cvs-quickdir | |
581 Populate the @samp{*cvs*} buffer by just looking at the @file{CVS/Entries} | |
582 files. This is very much like @code{cvs-examine} except that it does | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
583 not access the CVS repository, which is a major advantage when the |
29349 | 584 repository is far away. But of course, it will not be able to detect |
585 when a file needs to be updated or merged. | |
586 @end table | |
587 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
588 @findex cvs-dired-action |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
589 @findex cvs-dired-use-hook |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
590 The first four of |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
591 those commands are also reachable from the menu bar |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
592 under @samp{Tools->PCL-CVS}. Finally, an alternative way is to visit |
32042
81c2a01bd3b3
Use GFDL instead of GPL, plus a few tiny fixes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30855
diff
changeset
|
593 the CVS administrative subdirectory in your work area with a simple |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
594 prefix argument. For example @kbd{C-u C-x C-f ~/my/work/CVS @key{RET}}. This |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
595 by default runs @code{cvs-quickdir} but the specific behavior can be |
29349 | 596 changed with @code{cvs-dired-action} and @code{cvs-dired-use-hook}. |
597 | |
598 By default, the commands above will descend recursively into | |
599 subdirectories. You can avoid that behavior by including @samp{-l} in | |
600 the flags for the command. These flags can be set by giving a prefix | |
601 argument to the command (e.g., by typing | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
602 @kbd{C-u M-x cvs-update @key{RET} -l @key{RET}}). |
29349 | 603 |
604 | |
605 @node Setting flags, Updating the buffer, Entering PCL-CVS, Commands | |
606 @section Setting flags for CVS commands | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
607 @cindex Optional switches to CVS |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
608 @cindex Command-line options to CVS |
29349 | 609 |
610 This section describes the convention used by nearly all PCL-CVS | |
611 commands for setting optional flags sent to CVS. A single @kbd{C-u} | |
612 prefix argument is used to cause the command to prompt for flags to be | |
613 used for the current invocation of the command only. Two @kbd{C-u} prefix | |
614 arguments are used to prompt for flags which will be set permanently, for the | |
615 current invocation and all that follow, until the flags are changed, or | |
616 unless temporary flags are set which override them. | |
617 | |
618 Perhaps an example or two is in order. Say you are about to add a | |
619 binary file to the repository, and want to specify the flags @samp{-kb} | |
44464
ca04149c39a4
cvs-mode-add does not ask for a description any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43280
diff
changeset
|
620 to @samp{cvs add}. You can type @kbd{C-u a -kb @key{RET}}, |
ca04149c39a4
cvs-mode-add does not ask for a description any more.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
43280
diff
changeset
|
621 and the file will be added. Subsequent @samp{cvs add} |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
622 commands will use the previously prevailing flags. |
29349 | 623 |
624 As a second example, say you are about to perform a diff and want to see | |
625 the result in unified diff format, i.e. you'd like to pass the flag | |
626 @samp{-u} to both @samp{cvs diff} and @samp{diff}. You'd also like all | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
627 subsequent diffs to use this flag. You can type @kbd{C-u C-u = -u @key{RET}} |
29349 | 628 and the diff will be performed, and the default flags will be set to |
629 @code{("-u")}. You can of course override this flag for a single diff | |
630 by using a single @kbd{C-u} prefix argument. | |
631 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
632 @cindex Special prefix |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
633 In addition to this, some commands can take @dfn{special prefix} arguments. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
634 These work as follows: When called with a @kbd{C-u} prefix, the user is |
29349 | 635 prompted for a new value of the special prefix and the special prefix is |
636 activated for the next command. When called without the @kbd{C-u} | |
637 prefix, the special prefix is re-activated (with the same value as last | |
638 time) for the next command. Calling the prefix command again when it's | |
639 already activated deactivates it. Calling it with the @kbd{C-u C-u} | |
640 prefix activates it for all subsequent commands until you deactivate it | |
641 explicitly. The special prefixes are: | |
642 | |
643 @table @kbd | |
644 @item T | |
645 Toggles whether or not marks will be active in the next command.@refill | |
646 | |
647 @item b | |
648 Provide the next command with a branch (can be any version | |
649 specifier) to work on.@refill | |
650 | |
651 @item B | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
652 Secondary branch argument. Only meaningful if @kbd{b} is also used. |
29349 | 653 It can be used to provide a second branch argument to |
654 @code{cvs-mode-diff} or to @code{cvs-mode-update}. | |
655 | |
656 @item M-f | |
657 Forces the next command to apply to every selected file rather than only | |
658 to the ones PCL-CVS thinks are relevant. | |
659 @end table | |
660 | |
661 @node Updating the buffer, Movement commands, Setting flags, Commands | |
662 @section Updating the @samp{*cvs*} buffer | |
663 @findex cvs-update | |
664 @findex cvs-examine | |
665 @findex cvs-status | |
666 @findex cvs-mode-update | |
667 @findex cvs-mode-examine | |
668 @findex cvs-mode-status | |
669 | |
670 The following commands can be used from within the @samp{*cvs*} buffer | |
671 to update the display: | |
672 | |
673 @table @kbd | |
674 @item M-u | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
675 Runs the command @samp{cvs-update}.@refill |
29349 | 676 |
677 @item M-e | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
678 Runs the command @samp{cvs-examine}.@refill |
29349 | 679 |
680 @item M-s | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
681 Runs the command @samp{cvs-status}.@refill |
29349 | 682 @end table |
683 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
684 In addition to the above commands which operate on the whole module, |
29349 | 685 you can run the equivalent CVS command on just a subset of the |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
686 files/directories with these keys: |
29349 | 687 |
688 @table @kbd | |
689 @item O | |
690 Runs @code{cvs-mode-update} on the selected files. When run on the | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
691 top-level directory, this is equivalent to @kbd{M-u}.@refill |
29349 | 692 |
693 @item e | |
694 Runs @code{cvs-mode-examine} on the selected files. When run on the | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
695 top-level directory, this is equivalent to @kbd{M-e}.@refill |
29349 | 696 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
697 @findex cvs-status-mode |
29349 | 698 @item s |
699 Runs @code{cvs-mode-status} on the selected files. When run on the | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
700 top-level directory, this is equivalent to @kbd{M-s}, except that |
29349 | 701 CVS output will be shown in a @samp{*cvs-info*} buffer that will be |
702 put in @samp{cvs-status-mode}.@refill | |
703 @end table | |
704 | |
705 | |
706 @node Movement commands, Marking files, Updating the buffer, Commands | |
707 @section Movement Commands | |
708 @cindex Movement Commands | |
709 @findex cvs-mode-next-line | |
710 @findex cvs-mode-previous-line | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
711 @kindex SPC@r{--Move down one file} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
712 @kindex n@r{--Move down one file} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
713 @kindex p@r{--Move up one file} |
29349 | 714 |
715 You can use most normal Emacs commands to move forward and backward in | |
716 the buffer. Some keys are rebound to functions that take advantage of | |
717 the fact that the buffer is a PCL-CVS buffer: | |
718 | |
719 | |
720 @table @kbd | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
721 @item @key{SPC} |
29349 | 722 @itemx n |
723 These keys move the cursor one file forward, towards the end of the | |
724 buffer (@code{cvs-mode-next-line}).@refill | |
725 | |
726 @itemx p | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
727 This key moves one file backward, towards the beginning of the buffer |
29349 | 728 (@code{cvs-mode-previous-line}). |
729 @end table | |
730 | |
731 | |
732 @node Marking files, Committing changes, Movement commands, Commands | |
733 @section Marking files | |
734 @cindex Selecting files (commands to mark files) | |
735 @cindex Marking files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
736 @kindex m@r{--marking a file} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
737 @kindex M@r{--marking all files} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
738 @kindex u@r{--unmark a file} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
739 @kindex ESC DEL@r{--unmark all files} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
740 @kindex DEL@r{--unmark previous file} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
741 @kindex %@r{--mark files matching regexp} |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
742 @kindex S@r{--mark files in a particular state} |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
743 @kindex T@r{--toggle marks} |
29349 | 744 @findex cvs-mode-mark |
745 @findex cvs-mode-unmark | |
746 @findex cvs-mode-mark-all-files | |
747 @findex cvs-mode-unmark-all-files | |
748 @findex cvs-mode-unmark-up | |
749 @findex cvs-mode-mark-matching-files | |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
750 @findex cvs-mode-mark-on-state |
29349 | 751 @findex cvs-mode-toggle-marks |
752 | |
753 PCL-CVS works on a set of @dfn{selected files} (@pxref{Selected files}). | |
754 You can mark and unmark files with these commands: | |
755 | |
756 @table @kbd | |
757 @item m | |
758 This marks the file that the cursor is positioned on. If the cursor is | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
759 positioned on a directory all files in that directory are marked. |
29349 | 760 (@code{cvs-mode-mark}).@refill |
761 | |
762 @item u | |
763 Unmark the file that the cursor is positioned on. If the cursor is on a | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
764 directory, all files in that directory are unmarked. |
29349 | 765 (@code{cvs-mode-unmark}).@refill |
766 | |
767 @item M | |
768 Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}). | |
769 | |
770 @item M-@key{DEL} | |
771 Unmark @emph{all} files (@code{cvs-mode-unmark-all-files}). | |
772 | |
773 @item @key{DEL} | |
774 Unmark the file on the previous line, and move point to that line | |
775 (@code{cvs-mode-unmark-up}). | |
776 | |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
777 @item % |
29349 | 778 Mark all files matching a regular expression |
779 (@code{cvs-mode-mark-matching-files}). | |
780 | |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
781 @item S |
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
782 Mark all files in a particular state, such as ``Modified'' or |
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
783 ``Removed''. (@code{cvs-mode-mark-on-state}). |
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
784 |
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
785 @item T |
29349 | 786 Toggle use of marks for the next command (@code{cvs-mode-toggle-marks}). |
787 @end table | |
788 | |
789 | |
790 @node Committing changes, Editing files, Marking files, Commands | |
791 @section Committing changes | |
792 @cindex Committing changes | |
793 @findex cvs-mode-commit | |
794 @findex cvs-mode-commit-setup | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
795 @kindex c@r{--commit files} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
796 @kindex C@r{--commit files with @file{ChangeLog} message} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
797 @vindex cvs-auto-revert@r{ (variable)} |
29349 | 798 @cindex Commit buffer |
799 @cindex Edit buffer | |
800 @cindex Erasing commit message | |
801 @cindex Reverting buffers after commit | |
802 | |
803 Committing changes basically works as follows: | |
804 | |
805 @enumerate | |
806 @item | |
807 After having selected the files you want to commit, you type either | |
808 @kbd{c} or @kbd{C} which brings up a special buffer | |
809 @samp{*cvs-commit*}.@refill | |
810 | |
811 @item | |
812 You type in the log message describing the changes you're about to | |
36059 | 813 commit (@pxref{Log Edit Mode}). |
29349 | 814 |
815 @item | |
816 When you're happy with it, you type @kbd{C-c C-c} to do the actual | |
817 commit.@refill | |
818 @end enumerate | |
819 | |
820 There's no hidden state, so you can abort the process or pick it up | |
821 again at any time. | |
822 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
823 @vindex log-edit-confirm@r{ (variable)} |
29349 | 824 The set of files actually committed is really decided only during the |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
825 very last step, which is a mixed blessing. It allows you to go back and |
29349 | 826 change your mind about which files to commit, but it also means that you |
827 might inadvertently change the set of selected files. To reduce the | |
828 risk of error, @kbd{C-c C-c} will ask for confirmation if the set of | |
829 selected files has changed between the first step and the last. You can | |
830 change this last detail with @code{log-edit-confirm}. | |
831 | |
832 As for the difference between @kbd{c} (i.e. @code{cvs-mode-commit}) and | |
833 @kbd{C} (i.e. @code{cvs-mode-commit-setup}) is that the first gets you | |
834 straight to @samp{*cvs-commit*} without erasing it or changing anything | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
835 to its content, while the second first erases @samp{*cvs-commit*} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
836 and tries to initialize it with a sane default (it does that by either |
29349 | 837 using a template provided by the CVS administrator or by extracting a |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
838 relevant log message from a @file{ChangeLog} file). |
29349 | 839 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
840 If you are editing the files in your Emacs, an automatic |
29349 | 841 @samp{revert-buffer} will be performed. (If the file contains |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
842 @samp{$@asis{Id}$} keywords, @samp{cvs commit} will write a new file with |
29349 | 843 the new values substituted. The auto-revert makes sure that you get |
844 them into your buffer). The revert will not occur if you have modified | |
845 your buffer, or if @samp{cvs-auto-revert} is set to | |
846 @samp{nil}. | |
847 | |
848 | |
849 @node Editing files, Getting info about files, Committing changes, Commands | |
850 @section Editing files | |
851 @cindex Editing files | |
852 @cindex Finding files | |
853 @cindex Loading files | |
854 @cindex Dired | |
855 @cindex Invoking dired | |
856 @findex cvs-mode-find-file | |
857 @findex cvs-mode-find-file-other-window | |
858 @findex cvs-mode-add-change-log-entry-other-window | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
859 @kindex f@r{--find file or directory} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
860 @kindex o@r{--find file in other window} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
861 @kindex A@r{--add @file{ChangeLog} entry} |
29349 | 862 |
863 There are currently three commands that can be used to find a file (that | |
864 is, load it into a buffer and start editing it there). These commands | |
865 work on the line that the cursor is situated at. They always ignore any marked | |
866 files. | |
867 | |
868 @table @kbd | |
869 @item f | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
870 Find the file that the cursor points to (@code{cvs-mode-find-file}). If |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
871 the cursor points to a directory, run @code{dired} on that directory; |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
872 @inforef{Dired, , emacs}. |
29349 | 873 |
874 @item o | |
875 Like @kbd{f}, but use another window | |
876 (@code{cvs-mode-find-file-other-window}).@refill | |
877 | |
878 @item A | |
879 Invoke @samp{add-change-log-entry-other-window} to edit a | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
880 @file{ChangeLog} file. The @file{ChangeLog} file will be found in the |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
881 directory of the file the cursor points to, or in a parent of that |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
882 directory. (@code{cvs-mode-add-change-log-entry-other-window}).@refill |
29349 | 883 @end table |
884 | |
885 | |
886 @node Getting info about files, Adding and removing files, Editing files, Commands | |
887 @section Getting info about files | |
888 @cindex Status (cvs command) | |
889 @cindex Log (RCS/cvs command) | |
890 @cindex Getting status | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
891 @kindex l@r{--run @samp{cvs log}} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
892 @kindex s@r{--run @samp{cvs status}} |
29349 | 893 @findex cvs-mode-log |
894 @findex cvs-mode-status | |
895 | |
896 @table @kbd | |
897 @item l | |
898 Call the command @code{cvs-mode-log} which runs @samp{cvs log} on all | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
899 selected files, and show the result in a temporary buffer |
36059 | 900 @samp{*cvs-info*} (@pxref{Log View Mode}). |
29349 | 901 |
902 @item s | |
903 Call the command @code{cvs-mode-status} which runs @samp{cvs status} on | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
904 all selected files, and show the result in a temporary buffer |
34950
95f07a5e1ee6
(Miscellaneous commands, Miscellaneous commands)
Dave Love <fx@gnu.org>
parents:
34304
diff
changeset
|
905 @samp{*cvs-info*}. |
95f07a5e1ee6
(Miscellaneous commands, Miscellaneous commands)
Dave Love <fx@gnu.org>
parents:
34304
diff
changeset
|
906 @c Fixme: reinstate when node is written: |
95f07a5e1ee6
(Miscellaneous commands, Miscellaneous commands)
Dave Love <fx@gnu.org>
parents:
34304
diff
changeset
|
907 @c (@pxref{CVS Status Mode}). |
29349 | 908 @end table |
909 | |
910 | |
911 @node Adding and removing files, Undoing changes, Getting info about files, Commands | |
912 @section Adding and removing files | |
913 @cindex Adding files | |
914 @cindex Removing files | |
915 @cindex Resurrecting files | |
916 @cindex Deleting files | |
917 @cindex Putting files under CVS control | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
918 @kindex a@r{--add a file} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
919 @kindex r@r{--remove a file} |
29349 | 920 @findex cvs-mode-add |
921 @findex cvs-mode-remove-file | |
922 | |
48701 | 923 The following commands are available to make it easy to add files to |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
924 and remove them from the CVS repository. |
29349 | 925 |
926 @table @kbd | |
927 @item a | |
928 Add all selected files. This command can be used on @samp{Unknown} | |
929 files (@pxref{Buffer contents}). The status of the file will change to | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
930 @samp{Added}, and you will have to use @kbd{c} (@samp{cvs-mode-commit} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
931 @pxref{Committing changes}), to really add the file to the |
29349 | 932 repository.@refill |
933 | |
934 This command can also be used on @samp{Removed} files (before you commit | |
935 them) to resurrect them. | |
936 | |
937 The command that is run is @code{cvs-mode-add}. | |
938 | |
939 @item r | |
940 This command removes the selected files (after prompting for | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
941 confirmation). The files are deleted from your directory and |
29349 | 942 (unless the status was @samp{Unknown}; @pxref{Buffer contents}) they will |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
943 also be @samp{cvs remove}d. If the files' status was @samp{Unknown} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
944 they will disappear from the buffer. Otherwise their status will change to |
29349 | 945 @samp{Removed}, and you must use @kbd{c} (@samp{cvs-mode-commit}, |
946 @pxref{Committing changes}) to commit the removal.@refill | |
947 | |
948 The command that is run is @code{cvs-mode-remove-file}. | |
949 @end table | |
950 | |
951 | |
952 @node Undoing changes, Removing handled entries, Adding and removing files, Commands | |
953 @section Undoing changes | |
954 @cindex Undo changes | |
955 @cindex Flush changes | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
956 @kindex U@r{--undo changes} |
29349 | 957 @findex cvs-mode-undo-local-changes |
958 | |
959 @table @kbd | |
960 @item U | |
961 If you have modified a file, and for some reason decide that you don't | |
962 want to keep the changes, you can undo them with this command. It works | |
963 by removing your working copy of the file and then getting the latest | |
964 version from the repository (@code{cvs-mode-undo-local-changes}. | |
965 @end table | |
966 | |
967 | |
968 @node Removing handled entries, Ignoring files, Undoing changes, Commands | |
969 @section Removing handled entries | |
970 @cindex Expunging uninteresting entries | |
971 @cindex Uninteresting entries, getting rid of them | |
972 @cindex Getting rid of uninteresting lines | |
973 @cindex Removing uninteresting (processed) lines | |
974 @cindex Handled lines, removing them | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
975 @kindex x@r{--remove processed entries} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
976 @kindex C-k@r{--remove selected entries} |
29349 | 977 @findex cvs-mode-remove-handled |
978 @findex cvs-mode-acknowledge | |
979 @findex cvs-mode-ignore | |
980 | |
981 @table @kbd | |
982 @item x | |
983 This command allows you to remove all entries that you have processed. | |
984 More specifically, the lines for @samp{Up-to-date} files (@pxref{Buffer | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
985 contents}) are removed from the buffer. If a directory becomes empty |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
986 the heading for that directory is also removed. This makes it easier to |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
987 get an overview of what needs to be done. |
29349 | 988 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
989 @vindex cvs-mode-remove-handled@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
990 @kbd{x} invokes @code{cvs-mode-remove-handled}. If |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
991 @samp{cvs-auto-remove-handled} is set to non-@code{nil}, this will |
29349 | 992 automatically be performed after every commit.@refill |
993 | |
994 @item C-k | |
995 This command can be used for lines that @samp{cvs-mode-remove-handled} would | |
996 not delete, but that you want to delete (@code{cvs-mode-acknowledge}). | |
997 @end table | |
998 | |
999 | |
1000 @node Ignoring files, Viewing differences, Removing handled entries, Commands | |
1001 @section Ignoring files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1002 @cindex Ignoring files |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1003 @kindex i@r{--ignoring files} |
29349 | 1004 @findex cvs-mode-ignore |
1005 | |
1006 @table @kbd | |
1007 @item i | |
1008 Arrange so that CVS will ignore the selected files. The file names are | |
1009 added to the @file{.cvsignore} file in the corresponding directory. If | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1010 the @file{.cvsignore} file doesn't exist, it will be created. |
29349 | 1011 |
1012 The @file{.cvsignore} file should normally be added to the repository, | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1013 but you could ignore it as well, if you like it better that way. |
29349 | 1014 |
1015 This runs @code{cvs-mode-ignore}. | |
1016 @end table | |
1017 | |
1018 @node Viewing differences, Invoking Ediff, Ignoring files, Commands | |
1019 @section Viewing differences | |
1020 @cindex Diff | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1021 @cindex Invoking @code{diff} |
29349 | 1022 @cindex Conflicts, how to resolve them |
1023 @cindex Viewing differences | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1024 @kindex d=@r{--run @samp{cvs diff}} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1025 @kindex =@r{--run @samp{cvs diff}} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1026 @kindex db@r{--diff against base version} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1027 @kindex dh@r{--diff against head of repository} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1028 @kindex dv@r{--diff against vendor branch} |
29349 | 1029 @findex cvs-mode-diff |
1030 @findex cvs-mode-diff-backup | |
1031 @findex cvs-mode-diff-head | |
1032 @findex cvs-mode-diff-vendor | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1033 @vindex cvs-invert-ignore-marks@r{ (variable)} |
29349 | 1034 |
1035 @table @kbd | |
1036 @item = | |
1037 @itemx d = | |
1038 Display a @samp{cvs diff} between the selected files and the version | |
1039 that they are based on. (@code{cvs-mode-diff}).@refill | |
1040 | |
1041 @item d b | |
1042 If CVS finds a conflict while merging two versions of a file (during a | |
1043 @samp{cvs update}, @pxref{Updating the buffer}) it will save the | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1044 original file in a file called @file{.#@var{file}.@var{version}} where |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1045 @var{file} is the name of the file, and @var{version} is the revision |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1046 number that @var{file} was based on.@refill |
29349 | 1047 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1048 With the @kbd{d b} command you can run a @samp{diff} on the files |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1049 @file{.#@var{file}.@var{version}} and @file{@var{file}}.@refill |
29349 | 1050 |
1051 @item d h | |
1052 Display a @samp{cvs diff} between the selected files and the head | |
1053 revision in the repository (the most recent version on the current | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1054 branch) (@code{cvs-mode-diff-head}).@refill |
29349 | 1055 |
1056 @item d v | |
1057 Display a @samp{cvs diff} between the selected files and the head | |
1058 revision of the vendor branch in the repository. | |
1059 (@code{cvs-mode-diff-vendor}).@refill | |
1060 @end table | |
1061 | |
1062 By default, @samp{diff} commands ignore the marks. This can be changed | |
1063 with @code{cvs-invert-ignore-marks}. | |
1064 | |
1065 @node Invoking Ediff, Updating files, Viewing differences, Commands | |
1066 @section Running ediff | |
1067 @cindex Ediff | |
1068 @cindex Invoking ediff | |
1069 @cindex Viewing differences | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1070 @cindex Conflicts, how to resolve them |
29349 | 1071 @cindex Resolving conflicts |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1072 @kindex e@r{--invoke @samp{ediff}} |
29349 | 1073 @findex cvs-mode-idiff |
1074 @findex cvs-mode-imerge | |
1075 | |
1076 @table @kbd | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1077 @vindex cvs-idiff-imerge-handlers@r{ (variable)} |
29349 | 1078 @item d e |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1079 This uses @code{ediff} (or @code{emerge}, depending on |
29349 | 1080 @samp{cvs-idiff-imerge-handlers}) to allow you to view diffs. |
1081 If a prefix argument is given, PCL-CVS will prompt for a revision against | |
1082 which the diff should be made, else the default will be to use the BASE | |
1083 revision. | |
1084 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1085 @cindex Merging with @code{ediff} and @code{emerge} |
29349 | 1086 @item d E |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1087 This command use @code{ediff} (or @code{emerge}, see above) to allow you |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1088 to do an interactive 3-way merge. |
29349 | 1089 |
52704 | 1090 @strong{Please note:} when the file status is @samp{Conflict}, |
29349 | 1091 CVS has already performed a merge. The resulting file is not used in |
1092 any way if you use this command. If you use the @kbd{q} command inside | |
1093 @samp{ediff} (to successfully terminate a merge) the file that CVS | |
1094 created will be overwritten.@refill | |
1095 @end table | |
1096 | |
1097 @node Updating files, Tagging files, Invoking Ediff, Commands | |
1098 @section Updating files | |
1099 @findex cvs-mode-update | |
1100 @cindex Updating files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1101 @kindex O@r{--update files} |
29349 | 1102 |
1103 @table @kbd | |
1104 @item O | |
1105 Update all selected files with status @samp{Need-update} by running | |
1106 @samp{cvs update} on them. (@code{cvs-mode-update}). | |
1107 @end table | |
1108 | |
1109 | |
1110 @node Tagging files, Miscellaneous commands, Updating files, Commands | |
1111 @section Tagging files | |
1112 @findex cvs-mode-tag | |
1113 @findex cvs-mode-untag | |
1114 @findex cvs-rtag | |
1115 @cindex Tagging files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1116 @kindex M-t@r{--repository tag files} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1117 @kindex t@r{--tag files} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1118 @vindex cvs-invert-ignore-marks@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1119 @vindex cvs-force-dir-tag@r{ (variable)} |
29349 | 1120 |
1121 @table @kbd | |
1122 @item t | |
1123 Tag all selected files by running @samp{cvs tag} on | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1124 them (@code{cvs-mode-tag}). It's usually preferable to tag a directory |
29349 | 1125 at a time. Rather than selecting all files (which too often doesn't |
1126 select all files but only the few that are displayed), clear the | |
1127 selection with @kbd{M-DEL} (@code{cvs-mode-unmark-all-files}), position | |
1128 the cursor on the directory you want to tag and hit @kbd{t}. | |
1129 @end table | |
1130 | |
1131 By default, @samp{tag} commands ignore the marks. This can be changed | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1132 with @code{cvs-invert-ignore-marks}. Also, by default @samp{tag} can |
29349 | 1133 only be applied to directories, see @code{cvs-force-dir-tag} if you want |
1134 to change this behavior. | |
1135 | |
1136 | |
1137 @node Miscellaneous commands, , Tagging files, Commands | |
1138 @section Miscellaneous commands | |
1139 @findex cvs-mode-byte-compile-files | |
1140 @cindex Recompiling elisp files | |
1141 @cindex Byte compilation | |
1142 @findex cvs-mode-delete-lock | |
1143 @cindex Getting rid of lock files | |
1144 @cindex Lock files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1145 @kindex q@r{--quit PCL-CVS} |
29349 | 1146 @findex cvs-mode-quit |
1147 @cindex Quitting | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1148 @kindex h@r{--help} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1149 @kindex ?@r{--help} |
29349 | 1150 @findex cvs-help |
1151 @cindex Help | |
1152 | |
1153 @table @kbd | |
1154 @item M-x cvs-mode-byte-compile-files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1155 Byte compile all selected files that end in @file{.el}. |
29349 | 1156 |
1157 @item M-x cvs-mode-delete-lock | |
1158 This command deletes the lock files that | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1159 the @samp{*cvs*} buffer informs you about. You should normally never have to |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1160 use this command, since CVS tries very carefully to always remove the |
29349 | 1161 lock files itself. |
1162 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1163 You can only use this command when a message in the @samp{*cvs*} buffer tells |
29349 | 1164 you so. You should wait a while before using this command in case |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1165 someone else is running a @code{cvs} command. |
29349 | 1166 |
1167 Also note that this only works if the repository is local. | |
1168 | |
1169 @item ? | |
1170 @itemx h | |
1171 Show a summary of common command key bindings in the echo | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1172 area (@code{cvs-help}). |
29349 | 1173 |
1174 @item q | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1175 Quit PCL-CVS, killing the @samp{*cvs*} buffer (@code{cvs-mode-quit}). |
29349 | 1176 @end table |
1177 | |
36059 | 1178 @node Log Edit Mode, Log View Mode, Commands, Top |
1179 @chapter Editing a Log Message | |
1180 | |
1181 @cindex Log Edit mode | |
1182 @cindex mode, Log Edit | |
1183 Buffers for entering/editing log messages for changes which are about | |
1184 to be committed are put into Log Edit mode. | |
1185 | |
1186 Sometimes the log buffer contains default text when you enter it, | |
1187 typically the last log message entered. If it does, mark and point | |
1188 are set around the entire contents of the buffer so that it is easy to | |
1189 kill the contents of the buffer with @kbd{C-w}. | |
1190 | |
1191 @findex log-edit-insert-changelog | |
1192 If you work by writing entries in the @file{ChangeLog} | |
1193 (@pxref{(emacs)Change Log}) and then commit the change under revision | |
1194 control, you can generate the Log Edit text from the ChangeLog using | |
52196
d981f8624faa
* pcl-cvs.texi (Log Edit Mode): Fix typo.
Karl Fogel <kfogel@red-bean.com>
parents:
49600
diff
changeset
|
1195 @kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for |
36059 | 1196 entries for the file(s) concerned in the top entry in the ChangeLog |
1197 and uses those paragraphs as the log text. This text is only inserted | |
1198 if the top entry was made under your user name on the current date. | |
1199 @xref{(emacs)Change Logs and VC}, for the opposite way of | |
1200 working---generating ChangeLog entries from the revision control log. | |
29349 | 1201 |
36059 | 1202 In the Log Edit buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files}) |
1203 shows the list of files to be committed in case you need to check | |
1204 that. | |
1205 | |
1206 When you have finished editing the log message, type @kbd{C-c C-c} to | |
1207 exit the buffer and commit the change. | |
1208 | |
1209 @c Fixme: customization variables | |
1210 | |
1211 @node Log View Mode, Customization, Log Edit Mode, Top | |
1212 @chapter Browsing a Log of Changes | |
29349 | 1213 |
36059 | 1214 @cindex Log View mode |
1215 @cindex mode, Log View | |
1216 @cindex output, logs | |
1217 | |
1218 @findex cvs-mode-log | |
1219 @findex vc-print-log | |
1220 Log View mode provides a few useful commands for navigating revision | |
1221 control log output. It is used for the output buffers of both | |
1222 @code{cvs-mode-log} and @code{vc-print-log}. | |
1223 | |
1224 In this mode, @kbd{n} goes to the next message and @kbd{p} goes to the | |
1225 previous message and @kbd{N} and @kbd{P} go to the next and previous | |
1226 files, respectively, in multi-file output. With a numeric prefix | |
1227 argument, these commands move that many messages of files. | |
1228 | |
1229 @c @node CVS Status Mode | |
34950
95f07a5e1ee6
(Miscellaneous commands, Miscellaneous commands)
Dave Love <fx@gnu.org>
parents:
34304
diff
changeset
|
1230 @c @chapter Viewing CVS' Status output |
29349 | 1231 |
36059 | 1232 @node Customization, Bugs, Log View Mode, Top |
29349 | 1233 @chapter Customization |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1234 @vindex log-edit-changelog-full-paragraphs@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1235 @vindex cvs-auto-remove-handled@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1236 @vindex cvs-auto-remove-directories@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1237 @vindex cvs-update-prog-output-skip-regexp@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1238 @vindex cvs-cvsroot@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1239 @vindex cvs-auto-revert@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1240 @vindex log-edit-require-final-newline@r{ (variable)} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1241 @vindex cvs-sort-ignore-file@r{ (variable)} |
29349 | 1242 @cindex Customization |
1243 @cindex Variables, list of all | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1244 @cindex Erasing input buffer |
29349 | 1245 @cindex Context diff, how to get |
1246 @cindex Unidiff, how to get | |
1247 @cindex Automatically remove handled files | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1248 @cindex @samp{-u} option in modules file |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1249 @cindex Modules file (@samp{-u} option) |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1250 @cindex Update program (@samp{-u} option in modules file) |
29349 | 1251 @cindex Reverting buffers after commit |
1252 @cindex Require final newline | |
1253 @cindex Automatically inserting newline | |
1254 @cindex Commit message, inserting newline | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1255 @cindex Sorting @file{.cvsignore} file |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1256 @cindex @file{.cvsignore} file, sorting |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1257 @cindex Automatically sorting @file{.cvsignore} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1258 @cindex @samp{CVSROOT}, overriding |
29349 | 1259 |
1260 If you have an idea about any customization that would be handy but | |
1261 isn't present in this list, please tell me! | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1262 For info on how to reach me, see @ref{Bugs}.@refill |
29349 | 1263 |
1264 @table @samp | |
1265 @item cvs-auto-remove-handled | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1266 If this variable is set to any non-@code{nil} value, |
29349 | 1267 @samp{cvs-mode-remove-handled} will be called every time you check in |
1268 files, after the check-in is ready. @xref{Removing handled | |
1269 entries}.@refill | |
1270 | |
1271 @item cvs-auto-remove-directories | |
1272 If this variable is set to any non-@code{nil} value, directories that do | |
1273 not contain any files to be checked in will not be listed in the | |
1274 @samp{*cvs*} buffer.@refill | |
1275 | |
1276 @item cvs-auto-revert | |
1277 If this variable is set to any non-@samp{nil} value any buffers you have | |
1278 that visit a file that is committed will be automatically reverted. | |
1279 This variable defaults to @samp{t}. @xref{Committing changes}.@refill | |
1280 | |
1281 @item cvs-update-prog-output-skip-regexp | |
1282 The @samp{-u} flag in the @file{modules} file can be used to run a command | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1283 whenever a @samp{cvs update} is performed (see @code{cvs(5)}). This regexp |
29349 | 1284 is used to search for the last line in that output. It is normally set |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1285 to @samp{$}. That setting is only correct if the command outputs |
29349 | 1286 nothing. Note that PCL-CVS will get very confused if the command |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1287 outputs @emph{anything} to @code{stderr}. |
29349 | 1288 |
1289 @item cvs-cvsroot | |
1290 This variable can be set to override @samp{CVSROOT}. It should be a | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1291 string. If it is set, then every time a @code{cvs} command is run, it |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1292 will be called as @samp{cvs -d @var{cvs-cvsroot}@dots{}}. This can be |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1293 useful if your site has several repositories. |
29349 | 1294 |
1295 @item log-edit-require-final-newline | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1296 @c wordy to avoid unhderfull hbox |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1297 When you enter a log message by typing into the |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1298 @samp{*cvs-commit-message*} buffer, PCL-CVS normally automatically |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1299 inserts a trailing newline, unless there already is one. This behavior |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1300 can be controlled via @samp{cvs-commit-buffer-require-final-newline}. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1301 If it is @samp{t} (the default behavior), a newline will always be |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1302 appended. If it is @samp{nil}, newlines will never be appended. Any |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1303 other value causes PCL-CVS to ask the user whenever there is no trailing |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1304 newline in the commit message buffer. |
29349 | 1305 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1306 @findex cvs-mode-changelog-commit |
29349 | 1307 @item log-edit-changelog-full-paragraphs |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1308 If this variable is non-@code{nil}, include full @file{ChangeLog} |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
1309 paragraphs in the CVS log created by @samp{cvs-mode-changelog-commit}. |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1310 This may be set in the local variables section of a @file{ChangeLog} |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1311 file, to indicate the policy for that @file{ChangeLog}. |
29349 | 1312 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1313 @cindex @file{ChangeLog} paragraphs |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1314 A @dfn{@file{ChangeLog} paragraph} is a bunch of log text containing no |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1315 blank lines; a paragraph usually describes a set of changes with a |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1316 single purpose, but perhaps spanning several functions in several files. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1317 Changes in different paragraphs are unrelated. |
29349 | 1318 |
1319 You could argue that the CVS log entry for a file should contain the | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1320 full @file{ChangeLog} paragraph mentioning the change to the file, even though |
29349 | 1321 it may mention other files, because that gives you the full context you |
1322 need to understand the change. This is the behavior you get when this | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1323 variable is set to @code{t}, the default. |
29349 | 1324 |
1325 On the other hand, you could argue that the CVS log entry for a change | |
1326 should contain only the text for the changes which occurred in that | |
1327 file, because the CVS log is per-file. This is the behavior you get | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1328 when this variable is set to @code{nil}. |
29349 | 1329 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1330 @findex cvs-mode-ignore@r{, and @file{.cvsignore} sorting} |
29349 | 1331 @item cvs-sort-ignore-file |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1332 If this variable is set to any non-@samp{nil} value, the |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1333 @file{.cvsignore} file will always be sorted whenever you use |
29349 | 1334 @samp{cvs-mode-ignore} to add a file to it. This option is on by |
1335 default. | |
1336 @end table | |
1337 | |
1338 | |
1339 @menu | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
1340 * Customizing Faces:: |
29349 | 1341 @end menu |
1342 | |
1343 @node Customizing Faces, , Customization, Customization | |
1344 @section Customizing Faces | |
1345 @vindex cvs-header-face (face) | |
1346 @vindex cvs-filename-face (face) | |
1347 @vindex cvs-unknown-face (face) | |
1348 @vindex cvs-handled-face (face) | |
1349 @vindex cvs-need-action-face (face) | |
1350 @vindex cvs-marked-face (face) | |
1351 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1352 PCL-CVS adds a few extra features, including menus, mouse bindings, and |
36338
45507c61ceef
(Customizing Faces): Remove doubled `the'.
Gerd Moellmann <gerd@gnu.org>
parents:
36059
diff
changeset
|
1353 fontification the @samp{*cvs*} buffer. The faces defined for |
29349 | 1354 fontification are listed below: |
1355 | |
1356 @table @samp | |
1357 @item cvs-header-face | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1358 used to highlight directory changes. |
29349 | 1359 |
1360 @item cvs-filename-face | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1361 used to highlight file names. |
29349 | 1362 |
1363 @item cvs-unknown-face | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1364 used to highlight the status of files which are @samp{Unknown}. |
29349 | 1365 |
1366 @item cvs-handled-face | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48701
diff
changeset
|
1367 used to highlight the status of files which are handled and |
29349 | 1368 need no further action. |
1369 | |
1370 @item cvs-need-action-face | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1371 used to highlight the status of files which still need action. |
29349 | 1372 |
1373 @item cvs-marked-face | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1374 used to highlight the marked file indicator (@samp{*}). |
29349 | 1375 @end table |
1376 | |
1377 | |
1378 @node Bugs, Function and Variable Index, Customization, Top | |
1379 @chapter Bugs (known and unknown) | |
1380 @cindex Reporting bugs and ideas | |
1381 @cindex Bugs, how to report them | |
1382 @cindex Author, how to reach | |
1383 @cindex Email to the author | |
1384 @cindex Known bugs | |
1385 @cindex Bugs, known | |
1386 @cindex FAQ | |
1387 @cindex Problems, list of common | |
1388 | |
1389 If you find a bug or misfeature, don't hesitate to tell us! Send email | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1390 to @email{bug-gnu-emacs@@gnu.org} which is gatewayed to the newsgroup |
29349 | 1391 @samp{gnu.emacs.bugs}. Feature requests should also be sent there. We |
1392 prefer discussing one thing at a time. If you find several unrelated | |
1393 bugs, please report them separately. If you are running PCL-CVS under | |
1394 XEmacs, you should also send a copy of bug reports to | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1395 @email{xemacs-beta@@xemacs.org}. |
29349 | 1396 |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1397 If you have problems using PCL-CVS or other questions, send them to |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1398 @email{help-gnu-emacs@@gnu.org}, which is gatewayed to the |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1399 @samp{gnu.emacs.help} newsgroup. This is a good place to get help, as |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1400 is @email{cvs-info@@gnu.org}, gatewayed to @samp{gnu.cvs.help}. |
29349 | 1401 |
1402 If you have ideas for improvements, or if you have written some | |
1403 extensions to this package, we would like to hear from you. We hope that | |
1404 you find this package useful! | |
1405 | |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
1406 Below is a partial list of currently known problems with PCL-CVS. |
29349 | 1407 |
1408 @table @asis | |
1409 @item Unexpected output from CVS | |
1410 Unexpected output from CVS may confuse PCL-CVS. It will create | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1411 warning messages in the @samp{*cvs*} buffer alerting you to any parse errors. |
29349 | 1412 If you get these messages, please send a bug report to the email |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1413 addresses listed above. Include the contents of the @samp{*cvs*} buffer, the |
43264
91a36592ab22
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36338
diff
changeset
|
1414 output of the CVS process (which should be found in the @samp{ *cvs-tmp*} |
29349 | 1415 buffer), and the versions of Emacs, PCL-CVS and CVS you are using. |
1416 @end table | |
1417 | |
1418 @node Function and Variable Index, Concept Index, Bugs, Top | |
1419 @unnumbered Function and Variable Index | |
1420 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1421 This is an index of all the functions and variables documented in this |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1422 manual. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1423 |
29349 | 1424 @printindex fn |
1425 | |
1426 @node Concept Index, Key Index, Function and Variable Index, Top | |
1427 @unnumbered Concept Index | |
1428 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1429 This is an index of concepts discussed in this manual. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1430 |
29349 | 1431 @printindex cp |
1432 | |
1433 @node Key Index, , Concept Index, Top | |
1434 @unnumbered Key Index | |
1435 | |
34180
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1436 This index includes an entry for each PCL-CVS key sequence documented in |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1437 this manual. |
4cd2e11b3aca
Fix markup, add index entries, make the DVI output prettier.
Eli Zaretskii <eliz@gnu.org>
parents:
33670
diff
changeset
|
1438 |
29349 | 1439 @printindex ky |
1440 | |
1441 @setchapternewpage odd | |
1442 @summarycontents | |
1443 @contents | |
1444 @bye | |
52401 | 1445 |
1446 @ignore | |
1447 arch-tag: 5c7178ce-56fa-40b0-abd7-f4a09758b235 | |
1448 @end ignore |