Mercurial > emacs
annotate man/files.texi @ 65712:53441b803279
*** empty log message ***
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Tue, 27 Sep 2005 14:55:31 +0000 |
parents | ef44a1524bc8 |
children | 6c8bcb760760 fa0da9b57058 |
rev | line source |
---|---|
25829 | 1 @c This is part of the Emacs manual. |
62474 | 2 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000, |
64890
3723093a21fd
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64828
diff
changeset
|
3 @c 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. |
25829 | 4 @c See file emacs.texi for copying conditions. |
52240
bfd5da2ea577
(Files): Update `Previous' pointer.
Luc Teirlinck <teirllm@auburn.edu>
parents:
49600
diff
changeset
|
5 @node Files, Buffers, Keyboard Macros, Top |
25829 | 6 @chapter File Handling |
7 @cindex files | |
8 | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
9 The operating system stores data permanently in named @dfn{files}, so |
25829 | 10 most of the text you edit with Emacs comes from a file and is ultimately |
11 stored in a file. | |
12 | |
13 To edit a file, you must tell Emacs to read the file and prepare a | |
14 buffer containing a copy of the file's text. This is called | |
15 @dfn{visiting} the file. Editing commands apply directly to text in the | |
16 buffer; that is, to the copy inside Emacs. Your changes appear in the | |
17 file itself only when you @dfn{save} the buffer back into the file. | |
18 | |
19 In addition to visiting and saving files, Emacs can delete, copy, | |
20 rename, and append to files, keep multiple versions of them, and operate | |
21 on file directories. | |
22 | |
23 @menu | |
24 * File Names:: How to type and edit file-name arguments. | |
25 * Visiting:: Visiting a file prepares Emacs to edit the file. | |
26 * Saving:: Saving makes your changes permanent. | |
27 * Reverting:: Reverting cancels all the changes not saved. | |
28 * Auto Save:: Auto Save periodically protects against loss of data. | |
29 * File Aliases:: Handling multiple names for one file. | |
30 * Version Control:: Version control systems (RCS, CVS and SCCS). | |
31 * Directories:: Creating, deleting, and listing file directories. | |
32 * Comparing Files:: Finding where two files differ. | |
33 * Misc File Ops:: Other things you can do on files. | |
34 * Compressed Files:: Accessing compressed files. | |
28123
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
35 * File Archives:: Operating on tar, zip, jar etc. archive files. |
25829 | 36 * Remote Files:: Accessing files on other sites. |
37 * Quoted File Names:: Quoting special characters in file names. | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
38 * File Name Cache:: Completion against a list of files you often use. |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
39 * File Conveniences:: Convenience Features for Finding Files. |
61847 | 40 * Filesets:: Handling sets of files. |
25829 | 41 @end menu |
42 | |
43 @node File Names | |
44 @section File Names | |
45 @cindex file names | |
46 | |
47 Most Emacs commands that operate on a file require you to specify the | |
48 file name. (Saving and reverting are exceptions; the buffer knows which | |
49 file name to use for them.) You enter the file name using the | |
38739 | 50 minibuffer (@pxref{Minibuffer}). @dfn{Completion} is available |
51 (@pxref{Completion}) to make it easier to specify long file names. When | |
38310
926054175878
(Visiting, File Names): Mention that completion ignores some file names,
Eli Zaretskii <eliz@gnu.org>
parents:
38064
diff
changeset
|
52 completing file names, Emacs ignores those whose file-name extensions |
38739 | 53 appear in the variable @code{completion-ignored-extensions}; see |
38310
926054175878
(Visiting, File Names): Mention that completion ignores some file names,
Eli Zaretskii <eliz@gnu.org>
parents:
38064
diff
changeset
|
54 @ref{Completion Options}. |
25829 | 55 |
56 For most operations, there is a @dfn{default file name} which is used | |
57 if you type just @key{RET} to enter an empty argument. Normally the | |
58 default file name is the name of the file visited in the current buffer; | |
59 this makes it easy to operate on that file with any of the Emacs file | |
60 commands. | |
61 | |
62 @vindex default-directory | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
63 Each buffer has a default directory which is normally the same as the |
25829 | 64 directory of the file visited in that buffer. When you enter a file |
65 name without a directory, the default directory is used. If you specify | |
66 a directory in a relative fashion, with a name that does not start with | |
67 a slash, it is interpreted with respect to the default directory. The | |
68 default directory is kept in the variable @code{default-directory}, | |
69 which has a separate value in every buffer. | |
70 | |
71 For example, if the default file name is @file{/u/rms/gnu/gnu.tasks} then | |
72 the default directory is @file{/u/rms/gnu/}. If you type just @samp{foo}, | |
73 which does not specify a directory, it is short for @file{/u/rms/gnu/foo}. | |
74 @samp{../.login} would stand for @file{/u/rms/.login}. @samp{new/foo} | |
75 would stand for the file name @file{/u/rms/gnu/new/foo}. | |
76 | |
77 @findex cd | |
78 @findex pwd | |
38870
d44abb4e68b2
Don't use "print" for displaying a message.
Richard M. Stallman <rms@gnu.org>
parents:
38768
diff
changeset
|
79 The command @kbd{M-x pwd} displays the current buffer's default |
25829 | 80 directory, and the command @kbd{M-x cd} sets it (to a value read using |
81 the minibuffer). A buffer's default directory changes only when the | |
82 @code{cd} command is used. A file-visiting buffer's default directory | |
38739 | 83 is initialized to the directory of the file that is visited in that buffer. If |
25829 | 84 you create a buffer with @kbd{C-x b}, its default directory is copied |
85 from that of the buffer that was current at the time. | |
86 | |
87 @vindex insert-default-directory | |
88 The default directory actually appears in the minibuffer when the | |
89 minibuffer becomes active to read a file name. This serves two | |
90 purposes: it @emph{shows} you what the default is, so that you can type | |
91 a relative file name and know with certainty what it will mean, and it | |
92 allows you to @emph{edit} the default to specify a different directory. | |
93 This insertion of the default directory is inhibited if the variable | |
94 @code{insert-default-directory} is set to @code{nil}. | |
95 | |
96 Note that it is legitimate to type an absolute file name after you | |
97 enter the minibuffer, ignoring the presence of the default directory | |
98 name as part of the text. The final minibuffer contents may look | |
99 invalid, but that is not so. For example, if the minibuffer starts out | |
100 with @samp{/usr/tmp/} and you add @samp{/x1/rms/foo}, you get | |
101 @samp{/usr/tmp//x1/rms/foo}; but Emacs ignores everything through the | |
102 first slash in the double slash; the result is @samp{/x1/rms/foo}. | |
103 @xref{Minibuffer File}. | |
104 | |
36324
63c47fc9df21
(File Names): Add documentation of the tilde expansion in file names.
Eli Zaretskii <eliz@gnu.org>
parents:
36323
diff
changeset
|
105 @cindex environment variables in file names |
63c47fc9df21
(File Names): Add documentation of the tilde expansion in file names.
Eli Zaretskii <eliz@gnu.org>
parents:
36323
diff
changeset
|
106 @cindex expansion of environment variables |
44086
5da94d5db448
(File Names): Add an index entry for $ in file names. Add an anchor.
Eli Zaretskii <eliz@gnu.org>
parents:
43682
diff
changeset
|
107 @cindex @code{$} in file names |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
108 @anchor{File Names with $}@samp{$} in a file name is used to |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
109 substitute an environment variable. The environment variable name |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
110 consists of all the alphanumeric characters after the @samp{$}; |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
111 alternatively, it can be enclosed in braces after the @samp{$}. For |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
112 example, if you have used the shell command @command{export |
29107 | 113 FOO=rms/hacks} to set up an environment variable named @env{FOO}, then |
25829 | 114 you can use @file{/u/$FOO/test.c} or @file{/u/$@{FOO@}/test.c} as an |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
115 abbreviation for @file{/u/rms/hacks/test.c}. If the environment |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
116 variable is not defined, no substitution occurs: @file{/u/$notdefined} |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
117 stands for itself (assuming the environment variable @env{notdefined} |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
118 is not defined). |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
119 |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
120 Note that shell commands to set environment variables affect Emacs |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
121 only when done before Emacs is started. |
25829 | 122 |
36324
63c47fc9df21
(File Names): Add documentation of the tilde expansion in file names.
Eli Zaretskii <eliz@gnu.org>
parents:
36323
diff
changeset
|
123 @cindex home directory shorthand |
59886 | 124 You can use @file{~/} in a file name to mean your home directory, |
36324
63c47fc9df21
(File Names): Add documentation of the tilde expansion in file names.
Eli Zaretskii <eliz@gnu.org>
parents:
36323
diff
changeset
|
125 or @file{~@var{user-id}/} to mean the home directory of a user whose |
36325
cf1b9eaadeaf
(File Names): Add a note about ~/ peculiarities on DOS/Windows.
Eli Zaretskii <eliz@gnu.org>
parents:
36324
diff
changeset
|
126 login name is @code{user-id}. (On DOS and Windows systems, where a user |
cf1b9eaadeaf
(File Names): Add a note about ~/ peculiarities on DOS/Windows.
Eli Zaretskii <eliz@gnu.org>
parents:
36324
diff
changeset
|
127 doesn't have a home directory, Emacs substitutes @file{~/} with the |
cf1b9eaadeaf
(File Names): Add a note about ~/ peculiarities on DOS/Windows.
Eli Zaretskii <eliz@gnu.org>
parents:
36324
diff
changeset
|
128 value of the environment variable @code{HOME}; see @ref{General |
cf1b9eaadeaf
(File Names): Add a note about ~/ peculiarities on DOS/Windows.
Eli Zaretskii <eliz@gnu.org>
parents:
36324
diff
changeset
|
129 Variables}.) |
36324
63c47fc9df21
(File Names): Add documentation of the tilde expansion in file names.
Eli Zaretskii <eliz@gnu.org>
parents:
36323
diff
changeset
|
130 |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
131 To access a file with @samp{$} in its name, if the @samp{$} causes |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
132 expansion, type @samp{$$}. This pair is converted to a single |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
133 @samp{$} at the same time as variable substitution is performed for a |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
134 single @samp{$}. Alternatively, quote the whole file name with |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
135 @samp{/:} (@pxref{Quoted File Names}). File names which begin with a |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
136 literal @samp{~} should also be quoted with @samp{/:}. |
25829 | 137 |
138 @findex substitute-in-file-name | |
139 The Lisp function that performs the substitution is called | |
140 @code{substitute-in-file-name}. The substitution is performed only on | |
141 file names read as such using the minibuffer. | |
142 | |
52979
3649390c0f91
Replace @sc{ascii} and ASCII with @acronym{ASCII}.
Eli Zaretskii <eliz@gnu.org>
parents:
52575
diff
changeset
|
143 You can include non-@acronym{ASCII} characters in file names if you set the |
25829 | 144 variable @code{file-name-coding-system} to a non-@code{nil} value. |
145 @xref{Specify Coding}. | |
146 | |
147 @node Visiting | |
148 @section Visiting Files | |
149 @cindex visiting files | |
150 | |
151 @table @kbd | |
152 @item C-x C-f | |
153 Visit a file (@code{find-file}). | |
154 @item C-x C-r | |
155 Visit a file for viewing, without allowing changes to it | |
156 (@code{find-file-read-only}). | |
157 @item C-x C-v | |
158 Visit a different file instead of the one visited last | |
159 (@code{find-alternate-file}). | |
160 @item C-x 4 f | |
161 Visit a file, in another window (@code{find-file-other-window}). Don't | |
162 alter what is displayed in the selected window. | |
163 @item C-x 5 f | |
164 Visit a file, in a new frame (@code{find-file-other-frame}). Don't | |
165 alter what is displayed in the selected frame. | |
166 @item M-x find-file-literally | |
167 Visit a file with no conversion of the contents. | |
168 @end table | |
169 | |
170 @cindex files, visiting and saving | |
171 @cindex saving files | |
38739 | 172 @dfn{Visiting} a file means copying its contents into an Emacs |
173 buffer so you can edit them. Emacs makes a new buffer for each file | |
174 that you visit. We often say that this buffer ``is visiting'' that | |
175 file, or that the buffer's ``visited file'' is that file. Emacs | |
176 constructs the buffer name from the file name by throwing away the | |
177 directory, keeping just the name proper. For example, a file named | |
178 @file{/usr/rms/emacs.tex} would get a buffer named @samp{emacs.tex}. | |
179 If there is already a buffer with that name, Emacs constructs a unique | |
180 name---the normal method is to append @samp{<2>}, @samp{<3>}, and so | |
181 on, but you can select other methods (@pxref{Uniquify}). | |
25829 | 182 |
183 Each window's mode line shows the name of the buffer that is being displayed | |
184 in that window, so you can always tell what buffer you are editing. | |
185 | |
186 The changes you make with editing commands are made in the Emacs | |
187 buffer. They do not take effect in the file that you visited, or any | |
188 place permanent, until you @dfn{save} the buffer. Saving the buffer | |
189 means that Emacs writes the current contents of the buffer into its | |
190 visited file. @xref{Saving}. | |
191 | |
192 @cindex modified (buffer) | |
193 If a buffer contains changes that have not been saved, we say the | |
194 buffer is @dfn{modified}. This is important because it implies that | |
195 some changes will be lost if the buffer is not saved. The mode line | |
196 displays two stars near the left margin to indicate that the buffer is | |
197 modified. | |
198 | |
199 @kindex C-x C-f | |
200 @findex find-file | |
201 To visit a file, use the command @kbd{C-x C-f} (@code{find-file}). Follow | |
202 the command with the name of the file you wish to visit, terminated by a | |
203 @key{RET}. | |
204 | |
205 The file name is read using the minibuffer (@pxref{Minibuffer}), with | |
206 defaulting and completion in the standard manner (@pxref{File Names}). | |
38310
926054175878
(Visiting, File Names): Mention that completion ignores some file names,
Eli Zaretskii <eliz@gnu.org>
parents:
38064
diff
changeset
|
207 While in the minibuffer, you can abort @kbd{C-x C-f} by typing |
926054175878
(Visiting, File Names): Mention that completion ignores some file names,
Eli Zaretskii <eliz@gnu.org>
parents:
38064
diff
changeset
|
208 @kbd{C-g}. File-name completion ignores certain filenames; for more |
926054175878
(Visiting, File Names): Mention that completion ignores some file names,
Eli Zaretskii <eliz@gnu.org>
parents:
38064
diff
changeset
|
209 about this, see @ref{Completion Options}. |
25829 | 210 |
211 Your confirmation that @kbd{C-x C-f} has completed successfully is the | |
212 appearance of new text on the screen and a new buffer name in the mode | |
213 line. If the specified file does not exist and could not be created, or | |
214 cannot be read, then you get an error, with an error message displayed | |
215 in the echo area. | |
216 | |
217 If you visit a file that is already in Emacs, @kbd{C-x C-f} does not make | |
218 another copy. It selects the existing buffer containing that file. | |
219 However, before doing so, it checks that the file itself has not changed | |
220 since you visited or saved it last. If the file has changed, a warning | |
38870
d44abb4e68b2
Don't use "print" for displaying a message.
Richard M. Stallman <rms@gnu.org>
parents:
38768
diff
changeset
|
221 message is shown. @xref{Interlocking,,Simultaneous Editing}. |
25829 | 222 |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
223 @vindex large-file-warning-threshold |
37793
ec57e2733712
(Visiting): Document that files larger than the buffer size limit cannot
Eli Zaretskii <eliz@gnu.org>
parents:
37349
diff
changeset
|
224 @cindex maximum buffer size exceeded, error message |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
225 If you try to visit a file larger than |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
226 @code{large-file-warning-threshold} (the default is 10000000, which is |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
227 about 10 megabytes), Emacs will ask you for confirmation first. You |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
228 can answer @kbd{y} to proceed with visiting the file. Note, however, |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
229 that Emacs cannot visit files that are larger than the maximum Emacs |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
230 buffer size, which is around 256 megabytes on 32-bit machines |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
231 (@pxref{Buffers}). If you try, Emacs will display an error message |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
232 saying that the maximum buffer size has been exceeded. |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
233 |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
234 @cindex file selection dialog |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
235 On graphical terminals, there are two additional methods for |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
236 visiting files. Firstly, when Emacs is built with a suitable GUI |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
237 toolkit, commands invoked with the mouse (by clicking on the menu bar |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
238 or tool bar) use the toolkit's standard File Selection dialog instead |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
239 of prompting for the file name in the minibuffer. On Unix and |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
240 GNU/Linux platforms, Emacs does that when built with GTK, LessTif, and |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
241 Motif toolkits; on MS-Windows, the GUI version does that by default. |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
242 For information on how to customize this, see @ref{Dialog Boxes}. |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
243 |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
244 Secondly, Emacs supports the ``drag and drop'' protocol on the X |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
245 window system. Dropping a file into an ordinary Emacs window visits |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
246 the file using that window. However, dropping a file into a window |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
247 displaying a Dired buffer moves or copies the file into the displayed |
60976
bf08ce2bfd72
(Visiting): Fix cross-references introduced with the last change.
Eli Zaretskii <eliz@gnu.org>
parents:
60951
diff
changeset
|
248 directory. For details, see @ref{Drag and Drop}, @ref{Misc Dired |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
249 Features}. |
37793
ec57e2733712
(Visiting): Document that files larger than the buffer size limit cannot
Eli Zaretskii <eliz@gnu.org>
parents:
37349
diff
changeset
|
250 |
25829 | 251 @cindex creating files |
38870
d44abb4e68b2
Don't use "print" for displaying a message.
Richard M. Stallman <rms@gnu.org>
parents:
38768
diff
changeset
|
252 What if you want to create a new file? Just visit it. Emacs displays |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
253 @samp{(New file)} in the echo area, but in other respects behaves as if |
25829 | 254 you had visited an existing empty file. If you make any changes and |
255 save them, the file is created. | |
256 | |
257 Emacs recognizes from the contents of a file which convention it uses | |
258 to separate lines---newline (used on GNU/Linux and on Unix), | |
259 carriage-return linefeed (used on Microsoft systems), or just | |
260 carriage-return (used on the Macintosh)---and automatically converts the | |
261 contents to the normal Emacs convention, which is that the newline | |
262 character separates lines. This is a part of the general feature of | |
263 coding system conversion (@pxref{Coding Systems}), and makes it possible | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
264 to edit files imported from different operating systems with |
25829 | 265 equal convenience. If you change the text and save the file, Emacs |
266 performs the inverse conversion, changing newlines back into | |
267 carriage-return linefeed or just carriage-return if appropriate. | |
268 | |
269 @vindex find-file-run-dired | |
270 If the file you specify is actually a directory, @kbd{C-x C-f} invokes | |
271 Dired, the Emacs directory browser, so that you can ``edit'' the contents | |
59886 | 272 of the directory (@pxref{Dired}). Dired is a convenient way to view, delete, |
273 or operate on the files in the directory. However, if the variable | |
274 @code{find-file-run-dired} is @code{nil}, then it is an error to try | |
275 to visit a directory. | |
25829 | 276 |
36326
70c08680c0bf
(Visiting): Add a note about visiting file archives.
Eli Zaretskii <eliz@gnu.org>
parents:
36325
diff
changeset
|
277 Files which are actually collections of other files, or @dfn{file |
70c08680c0bf
(Visiting): Add a note about visiting file archives.
Eli Zaretskii <eliz@gnu.org>
parents:
36325
diff
changeset
|
278 archives}, are visited in special modes which invoke a Dired-like |
70c08680c0bf
(Visiting): Add a note about visiting file archives.
Eli Zaretskii <eliz@gnu.org>
parents:
36325
diff
changeset
|
279 environment to allow operations on archive members. @xref{File |
70c08680c0bf
(Visiting): Add a note about visiting file archives.
Eli Zaretskii <eliz@gnu.org>
parents:
36325
diff
changeset
|
280 Archives}, for more about these features. |
70c08680c0bf
(Visiting): Add a note about visiting file archives.
Eli Zaretskii <eliz@gnu.org>
parents:
36325
diff
changeset
|
281 |
28327
f7b17a6af3db
(Visiting): List wildcard chars. Mention find-file-wildcards.
Dave Love <fx@gnu.org>
parents:
28123
diff
changeset
|
282 @cindex wildcard characters in file names |
f7b17a6af3db
(Visiting): List wildcard chars. Mention find-file-wildcards.
Dave Love <fx@gnu.org>
parents:
28123
diff
changeset
|
283 @vindex find-file-wildcards |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
284 If the file name you specify contains shell-style wildcard characters, |
38739 | 285 Emacs visits all the files that match it. Wildcards include @samp{?}, |
286 @samp{*}, and @samp{[@dots{}]} sequences. @xref{Quoted File Names}, for | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
287 information on how to visit a file whose name actually contains wildcard |
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
288 characters. You can disable the wildcard feature by customizing |
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
289 @code{find-file-wildcards}. |
25829 | 290 |
291 If you visit a file that the operating system won't let you modify, | |
46215
0695dbe46ee5
Clarify read-only visiting commands.
Richard M. Stallman <rms@gnu.org>
parents:
46212
diff
changeset
|
292 or that is marked read-only, Emacs makes the buffer read-only too, so |
0695dbe46ee5
Clarify read-only visiting commands.
Richard M. Stallman <rms@gnu.org>
parents:
46212
diff
changeset
|
293 that you won't go ahead and make changes that you'll have trouble |
0695dbe46ee5
Clarify read-only visiting commands.
Richard M. Stallman <rms@gnu.org>
parents:
46212
diff
changeset
|
294 saving afterward. You can make the buffer writable with @kbd{C-x C-q} |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
295 (@code{toggle-read-only}). @xref{Misc Buffer}. |
25829 | 296 |
297 @kindex C-x C-r | |
298 @findex find-file-read-only | |
46215
0695dbe46ee5
Clarify read-only visiting commands.
Richard M. Stallman <rms@gnu.org>
parents:
46212
diff
changeset
|
299 If you want to visit a file as read-only in order to protect |
0695dbe46ee5
Clarify read-only visiting commands.
Richard M. Stallman <rms@gnu.org>
parents:
46212
diff
changeset
|
300 yourself from entering changes accidentally, visit it with the command |
0695dbe46ee5
Clarify read-only visiting commands.
Richard M. Stallman <rms@gnu.org>
parents:
46212
diff
changeset
|
301 @kbd{C-x C-r} (@code{find-file-read-only}) instead of @kbd{C-x C-f}. |
25829 | 302 |
303 @kindex C-x C-v | |
304 @findex find-alternate-file | |
305 If you visit a nonexistent file unintentionally (because you typed the | |
306 wrong file name), use the @kbd{C-x C-v} command | |
307 (@code{find-alternate-file}) to visit the file you really wanted. | |
308 @kbd{C-x C-v} is similar to @kbd{C-x C-f}, but it kills the current | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
309 buffer (after first offering to save it if it is modified). When |
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
310 @kbd{C-x C-v} reads the file name to visit, it inserts the entire |
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
311 default file name in the buffer, with point just after the directory |
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
312 part; this is convenient if you made a slight error in typing the name. |
25829 | 313 |
314 If you find a file which exists but cannot be read, @kbd{C-x C-f} | |
315 signals an error. | |
316 | |
317 @kindex C-x 4 f | |
318 @findex find-file-other-window | |
319 @kbd{C-x 4 f} (@code{find-file-other-window}) is like @kbd{C-x C-f} | |
320 except that the buffer containing the specified file is selected in another | |
321 window. The window that was selected before @kbd{C-x 4 f} continues to | |
322 show the same buffer it was already showing. If this command is used when | |
323 only one window is being displayed, that window is split in two, with one | |
324 window showing the same buffer as before, and the other one showing the | |
325 newly requested file. @xref{Windows}. | |
326 | |
327 @kindex C-x 5 f | |
328 @findex find-file-other-frame | |
329 @kbd{C-x 5 f} (@code{find-file-other-frame}) is similar, but opens a | |
330 new frame, or makes visible any existing frame showing the file you | |
331 seek. This feature is available only when you are using a window | |
332 system. @xref{Frames}. | |
333 | |
334 @findex find-file-literally | |
52979
3649390c0f91
Replace @sc{ascii} and ASCII with @acronym{ASCII}.
Eli Zaretskii <eliz@gnu.org>
parents:
52575
diff
changeset
|
335 If you wish to edit a file as a sequence of @acronym{ASCII} characters with no special |
25829 | 336 encoding or conversion, use the @kbd{M-x find-file-literally} command. |
337 It visits a file, like @kbd{C-x C-f}, but does not do format conversion | |
338 (@pxref{Formatted Text}), character code conversion (@pxref{Coding | |
33559 | 339 Systems}), or automatic uncompression (@pxref{Compressed Files}), and |
340 does not add a final newline because of @code{require-final-newline}. | |
25829 | 341 If you already have visited the same file in the usual (non-literal) |
342 manner, this command asks you whether to visit it literally instead. | |
343 | |
45979
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
344 @vindex find-file-hook |
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
345 @vindex find-file-not-found-functions |
25829 | 346 Two special hook variables allow extensions to modify the operation of |
347 visiting files. Visiting a file that does not exist runs the functions | |
45979
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
348 in the list @code{find-file-not-found-functions}; this variable holds a list |
25829 | 349 of functions, and the functions are called one by one (with no |
350 arguments) until one of them returns non-@code{nil}. This is not a | |
45979
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
351 normal hook, and the name ends in @samp{-functions} rather than @samp{-hook} |
25829 | 352 to indicate that fact. |
353 | |
38739 | 354 Successful visiting of any file, whether existing or not, calls the |
45979
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
355 functions in the list @code{find-file-hook}, with no arguments. |
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
356 This variable is a normal hook. In the case of a nonexistent file, the |
87962bf716e3
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45892
diff
changeset
|
357 @code{find-file-not-found-functions} are run first. @xref{Hooks}. |
25829 | 358 |
359 There are several ways to specify automatically the major mode for | |
360 editing the file (@pxref{Choosing Modes}), and to specify local | |
361 variables defined for that file (@pxref{File Variables}). | |
362 | |
363 @node Saving | |
364 @section Saving Files | |
365 | |
366 @dfn{Saving} a buffer in Emacs means writing its contents back into the file | |
367 that was visited in the buffer. | |
368 | |
65532
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
369 @menu |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
370 * Save Commands:: Commands for saving files. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
371 * Backup:: How Emacs saves the old version of your file. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
372 * Customize Save:: Customizing the saving of files. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
373 * Interlocking:: How Emacs protects against simultaneous editing |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
374 of one file by two users. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
375 * Shadowing: File Shadowing. Copying files to "shadows" automatically. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
376 * Time Stamps:: Emacs can update time stamps on saved files. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
377 @end menu |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
378 |
65535 | 379 @node Save Commands |
65532
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
380 @subsection Commands for Saving Files |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
381 |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
382 These are the commands that relate to saving and writing files. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
383 |
25829 | 384 @table @kbd |
385 @item C-x C-s | |
38739 | 386 Save the current buffer in its visited file on disk (@code{save-buffer}). |
25829 | 387 @item C-x s |
388 Save any or all buffers in their visited files (@code{save-some-buffers}). | |
389 @item M-~ | |
390 Forget that the current buffer has been changed (@code{not-modified}). | |
29556 | 391 With prefix argument (@kbd{C-u}), mark the current buffer as changed. |
25829 | 392 @item C-x C-w |
38739 | 393 Save the current buffer as a specified file name (@code{write-file}). |
25829 | 394 @item M-x set-visited-file-name |
36316
d79558eaaecb
(Saveing): Fix "file the name". From Nelson H. F. Beebe
Eli Zaretskii <eliz@gnu.org>
parents:
36274
diff
changeset
|
395 Change the file name under which the current buffer will be saved. |
25829 | 396 @end table |
397 | |
398 @kindex C-x C-s | |
399 @findex save-buffer | |
400 When you wish to save the file and make your changes permanent, type | |
401 @kbd{C-x C-s} (@code{save-buffer}). After saving is finished, @kbd{C-x C-s} | |
402 displays a message like this: | |
403 | |
404 @example | |
405 Wrote /u/rms/gnu/gnu.tasks | |
406 @end example | |
407 | |
408 @noindent | |
409 If the selected buffer is not modified (no changes have been made in it | |
410 since the buffer was created or last saved), saving is not really done, | |
411 because it would have no effect. Instead, @kbd{C-x C-s} displays a message | |
412 like this in the echo area: | |
413 | |
414 @example | |
415 (No changes need to be saved) | |
416 @end example | |
417 | |
418 @kindex C-x s | |
419 @findex save-some-buffers | |
420 The command @kbd{C-x s} (@code{save-some-buffers}) offers to save any | |
421 or all modified buffers. It asks you what to do with each buffer. The | |
422 possible responses are analogous to those of @code{query-replace}: | |
423 | |
424 @table @kbd | |
425 @item y | |
426 Save this buffer and ask about the rest of the buffers. | |
427 @item n | |
428 Don't save this buffer, but ask about the rest of the buffers. | |
429 @item ! | |
430 Save this buffer and all the rest with no more questions. | |
431 @c following generates acceptable underfull hbox | |
432 @item @key{RET} | |
433 Terminate @code{save-some-buffers} without any more saving. | |
434 @item . | |
435 Save this buffer, then exit @code{save-some-buffers} without even asking | |
436 about other buffers. | |
437 @item C-r | |
438 View the buffer that you are currently being asked about. When you exit | |
439 View mode, you get back to @code{save-some-buffers}, which asks the | |
440 question again. | |
59886 | 441 @item d |
442 Diff the buffer against its corresponding file, so you can see | |
443 what changes you would be saving. | |
25829 | 444 @item C-h |
445 Display a help message about these options. | |
446 @end table | |
447 | |
448 @kbd{C-x C-c}, the key sequence to exit Emacs, invokes | |
449 @code{save-some-buffers} and therefore asks the same questions. | |
450 | |
451 @kindex M-~ | |
452 @findex not-modified | |
453 If you have changed a buffer but you do not want to save the changes, | |
454 you should take some action to prevent it. Otherwise, each time you use | |
455 @kbd{C-x s} or @kbd{C-x C-c}, you are liable to save this buffer by | |
456 mistake. One thing you can do is type @kbd{M-~} (@code{not-modified}), | |
457 which clears out the indication that the buffer is modified. If you do | |
458 this, none of the save commands will believe that the buffer needs to be | |
459 saved. (@samp{~} is often used as a mathematical symbol for `not'; thus | |
460 @kbd{M-~} is `not', metafied.) You could also use | |
461 @code{set-visited-file-name} (see below) to mark the buffer as visiting | |
462 a different file name, one which is not in use for anything important. | |
463 Alternatively, you can cancel all the changes made since the file was | |
464 visited or saved, by reading the text from the file again. This is | |
465 called @dfn{reverting}. @xref{Reverting}. You could also undo all the | |
466 changes by repeating the undo command @kbd{C-x u} until you have undone | |
467 all the changes; but reverting is easier. | |
468 | |
469 @findex set-visited-file-name | |
470 @kbd{M-x set-visited-file-name} alters the name of the file that the | |
471 current buffer is visiting. It reads the new file name using the | |
38739 | 472 minibuffer. Then it marks the buffer as visiting that file name, and |
473 changes the buffer name correspondingly. @code{set-visited-file-name} | |
474 does not save the buffer in the newly visited file; it just alters the | |
475 records inside Emacs in case you do save later. It also marks the | |
476 buffer as ``modified'' so that @kbd{C-x C-s} in that buffer | |
477 @emph{will} save. | |
25829 | 478 |
479 @kindex C-x C-w | |
480 @findex write-file | |
481 If you wish to mark the buffer as visiting a different file and save it | |
64154
b2c833193d1a
(Saving): Minor correction about C-x C-w.
Richard M. Stallman <rms@gnu.org>
parents:
63149
diff
changeset
|
482 right away, use @kbd{C-x C-w} (@code{write-file}). It is |
b2c833193d1a
(Saving): Minor correction about C-x C-w.
Richard M. Stallman <rms@gnu.org>
parents:
63149
diff
changeset
|
483 equivalent to @code{set-visited-file-name} followed by @kbd{C-x C-s} |
b2c833193d1a
(Saving): Minor correction about C-x C-w.
Richard M. Stallman <rms@gnu.org>
parents:
63149
diff
changeset
|
484 (except that @kbd{C-x C-w} asks for confirmation if the file exists). |
25829 | 485 @kbd{C-x C-s} used on a buffer that is not visiting a file has the |
486 same effect as @kbd{C-x C-w}; that is, it reads a file name, marks the | |
487 buffer as visiting that file, and saves it there. The default file name in | |
488 a buffer that is not visiting a file is made by combining the buffer name | |
38739 | 489 with the buffer's default directory (@pxref{File Names}). |
25829 | 490 |
491 If the new file name implies a major mode, then @kbd{C-x C-w} switches | |
492 to that major mode, in most cases. The command | |
493 @code{set-visited-file-name} also does this. @xref{Choosing Modes}. | |
494 | |
495 If Emacs is about to save a file and sees that the date of the latest | |
496 version on disk does not match what Emacs last read or wrote, Emacs | |
497 notifies you of this fact, because it probably indicates a problem caused | |
498 by simultaneous editing and requires your immediate attention. | |
499 @xref{Interlocking,, Simultaneous Editing}. | |
500 | |
501 @node Backup | |
502 @subsection Backup Files | |
503 @cindex backup file | |
504 @vindex make-backup-files | |
505 @vindex vc-make-backup-files | |
506 | |
507 On most operating systems, rewriting a file automatically destroys all | |
508 record of what the file used to contain. Thus, saving a file from Emacs | |
509 throws away the old contents of the file---or it would, except that | |
510 Emacs carefully copies the old contents to another file, called the | |
511 @dfn{backup} file, before actually saving. | |
512 | |
513 For most files, the variable @code{make-backup-files} determines | |
514 whether to make backup files. On most operating systems, its default | |
515 value is @code{t}, so that Emacs does write backup files. | |
516 | |
517 For files managed by a version control system (@pxref{Version | |
518 Control}), the variable @code{vc-make-backup-files} determines whether | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
519 to make backup files. By default it is @code{nil}, since backup files |
25829 | 520 are redundant when you store all the previous versions in a version |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
521 control system. @xref{General VC Options}. |
25829 | 522 |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
523 @vindex backup-enable-predicate |
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
524 @vindex temporary-file-directory |
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
525 @vindex small-temporary-file-directory |
25829 | 526 The default value of the @code{backup-enable-predicate} variable |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
527 prevents backup files being written for files in the directories used |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
528 for temporary files, specified by @code{temporary-file-directory} or |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
529 @code{small-temporary-file-directory}. |
25829 | 530 |
531 At your option, Emacs can keep either a single backup file or a series of | |
532 numbered backup files for each file that you edit. | |
533 | |
534 Emacs makes a backup for a file only the first time the file is saved | |
535 from one buffer. No matter how many times you save a file, its backup file | |
536 continues to contain the contents from before the file was visited. | |
537 Normally this means that the backup file contains the contents from before | |
538 the current editing session; however, if you kill the buffer and then visit | |
539 the file again, a new backup file will be made by the next save. | |
540 | |
541 You can also explicitly request making another backup file from a | |
542 buffer even though it has already been saved at least once. If you save | |
543 the buffer with @kbd{C-u C-x C-s}, the version thus saved will be made | |
544 into a backup file if you save the buffer again. @kbd{C-u C-u C-x C-s} | |
545 saves the buffer, but first makes the previous file contents into a new | |
546 backup file. @kbd{C-u C-u C-u C-x C-s} does both things: it makes a | |
38739 | 547 backup from the previous contents, and arranges to make another from the |
548 newly saved contents if you save again. | |
25829 | 549 |
550 @menu | |
551 * Names: Backup Names. How backup files are named; | |
552 choosing single or numbered backup files. | |
553 * Deletion: Backup Deletion. Emacs deletes excess numbered backups. | |
554 * Copying: Backup Copying. Backups can be made by copying or renaming. | |
555 @end menu | |
556 | |
557 @node Backup Names | |
558 @subsubsection Single or Numbered Backups | |
559 | |
560 If you choose to have a single backup file (this is the default), | |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
561 the backup file's name is normally constructed by appending @samp{~} to the |
25829 | 562 file name being edited; thus, the backup file for @file{eval.c} would |
563 be @file{eval.c~}. | |
564 | |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
565 @vindex make-backup-file-name-function |
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
566 @vindex backup-directory-alist |
38017
32f10000ac35
Don't use the British spelling of "behaviour".
Eli Zaretskii <eliz@gnu.org>
parents:
37795
diff
changeset
|
567 You can change this behavior by defining the variable |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
568 @code{make-backup-file-name-function} to a suitable function. |
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
569 Alternatively you can customize the variable |
36874 | 570 @code{backup-directory-alist} to specify that files matching certain |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
571 patterns should be backed up in specific directories. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
572 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
573 A typical use is to add an element @code{("." . @var{dir})} to make |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
574 all backups in the directory with absolute name @var{dir}; Emacs |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
575 modifies the backup file names to avoid clashes between files with the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
576 same names originating in different directories. Alternatively, |
37090
41f1140b1f53
(Backup Names): Fix typo.
Andreas Schwab <schwab@suse.de>
parents:
36874
diff
changeset
|
577 adding, say, @code{("." . ".~")} would make backups in the invisible |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
578 subdirectory @file{.~} of the original file's directory. Emacs |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
579 creates the directory, if necessary, to make the backup. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
580 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
581 If access control stops Emacs from writing backup files under the usual |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
582 names, it writes the backup file as @file{%backup%~} in your home |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
583 directory. Only one such file can exist, so only the most recently |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
584 made such backup is available. |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
585 |
25829 | 586 If you choose to have a series of numbered backup files, backup file |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
587 names contain @samp{.~}, the number, and another @samp{~} after the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
588 original file name. Thus, the backup files of @file{eval.c} would be |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
589 called @file{eval.c.~1~}, @file{eval.c.~2~}, and so on, all the way |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
590 through names like @file{eval.c.~259~} and beyond. The variable |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
591 @code{backup-directory-alist} applies to numbered backups just as |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
592 usual. |
25829 | 593 |
594 @vindex version-control | |
595 The choice of single backup or numbered backups is controlled by the | |
596 variable @code{version-control}. Its possible values are | |
597 | |
598 @table @code | |
599 @item t | |
600 Make numbered backups. | |
601 @item nil | |
602 Make numbered backups for files that have numbered backups already. | |
603 Otherwise, make single backups. | |
604 @item never | |
36322
b95226aa58b9
(Backup names): Fix "Do not in any case". From Nelson H. F. Beebe
Eli Zaretskii <eliz@gnu.org>
parents:
36319
diff
changeset
|
605 Never make numbered backups; always make single backups. |
25829 | 606 @end table |
607 | |
608 @noindent | |
609 You can set @code{version-control} locally in an individual buffer to | |
610 control the making of backups for that buffer's file. For example, | |
611 Rmail mode locally sets @code{version-control} to @code{never} to make sure | |
612 that there is only one backup for an Rmail file. @xref{Locals}. | |
613 | |
29107 | 614 @cindex @env{VERSION_CONTROL} environment variable |
615 If you set the environment variable @env{VERSION_CONTROL}, to tell | |
25829 | 616 various GNU utilities what to do with backup files, Emacs also obeys the |
617 environment variable by setting the Lisp variable @code{version-control} | |
618 accordingly at startup. If the environment variable's value is @samp{t} | |
619 or @samp{numbered}, then @code{version-control} becomes @code{t}; if the | |
620 value is @samp{nil} or @samp{existing}, then @code{version-control} | |
621 becomes @code{nil}; if it is @samp{never} or @samp{simple}, then | |
622 @code{version-control} becomes @code{never}. | |
623 | |
624 @node Backup Deletion | |
625 @subsubsection Automatic Deletion of Backups | |
626 | |
38020 | 627 To prevent excessive consumption of disk space, Emacs can delete numbered |
25829 | 628 backup versions automatically. Generally Emacs keeps the first few backups |
629 and the latest few backups, deleting any in between. This happens every | |
630 time a new backup is made. | |
631 | |
632 @vindex kept-old-versions | |
633 @vindex kept-new-versions | |
634 The two variables @code{kept-old-versions} and | |
635 @code{kept-new-versions} control this deletion. Their values are, | |
38739 | 636 respectively, the number of oldest (lowest-numbered) backups to keep |
637 and the number of newest (highest-numbered) ones to keep, each time a | |
638 new backup is made. The backups in the middle (excluding those oldest | |
639 and newest) are the excess middle versions---those backups are | |
640 deleted. These variables' values are used when it is time to delete | |
641 excess versions, just after a new backup version is made; the newly | |
642 made backup is included in the count in @code{kept-new-versions}. By | |
643 default, both variables are 2. | |
25829 | 644 |
645 @vindex delete-old-versions | |
56732
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
646 If @code{delete-old-versions} is @code{t}, Emacs deletes the excess |
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
647 backup files silently. If it is @code{nil}, the default, Emacs asks |
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
648 you whether it should delete the excess backup versions. If it has |
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
649 any other value, then Emacs never automatically deletes backups. |
25829 | 650 |
651 Dired's @kbd{.} (Period) command can also be used to delete old versions. | |
652 @xref{Dired Deletion}. | |
653 | |
654 @node Backup Copying | |
655 @subsubsection Copying vs.@: Renaming | |
656 | |
38739 | 657 Backup files can be made by copying the old file or by renaming it. |
658 This makes a difference when the old file has multiple names (hard | |
659 links). If the old file is renamed into the backup file, then the | |
660 alternate names become names for the backup file. If the old file is | |
661 copied instead, then the alternate names remain names for the file | |
662 that you are editing, and the contents accessed by those names will be | |
663 the new contents. | |
25829 | 664 |
665 The method of making a backup file may also affect the file's owner | |
666 and group. If copying is used, these do not change. If renaming is used, | |
667 you become the file's owner, and the file's group becomes the default | |
668 (different operating systems have different defaults for the group). | |
669 | |
670 Having the owner change is usually a good idea, because then the owner | |
671 always shows who last edited the file. Also, the owners of the backups | |
672 show who produced those versions. Occasionally there is a file whose | |
673 owner should not change; it is a good idea for such files to contain | |
674 local variable lists to set @code{backup-by-copying-when-mismatch} | |
675 locally (@pxref{File Variables}). | |
676 | |
677 @vindex backup-by-copying | |
678 @vindex backup-by-copying-when-linked | |
679 @vindex backup-by-copying-when-mismatch | |
31043
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
680 @vindex backup-by-copying-when-privileged-mismatch |
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
681 @cindex file ownership, and backup |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
682 @cindex backup, and user-id |
31043
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
683 The choice of renaming or copying is controlled by four variables. |
25829 | 684 Renaming is the default choice. If the variable |
685 @code{backup-by-copying} is non-@code{nil}, copying is used. Otherwise, | |
686 if the variable @code{backup-by-copying-when-linked} is non-@code{nil}, | |
687 then copying is used for files that have multiple names, but renaming | |
688 may still be used when the file being edited has only one name. If the | |
689 variable @code{backup-by-copying-when-mismatch} is non-@code{nil}, then | |
690 copying is used if renaming would cause the file's owner or group to | |
691 change. @code{backup-by-copying-when-mismatch} is @code{t} by default | |
31043
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
692 if you start Emacs as the superuser. The fourth variable, |
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
693 @code{backup-by-copying-when-privileged-mismatch}, gives the highest |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
694 numeric user-id for which @code{backup-by-copying-when-mismatch} will be |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
695 forced on. This is useful when low-numbered user-ids are assigned to |
31043
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
696 special system users, such as @code{root}, @code{bin}, @code{daemon}, |
31a21ae1de1f
Document backup-by-copying-when-privileged-mismatch.
Eli Zaretskii <eliz@gnu.org>
parents:
29683
diff
changeset
|
697 etc., which must maintain ownership of files. |
25829 | 698 |
699 When a file is managed with a version control system (@pxref{Version | |
700 Control}), Emacs does not normally make backups in the usual way for | |
701 that file. But check-in and check-out are similar in some ways to | |
702 making backups. One unfortunate similarity is that these operations | |
703 typically break hard links, disconnecting the file name you visited from | |
704 any alternate names for the same file. This has nothing to do with | |
705 Emacs---the version control system does it. | |
706 | |
65532
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
707 @node Customize Save |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
708 @subsection Customizing Saving of Files |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
709 |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
710 @vindex require-final-newline |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
711 If the value of the variable @code{require-final-newline} is |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
712 @code{t}, saving or writing a file silently puts a newline at the end |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
713 if there isn't already one there. If the value is @code{visit}, Emacs |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
714 adds a newline at the end of any file that doesn't have one, just |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
715 after it visits the file. (This marks the buffer as modified, and you |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
716 can undo it.) If the value is @code{visit-save}, that means to add |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
717 newlines both on visiting and on saving. If the value is @code{nil}, |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
718 Emacs leaves the end of the file unchanged; if it's neither @code{nil} |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
719 nor @code{t}, Emacs asks you whether to add a newline. The default is |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
720 @code{nil}. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
721 |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
722 @vindex mode-require-final-newline |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
723 Many major modes are designed for specific kinds of files that are |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
724 always supposed to end in newlines. These major modes set the |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
725 variable @code{require-final-newline} according to |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
726 @code{mode-require-final-newline}. By setting the latter variable, |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
727 you can control how these modes handle final newlines. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
728 |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
729 @vindex write-region-inhibit-fsync |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
730 When Emacs saves a file, it invokes the @code{fsync} system call to |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
731 force the data immediately out to disk. This is important for safety |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
732 if the system crashes or in case of power outage. However, it can be |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
733 disruptive on laptops using power saving, because it requires the disk |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
734 to spin up each time you save a file. Setting |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
735 @code{write-region-inhibit-fsync} to a non-@code{nil} value disables |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
736 this synchronization. Be careful---this means increased risk of data |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
737 loss. |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
738 |
25829 | 739 @node Interlocking |
740 @subsection Protection against Simultaneous Editing | |
741 | |
742 @cindex file dates | |
743 @cindex simultaneous editing | |
744 Simultaneous editing occurs when two users visit the same file, both | |
745 make changes, and then both save them. If nobody were informed that | |
746 this was happening, whichever user saved first would later find that his | |
747 changes were lost. | |
748 | |
749 On some systems, Emacs notices immediately when the second user starts | |
750 to change the file, and issues an immediate warning. On all systems, | |
751 Emacs checks when you save the file, and warns if you are about to | |
752 overwrite another user's changes. You can prevent loss of the other | |
753 user's work by taking the proper corrective action instead of saving the | |
754 file. | |
755 | |
756 @findex ask-user-about-lock | |
757 @cindex locking files | |
758 When you make the first modification in an Emacs buffer that is | |
759 visiting a file, Emacs records that the file is @dfn{locked} by you. | |
760 (It does this by creating a symbolic link in the same directory with a | |
761 different name.) Emacs removes the lock when you save the changes. The | |
762 idea is that the file is locked whenever an Emacs buffer visiting it has | |
763 unsaved changes. | |
764 | |
765 @cindex collision | |
766 If you begin to modify the buffer while the visited file is locked by | |
767 someone else, this constitutes a @dfn{collision}. When Emacs detects a | |
768 collision, it asks you what to do, by calling the Lisp function | |
769 @code{ask-user-about-lock}. You can redefine this function for the sake | |
770 of customization. The standard definition of this function asks you a | |
771 question and accepts three possible answers: | |
772 | |
773 @table @kbd | |
774 @item s | |
775 Steal the lock. Whoever was already changing the file loses the lock, | |
776 and you gain the lock. | |
777 @item p | |
778 Proceed. Go ahead and edit the file despite its being locked by someone else. | |
779 @item q | |
38739 | 780 Quit. This causes an error (@code{file-locked}), and the buffer |
781 contents remain unchanged---the modification you were trying to make | |
782 does not actually take place. | |
25829 | 783 @end table |
784 | |
785 Note that locking works on the basis of a file name; if a file has | |
786 multiple names, Emacs does not realize that the two names are the same file | |
787 and cannot prevent two users from editing it simultaneously under different | |
788 names. However, basing locking on names means that Emacs can interlock the | |
789 editing of new files that will not really exist until they are saved. | |
790 | |
791 Some systems are not configured to allow Emacs to make locks, and | |
792 there are cases where lock files cannot be written. In these cases, | |
793 Emacs cannot detect trouble in advance, but it still can detect the | |
794 collision when you try to save a file and overwrite someone else's | |
795 changes. | |
796 | |
797 If Emacs or the operating system crashes, this may leave behind lock | |
36327
f32c31c60f60
(Interlocking): Fix wording of "So you may".
Eli Zaretskii <eliz@gnu.org>
parents:
36326
diff
changeset
|
798 files which are stale, so you may occasionally get warnings about |
25829 | 799 spurious collisions. When you determine that the collision is spurious, |
800 just use @kbd{p} to tell Emacs to go ahead anyway. | |
801 | |
802 Every time Emacs saves a buffer, it first checks the last-modification | |
803 date of the existing file on disk to verify that it has not changed since the | |
804 file was last visited or saved. If the date does not match, it implies | |
805 that changes were made in the file in some other way, and these changes are | |
806 about to be lost if Emacs actually does save. To prevent this, Emacs | |
38870
d44abb4e68b2
Don't use "print" for displaying a message.
Richard M. Stallman <rms@gnu.org>
parents:
38768
diff
changeset
|
807 displays a warning message and asks for confirmation before saving. |
25829 | 808 Occasionally you will know why the file was changed and know that it does |
809 not matter; then you can answer @kbd{yes} and proceed. Otherwise, you should | |
810 cancel the save with @kbd{C-g} and investigate the situation. | |
811 | |
812 The first thing you should do when notified that simultaneous editing | |
813 has already taken place is to list the directory with @kbd{C-u C-x C-d} | |
814 (@pxref{Directories}). This shows the file's current author. You | |
815 should attempt to contact him to warn him not to continue editing. | |
816 Often the next step is to save the contents of your Emacs buffer under a | |
817 different name, and use @code{diff} to compare the two files.@refill | |
818 | |
31076 | 819 @node File Shadowing |
820 @subsection Shadowing Files | |
821 @cindex shadow files | |
822 @cindex file shadows | |
823 | |
824 @table @kbd | |
825 @item M-x shadow-initialize | |
826 Set up file shadowing. | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
827 @item M-x shadow-define-literal-group |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
828 Declare a single file to be shared between sites. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
829 @item M-x shadow-define-regexp-group |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
830 Make all files that match each of a group of files be shared between hosts. |
31076 | 831 @item M-x shadow-define-cluster @key{RET} @var{name} @key{RET} |
832 Define a shadow file cluster @var{name}. | |
833 @item M-x shadow-copy-files | |
834 Copy all pending shadow files. | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
835 @item M-x shadow-cancel |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
836 Cancel the instruction to shadow some files. |
31076 | 837 @end table |
838 | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
839 You can arrange to keep identical @dfn{shadow} copies of certain files |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
840 in more than one place---possibly on different machines. To do this, |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
841 first you must set up a @dfn{shadow file group}, which is a set of |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
842 identically-named files shared between a list of sites. The file |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
843 group is permanent and applies to further Emacs sessions as well as |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
844 the current one. Once the group is set up, every time you exit Emacs, |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
845 it will copy the file you edited to the other files in its group. You |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
846 can also do the copying without exiting Emacs, by typing @kbd{M-x |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
847 shadow-copy-files}. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
848 |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
849 To set up a shadow file group, use @kbd{M-x |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
850 shadow-define-literal-group} or @kbd{M-x shadow-define-regexp-group}. |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
851 See their documentation strings for further information. |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
852 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
853 Before copying a file to its shadows, Emacs asks for confirmation. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
854 You can answer ``no'' to bypass copying of this file, this time. If |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
855 you want to cancel the shadowing permanently for a certain file, use |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
856 @kbd{M-x shadow-cancel} to eliminate or change the shadow file group. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
857 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
858 A @dfn{shadow cluster} is a group of hosts that share directories, so |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
859 that copying to or from one of them is sufficient to update the file |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
860 on all of them. Each shadow cluster has a name, and specifies the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
861 network address of a primary host (the one we copy files to), and a |
39263 | 862 regular expression that matches the host names of all the other hosts |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
863 in the cluster. You can define a shadow cluster with @kbd{M-x |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
864 shadow-define-cluster}. |
31076 | 865 |
35524 | 866 @node Time Stamps |
867 @subsection Updating Time Stamps Automatically | |
868 @findex time-stamp | |
869 @cindex time stamps | |
870 @cindex modification dates | |
35620 | 871 @cindex locale, date format |
35524 | 872 |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
873 You can arrange to put a time stamp in a file, so that it will be updated |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
874 automatically each time you edit and save the file. The time stamp |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
875 has to be in the first eight lines of the file, and you should |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
876 insert it like this: |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
877 |
35524 | 878 @example |
879 Time-stamp: <> | |
880 @end example | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
881 |
35524 | 882 @noindent |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
883 or like this: |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
884 |
35524 | 885 @example |
49561
c7709b58cc74
Time Stamps: template must have space between quotation marks.
Stephen Gildea <gildea@stop.mail-abuse.org>
parents:
47001
diff
changeset
|
886 Time-stamp: " " |
35524 | 887 @end example |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
888 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
889 Then add the hook function @code{time-stamp} to the hook |
56732
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
890 @code{before-save-hook}; that hook function will automatically update |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
891 the time stamp, inserting the current date and time when you save the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
892 file. You can also use the command @kbd{M-x time-stamp} to update the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
893 time stamp manually. For other customizations, see the Custom group |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
894 @code{time-stamp}. Note that non-numeric fields in the time stamp are |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
895 formatted according to your locale setting (@pxref{Environment}). |
35524 | 896 |
25829 | 897 @node Reverting |
898 @section Reverting a Buffer | |
899 @findex revert-buffer | |
900 @cindex drastic changes | |
36547
4dff107cf2a1
(Reverting): Add an index entry "reread a file".
Eli Zaretskii <eliz@gnu.org>
parents:
36402
diff
changeset
|
901 @cindex reread a file |
25829 | 902 |
903 If you have made extensive changes to a file and then change your mind | |
904 about them, you can get rid of them by reading in the previous version | |
905 of the file. To do this, use @kbd{M-x revert-buffer}, which operates on | |
906 the current buffer. Since reverting a buffer unintentionally could lose | |
907 a lot of work, you must confirm this command with @kbd{yes}. | |
908 | |
54683
9ded73128160
(Reverting): Correct description of revert-buffer's handling of point.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53633
diff
changeset
|
909 @code{revert-buffer} tries to position point in such a way that, if |
9ded73128160
(Reverting): Correct description of revert-buffer's handling of point.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53633
diff
changeset
|
910 the file was edited only slightly, you will be at approximately the |
9ded73128160
(Reverting): Correct description of revert-buffer's handling of point.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53633
diff
changeset
|
911 same piece of text after reverting as before. However, if you have made |
9ded73128160
(Reverting): Correct description of revert-buffer's handling of point.
Luc Teirlinck <teirllm@auburn.edu>
parents:
53633
diff
changeset
|
912 drastic changes, point may wind up in a totally different piece of text. |
25829 | 913 |
914 Reverting marks the buffer as ``not modified'' until another change is | |
915 made. | |
916 | |
917 Some kinds of buffers whose contents reflect data bases other than files, | |
918 such as Dired buffers, can also be reverted. For them, reverting means | |
919 recalculating their contents from the appropriate data base. Buffers | |
920 created explicitly with @kbd{C-x b} cannot be reverted; @code{revert-buffer} | |
921 reports an error when asked to do so. | |
922 | |
923 @vindex revert-without-query | |
924 When you edit a file that changes automatically and frequently---for | |
925 example, a log of output from a process that continues to run---it may be | |
926 useful for Emacs to revert the file without querying you, whenever you | |
927 visit the file again with @kbd{C-x C-f}. | |
928 | |
929 To request this behavior, set the variable @code{revert-without-query} | |
930 to a list of regular expressions. When a file name matches one of these | |
931 regular expressions, @code{find-file} and @code{revert-buffer} will | |
932 revert it automatically if it has changed---provided the buffer itself | |
933 is not modified. (If you have edited the text, it would be wrong to | |
934 discard your changes.) | |
935 | |
36874 | 936 @cindex Global Auto-Revert mode |
937 @cindex mode, Global Auto-Revert | |
938 @cindex Auto-Revert mode | |
939 @cindex mode, Auto-Revert | |
940 @findex global-auto-revert-mode | |
941 @findex auto-revert-mode | |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
942 @findex auto-revert-tail-mode |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
943 |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
944 You may find it useful to have Emacs revert files automatically when |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
945 they change. Three minor modes are available to do this. |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
946 |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
947 @kbd{M-x global-auto-revert-mode} runs Global Auto-Revert mode, |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
948 which periodically checks all file buffers and reverts when the |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
949 corresponding file has changed. @kbd{M-x auto-revert-mode} runs a |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
950 local version, Auto-Revert mode, which applies only to the buffer in |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
951 which it was activated. Auto-Revert mode can be used to ``tail'' a |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
952 file, such as a system log, so that changes made to that file by other |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
953 programs are continuously displayed. To do this, just move the point |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
954 to the end of the buffer, and it will stay there as the file contents |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
955 change. However, if you are sure that the file will only change by |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
956 growing at the end, you can tail the file more efficiently using |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
957 Auto-Revert Tail mode, @kbd{M-x auto-revert-tail-mode}. |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
958 |
36874 | 959 @vindex auto-revert-interval |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
960 The variable @code{auto-revert-interval} controls how often to check |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
961 for a changed file. Since checking a remote file is too slow, these |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
962 modes do not check or revert remote files. |
36874 | 963 |
61197
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
964 @xref{VC Mode Line}, for Auto Revert peculiarities in buffers that |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
965 visit files under version control. |
60951
12780efcd4fc
(Reverting): Document auto-revert-check-vc-info.
Richard M. Stallman <rms@gnu.org>
parents:
60792
diff
changeset
|
966 |
25829 | 967 @node Auto Save |
968 @section Auto-Saving: Protection Against Disasters | |
969 @cindex Auto Save mode | |
970 @cindex mode, Auto Save | |
971 @cindex crashes | |
972 | |
973 Emacs saves all the visited files from time to time (based on counting | |
974 your keystrokes) without being asked. This is called @dfn{auto-saving}. | |
975 It prevents you from losing more than a limited amount of work if the | |
976 system crashes. | |
977 | |
978 When Emacs determines that it is time for auto-saving, each buffer is | |
979 considered, and is auto-saved if auto-saving is turned on for it and it | |
980 has been changed since the last time it was auto-saved. The message | |
981 @samp{Auto-saving...} is displayed in the echo area during auto-saving, | |
982 if any files are actually auto-saved. Errors occurring during | |
983 auto-saving are caught so that they do not interfere with the execution | |
984 of commands you have been typing. | |
985 | |
986 @menu | |
987 * Files: Auto Save Files. The file where auto-saved changes are | |
988 actually made until you save the file. | |
989 * Control: Auto Save Control. Controlling when and how often to auto-save. | |
990 * Recover:: Recovering text from auto-save files. | |
991 @end menu | |
992 | |
993 @node Auto Save Files | |
994 @subsection Auto-Save Files | |
995 | |
996 Auto-saving does not normally save in the files that you visited, because | |
997 it can be very undesirable to save a program that is in an inconsistent | |
998 state when you have made half of a planned change. Instead, auto-saving | |
999 is done in a different file called the @dfn{auto-save file}, and the | |
1000 visited file is changed only when you request saving explicitly (such as | |
1001 with @kbd{C-x C-s}). | |
1002 | |
1003 Normally, the auto-save file name is made by appending @samp{#} to the | |
1004 front and rear of the visited file name. Thus, a buffer visiting file | |
1005 @file{foo.c} is auto-saved in a file @file{#foo.c#}. Most buffers that | |
1006 are not visiting files are auto-saved only if you request it explicitly; | |
1007 when they are auto-saved, the auto-save file name is made by appending | |
43682
02ff23017427
Update how auto-save file names are made for non-file buffers.
Richard M. Stallman <rms@gnu.org>
parents:
42433
diff
changeset
|
1008 @samp{#} to the front and rear of buffer name, then |
02ff23017427
Update how auto-save file names are made for non-file buffers.
Richard M. Stallman <rms@gnu.org>
parents:
42433
diff
changeset
|
1009 adding digits and letters at the end for uniqueness. For |
25829 | 1010 example, the @samp{*mail*} buffer in which you compose messages to be |
56732
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
1011 sent might be auto-saved in a file named @file{#*mail*#704juu}. Auto-save file |
25829 | 1012 names are made this way unless you reprogram parts of Emacs to do |
1013 something different (the functions @code{make-auto-save-file-name} and | |
1014 @code{auto-save-file-name-p}). The file name to be used for auto-saving | |
1015 in a buffer is calculated when auto-saving is turned on in that buffer. | |
1016 | |
44717
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
1017 @cindex auto-save for remote files |
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
1018 @vindex auto-save-file-name-transforms |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
1019 The variable @code{auto-save-file-name-transforms} allows a degree |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
1020 of control over the auto-save file name. It lets you specify a series |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
1021 of regular expressions and replacements to transform the auto save |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
1022 file name. The default value puts the auto-save files for remote |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
1023 files (@pxref{Remote Files}) into the temporary file directory on the |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
1024 local machine. |
44717
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
1025 |
25829 | 1026 When you delete a substantial part of the text in a large buffer, auto |
1027 save turns off temporarily in that buffer. This is because if you | |
1028 deleted the text unintentionally, you might find the auto-save file more | |
1029 useful if it contains the deleted text. To reenable auto-saving after | |
1030 this happens, save the buffer with @kbd{C-x C-s}, or use @kbd{C-u 1 M-x | |
56732
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
1031 auto-save-mode}. |
25829 | 1032 |
1033 @vindex auto-save-visited-file-name | |
38739 | 1034 If you want auto-saving to be done in the visited file rather than |
1035 in a separate auto-save file, set the variable | |
1036 @code{auto-save-visited-file-name} to a non-@code{nil} value. In this | |
1037 mode, there is no real difference between auto-saving and explicit | |
1038 saving. | |
25829 | 1039 |
1040 @vindex delete-auto-save-files | |
1041 A buffer's auto-save file is deleted when you save the buffer in its | |
1042 visited file. To inhibit this, set the variable @code{delete-auto-save-files} | |
1043 to @code{nil}. Changing the visited file name with @kbd{C-x C-w} or | |
1044 @code{set-visited-file-name} renames any auto-save file to go with | |
1045 the new visited name. | |
1046 | |
1047 @node Auto Save Control | |
1048 @subsection Controlling Auto-Saving | |
1049 | |
1050 @vindex auto-save-default | |
1051 @findex auto-save-mode | |
1052 Each time you visit a file, auto-saving is turned on for that file's | |
1053 buffer if the variable @code{auto-save-default} is non-@code{nil} (but not | |
1054 in batch mode; @pxref{Entering Emacs}). The default for this variable is | |
1055 @code{t}, so auto-saving is the usual practice for file-visiting buffers. | |
1056 Auto-saving can be turned on or off for any existing buffer with the | |
1057 command @kbd{M-x auto-save-mode}. Like other minor mode commands, @kbd{M-x | |
1058 auto-save-mode} turns auto-saving on with a positive argument, off with a | |
1059 zero or negative argument; with no argument, it toggles. | |
1060 | |
1061 @vindex auto-save-interval | |
1062 Emacs does auto-saving periodically based on counting how many characters | |
1063 you have typed since the last time auto-saving was done. The variable | |
1064 @code{auto-save-interval} specifies how many characters there are between | |
40682
e9a06f7efd3f
(Auto Save Control): Document that values of auto-save-interval less
Eli Zaretskii <eliz@gnu.org>
parents:
39263
diff
changeset
|
1065 auto-saves. By default, it is 300. Emacs doesn't accept values that are |
e9a06f7efd3f
(Auto Save Control): Document that values of auto-save-interval less
Eli Zaretskii <eliz@gnu.org>
parents:
39263
diff
changeset
|
1066 too small: if you customize @code{auto-save-interval} to a value less |
e9a06f7efd3f
(Auto Save Control): Document that values of auto-save-interval less
Eli Zaretskii <eliz@gnu.org>
parents:
39263
diff
changeset
|
1067 than 20, Emacs will behave as if the value is 20. |
25829 | 1068 |
1069 @vindex auto-save-timeout | |
1070 Auto-saving also takes place when you stop typing for a while. The | |
1071 variable @code{auto-save-timeout} says how many seconds Emacs should | |
1072 wait before it does an auto save (and perhaps also a garbage | |
1073 collection). (The actual time period is longer if the current buffer is | |
1074 long; this is a heuristic which aims to keep out of your way when you | |
1075 are editing long buffers, in which auto-save takes an appreciable amount | |
1076 of time.) Auto-saving during idle periods accomplishes two things: | |
1077 first, it makes sure all your work is saved if you go away from the | |
1078 terminal for a while; second, it may avoid some auto-saving while you | |
1079 are actually typing. | |
1080 | |
1081 Emacs also does auto-saving whenever it gets a fatal error. This | |
1082 includes killing the Emacs job with a shell command such as @samp{kill | |
1083 %emacs}, or disconnecting a phone line or network connection. | |
1084 | |
1085 @findex do-auto-save | |
1086 You can request an auto-save explicitly with the command @kbd{M-x | |
1087 do-auto-save}. | |
1088 | |
1089 @node Recover | |
1090 @subsection Recovering Data from Auto-Saves | |
1091 | |
1092 @findex recover-file | |
1093 You can use the contents of an auto-save file to recover from a loss | |
1094 of data with the command @kbd{M-x recover-file @key{RET} @var{file} | |
1095 @key{RET}}. This visits @var{file} and then (after your confirmation) | |
1096 restores the contents from its auto-save file @file{#@var{file}#}. | |
1097 You can then save with @kbd{C-x C-s} to put the recovered text into | |
1098 @var{file} itself. For example, to recover file @file{foo.c} from its | |
1099 auto-save file @file{#foo.c#}, do:@refill | |
1100 | |
1101 @example | |
1102 M-x recover-file @key{RET} foo.c @key{RET} | |
1103 yes @key{RET} | |
1104 C-x C-s | |
1105 @end example | |
1106 | |
1107 Before asking for confirmation, @kbd{M-x recover-file} displays a | |
1108 directory listing describing the specified file and the auto-save file, | |
1109 so you can compare their sizes and dates. If the auto-save file | |
1110 is older, @kbd{M-x recover-file} does not offer to read it. | |
1111 | |
1112 @findex recover-session | |
1113 If Emacs or the computer crashes, you can recover all the files you | |
1114 were editing from their auto save files with the command @kbd{M-x | |
1115 recover-session}. This first shows you a list of recorded interrupted | |
1116 sessions. Move point to the one you choose, and type @kbd{C-c C-c}. | |
1117 | |
1118 Then @code{recover-session} asks about each of the files that were | |
1119 being edited during that session, asking whether to recover that file. | |
1120 If you answer @kbd{y}, it calls @code{recover-file}, which works in its | |
1121 normal fashion. It shows the dates of the original file and its | |
1122 auto-save file, and asks once again whether to recover that file. | |
1123 | |
1124 When @code{recover-session} is done, the files you've chosen to | |
1125 recover are present in Emacs buffers. You should then save them. Only | |
1126 this---saving them---updates the files themselves. | |
1127 | |
1128 @vindex auto-save-list-file-prefix | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1129 Emacs records interrupted sessions for later recovery in files named |
44327
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
1130 @file{~/.emacs.d/auto-save-list/.saves-@var{pid}-@var{hostname}}. All |
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
1131 of this name except @file{@var{pid}-@var{hostname}} comes from the |
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
1132 value of @code{auto-save-list-file-prefix}. You can record sessions |
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
1133 in a different place by customizing that variable. If you set |
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
1134 @code{auto-save-list-file-prefix} to @code{nil} in your @file{.emacs} |
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
1135 file, sessions are not recorded for recovery. |
25829 | 1136 |
1137 @node File Aliases | |
1138 @section File Name Aliases | |
52575
3a79db508c6c
(File Aliases, Misc File Ops): Add @cindex entries.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1139 @cindex symbolic links (visiting) |
3a79db508c6c
(File Aliases, Misc File Ops): Add @cindex entries.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
1140 @cindex hard links (visiting) |
25829 | 1141 |
1142 Symbolic links and hard links both make it possible for several file | |
1143 names to refer to the same file. Hard links are alternate names that | |
1144 refer directly to the file; all the names are equally valid, and no one | |
1145 of them is preferred. By contrast, a symbolic link is a kind of defined | |
1146 alias: when @file{foo} is a symbolic link to @file{bar}, you can use | |
1147 either name to refer to the file, but @file{bar} is the real name, while | |
1148 @file{foo} is just an alias. More complex cases occur when symbolic | |
1149 links point to directories. | |
1150 | |
1151 If you visit two names for the same file, normally Emacs makes | |
1152 two different buffers, but it warns you about the situation. | |
1153 | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1154 @vindex find-file-existing-other-name |
38922
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1155 @vindex find-file-suppress-same-file-warnings |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1156 Normally, if you visit a file which Emacs is already visiting under |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1157 a different name, Emacs displays a message in the echo area and uses |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1158 the existing buffer visiting that file. This can happen on systems |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1159 that support symbolic links, or if you use a long file name on a |
38922
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1160 system that truncates long file names. You can suppress the message by |
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1161 setting the variable @code{find-file-suppress-same-file-warnings} to a |
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1162 non-@code{nil} value. You can disable this feature entirely by setting |
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1163 the variable @code{find-file-existing-other-name} to @code{nil}: then |
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1164 if you visit the same file under two different names, you get a separate |
526466ad5a06
(File Aliases): Document find-file-suppress-same-file-warnings.
Eli Zaretskii <eliz@gnu.org>
parents:
38870
diff
changeset
|
1165 buffer for each file name. |
25829 | 1166 |
1167 @vindex find-file-visit-truename | |
1168 @cindex truenames of files | |
1169 @cindex file truenames | |
1170 If the variable @code{find-file-visit-truename} is non-@code{nil}, | |
1171 then the file name recorded for a buffer is the file's @dfn{truename} | |
1172 (made by replacing all symbolic links with their target names), rather | |
1173 than the name you specify. Setting @code{find-file-visit-truename} also | |
1174 implies the effect of @code{find-file-existing-other-name}. | |
1175 | |
1176 @node Version Control | |
1177 @section Version Control | |
1178 @cindex version control | |
1179 | |
1180 @dfn{Version control systems} are packages that can record multiple | |
1181 versions of a source file, usually storing the unchanged parts of the | |
1182 file just once. Version control systems also record history information | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1183 such as the creation time of each version, who created it, and a |
25829 | 1184 description of what was changed in that version. |
1185 | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1186 The Emacs version control interface is called VC. Its commands work |
58112
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1187 with different version control systems---currently, it supports CVS, |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1188 GNU Arch, RCS, Meta-CVS, Subversion, and SCCS. Of these, the GNU |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1189 project distributes CVS, GNU Arch, and RCS; we recommend that you use |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1190 either CVS or GNU Arch for your projects, and RCS for individual |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1191 files. We also have free software to replace SCCS, known as CSSC; if |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1192 you are using SCCS and don't want to make the incompatible change to |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1193 RCS or CVS, you can switch to CSSC. |
25829 | 1194 |
53244 | 1195 VC is enabled by default in Emacs. To disable it, set the |
1196 customizable variable @code{vc-handled-backends} to @code{nil} | |
1197 (@pxref{Customizing VC}). | |
1198 | |
25829 | 1199 @menu |
1200 * Introduction to VC:: How version control works in general. | |
42338
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1201 * VC Mode Line:: How the mode line shows version control status. |
25829 | 1202 * Basic VC Editing:: How to edit a file under version control. |
1203 * Old Versions:: Examining and comparing old versions. | |
1204 * Secondary VC Commands:: The commands used a little less frequently. | |
1205 * Branches:: Multiple lines of development. | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1206 * Remote Repositories:: Efficient access to remote CVS servers. |
25829 | 1207 * Snapshots:: Sets of file versions treated as a unit. |
1208 * Miscellaneous VC:: Various other commands and features of VC. | |
1209 * Customizing VC:: Variables that change VC's behavior. | |
1210 @end menu | |
1211 | |
1212 @node Introduction to VC | |
1213 @subsection Introduction to Version Control | |
1214 | |
1215 VC allows you to use a version control system from within Emacs, | |
1216 integrating the version control operations smoothly with editing. VC | |
1217 provides a uniform interface to version control, so that regardless of | |
1218 which version control system is in use, you can use it the same way. | |
1219 | |
1220 This section provides a general overview of version control, and | |
1221 describes the version control systems that VC supports. You can skip | |
1222 this section if you are already familiar with the version control system | |
1223 you want to use. | |
1224 | |
1225 @menu | |
1226 * Version Systems:: Supported version control back-end systems. | |
1227 * VC Concepts:: Words and concepts related to version control. | |
42327
86a0b7cc1600
Explain the difference between the per-file log maintained by the
Robert J. Chassell <bob@rattlesnake.com>
parents:
40682
diff
changeset
|
1228 * Types of Log File:: The per-file VC log in contrast to the ChangeLog. |
25829 | 1229 @end menu |
1230 | |
1231 @node Version Systems | |
1232 @subsubsection Supported Version Control Systems | |
1233 | |
1234 @cindex back end (version control) | |
58112
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1235 VC currently works with six different version control systems or |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1236 ``back ends'': CVS, GNU Arch, RCS, Meta-CVS, Subversion, and SCCS. |
25829 | 1237 |
1238 @cindex CVS | |
58112
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1239 CVS is a free version control system that is used for the majority |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1240 of free software projects today. It allows concurrent multi-user |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1241 development either locally or over the network. Some of its |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1242 shortcomings, corrected by newer systems such as GNU Arch, are that it |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1243 lacks atomic commits or support for renaming files. VC supports all |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1244 basic editing operations under CVS, but for some less common tasks you |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1245 still need to call CVS from the command line. Note also that before |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1246 using CVS you must set up a repository, which is a subject too complex |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1247 to treat here. |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1248 |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1249 @cindex GNU Arch |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1250 @cindex Arch |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1251 GNU Arch is a new version control system that is designed for |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1252 distributed work. It differs in many ways from old well-known |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1253 systems, such as CVS and RCS. It supports different transports for |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1254 interoperating between users, offline operations, and it has good |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1255 branching and merging features. It also supports atomic commits, and |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1256 history of file renaming and moving. VC does not support all |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1257 operations provided by GNU Arch, so you must sometimes invoke it from |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1258 the command line, or use a specialized module. |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1259 |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1260 @cindex RCS |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1261 RCS is the free version control system around which VC was initially |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1262 built. The VC commands are therefore conceptually closest to RCS. |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1263 Almost everything you can do with RCS can be done through VC. You |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1264 cannot use RCS over the network though, and it only works at the level |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1265 of individual files, rather than projects. You should use it if you |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1266 want a simple, yet reliable tool for handling individual files. |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1267 |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1268 @cindex SVN |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1269 @cindex Subversion |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1270 Subversion is a free version control system designed to be similar |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1271 to CVS but without CVS's problems. Subversion supports atomic commits, |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1272 and versions directories, symbolic links, meta-data, renames, copies, |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1273 and deletes. It can be used via http or via its own protocol. |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1274 |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1275 @cindex MCVS |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1276 @cindex Meta-CVS |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
1277 Meta-CVS is another attempt to solve problems arising in CVS. It |
58112
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1278 supports directory structure versioning, improved branching and |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1279 merging, and use of symbolic links and meta-data in repositories. |
25829 | 1280 |
1281 @cindex SCCS | |
1282 SCCS is a proprietary but widely used version control system. In | |
58112
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1283 terms of capabilities, it is the weakest of the six that VC supports. |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1284 VC compensates for certain features missing in SCCS (snapshots, for |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1285 example) by implementing them itself, but some other VC features, such |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1286 as multiple branches, are not available with SCCS. You should use |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1287 SCCS only if for some reason you cannot use RCS, or one of the |
6b135de9eb2c
Rewrite the introduction about version systems, mentioning the new
André Spiegel <spiegel@gnu.org>
parents:
57404
diff
changeset
|
1288 higher-level systems such as CVS or GNU Arch. |
25829 | 1289 |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1290 In the following, we discuss mainly RCS, SCCS and CVS. Nearly |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1291 everything said about CVS applies to Gnu Arch, Subversion and Meta-CVS |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1292 as well. |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1293 |
25829 | 1294 @node VC Concepts |
1295 @subsubsection Concepts of Version Control | |
1296 | |
1297 @cindex master file | |
1298 @cindex registered file | |
1299 When a file is under version control, we also say that it is | |
1300 @dfn{registered} in the version control system. Each registered file | |
1301 has a corresponding @dfn{master file} which represents the file's | |
1302 present state plus its change history---enough to reconstruct the | |
1303 current version or any earlier version. Usually the master file also | |
1304 records a @dfn{log entry} for each version, describing in words what was | |
1305 changed in that version. | |
1306 | |
1307 @cindex work file | |
1308 @cindex checking out files | |
1309 The file that is maintained under version control is sometimes called | |
1310 the @dfn{work file} corresponding to its master file. You edit the work | |
1311 file and make changes in it, as you would with an ordinary file. (With | |
1312 SCCS and RCS, you must @dfn{lock} the file before you start to edit it.) | |
1313 After you are done with a set of changes, you @dfn{check the file in}, | |
1314 which records the changes in the master file, along with a log entry for | |
1315 them. | |
1316 | |
1317 With CVS, there are usually multiple work files corresponding to a | |
1318 single master file---often each user has his own copy. It is also | |
1319 possible to use RCS in this way, but this is not the usual way to use | |
1320 RCS. | |
1321 | |
1322 @cindex locking and version control | |
1323 A version control system typically has some mechanism to coordinate | |
1324 between users who want to change the same file. One method is | |
1325 @dfn{locking} (analogous to the locking that Emacs uses to detect | |
1326 simultaneous editing of a file, but distinct from it). The other method | |
1327 is to merge your changes with other people's changes when you check them | |
1328 in. | |
1329 | |
1330 With version control locking, work files are normally read-only so | |
1331 that you cannot change them. You ask the version control system to make | |
1332 a work file writable for you by locking it; only one user can do | |
1333 this at any given time. When you check in your changes, that unlocks | |
1334 the file, making the work file read-only again. This allows other users | |
1335 to lock the file to make further changes. SCCS always uses locking, and | |
1336 RCS normally does. | |
1337 | |
1338 The other alternative for RCS is to let each user modify the work file | |
1339 at any time. In this mode, locking is not required, but it is | |
1340 permitted; check-in is still the way to record a new version. | |
1341 | |
1342 CVS normally allows each user to modify his own copy of the work file | |
1343 at any time, but requires merging with changes from other users at | |
1344 check-in time. However, CVS can also be set up to require locking. | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1345 (@pxref{CVS Options}). |
25829 | 1346 |
42327
86a0b7cc1600
Explain the difference between the per-file log maintained by the
Robert J. Chassell <bob@rattlesnake.com>
parents:
40682
diff
changeset
|
1347 @node Types of Log File |
86a0b7cc1600
Explain the difference between the per-file log maintained by the
Robert J. Chassell <bob@rattlesnake.com>
parents:
40682
diff
changeset
|
1348 @subsubsection Types of Log File |
42338
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1349 @cindex types of log file |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1350 @cindex log File, types of |
42338
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1351 @cindex version control log |
42327
86a0b7cc1600
Explain the difference between the per-file log maintained by the
Robert J. Chassell <bob@rattlesnake.com>
parents:
40682
diff
changeset
|
1352 |
60426
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1353 Projects that use a revision control system can have @emph{two} |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1354 types of log for changes. One is the per-file log maintained by the |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1355 revision control system: each time you check in a change, you must |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1356 fill out a @dfn{log entry} for the change (@pxref{Log Buffer}). This |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1357 kind of log is called the @dfn{version control log}, also the |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1358 @dfn{revision control log}, @dfn{RCS log}, or @dfn{CVS log}. |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1359 |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1360 The other kind of log is the file @file{ChangeLog} (@pxref{Change |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1361 Log}). It provides a chronological record of all changes to a large |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1362 portion of a program---typically one directory and its subdirectories. |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1363 A small program would use one @file{ChangeLog} file; a large program |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1364 may well merit a @file{ChangeLog} file in each major directory. |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1365 @xref{Change Log}. |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1366 |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1367 A project maintained with version control can use just the per-file |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1368 log, or it can use both kinds of logs. It can handle some files one |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1369 way and some files the other way. Each project has its policy, which |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1370 you should follow. |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1371 |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1372 When the policy is to use both, you typically want to write an entry |
087c96c87148
(Types of Log File): Explain how projects' methods can vary.
Richard M. Stallman <rms@gnu.org>
parents:
59886
diff
changeset
|
1373 for each change just once, then put it into both logs. You can write |
42338
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1374 the entry in @file{ChangeLog}, then copy it to the log buffer when you |
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1375 check in the change. Or you can write the entry in the log buffer |
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1376 while checking in the change, and later use the @kbd{C-x v a} command |
8649ccc72076
Rewrite Types of Log File node.
Richard M. Stallman <rms@gnu.org>
parents:
42327
diff
changeset
|
1377 to copy it to @file{ChangeLog} (@pxref{Change Logs and VC}). |
42327
86a0b7cc1600
Explain the difference between the per-file log maintained by the
Robert J. Chassell <bob@rattlesnake.com>
parents:
40682
diff
changeset
|
1378 |
25829 | 1379 @node VC Mode Line |
1380 @subsection Version Control and the Mode Line | |
1381 | |
1382 When you visit a file that is under version control, Emacs indicates | |
1383 this on the mode line. For example, @samp{RCS-1.3} says that RCS is | |
1384 used for that file, and the current version is 1.3. | |
1385 | |
1386 The character between the back-end name and the version number | |
1387 indicates the version control status of the file. @samp{-} means that | |
1388 the work file is not locked (if locking is in use), or not modified (if | |
1389 locking is not in use). @samp{:} indicates that the file is locked, or | |
1390 that it is modified. If the file is locked by some other user (for | |
1391 instance, @samp{jim}), that is displayed as @samp{RCS:jim:1.3}. | |
1392 | |
61197
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1393 @vindex auto-revert-check-vc-info |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1394 When Auto Revert mode (@pxref{Reverting}) reverts a buffer that is |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1395 under version control, it updates the version control information in |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1396 the mode line. However, Auto Revert mode may not properly update this |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1397 information if the version control status changes without changes to |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1398 the work file, from outside the current Emacs session. If you set |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1399 @code{auto-revert-check-vc-info} to @code{t}, Auto Revert mode updates |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1400 the version control status information every |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1401 @code{auto-revert-interval} seconds, even if the work file itself is |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1402 unchanged. The resulting CPU usage depends on the version control |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1403 system, but is usually not excessive. |
188e0bfcbc42
(Reverting): Move `auto-revert-check-vc-info' to `VC Mode Line' and
Luc Teirlinck <teirllm@auburn.edu>
parents:
61046
diff
changeset
|
1404 |
25829 | 1405 @node Basic VC Editing |
1406 @subsection Basic Editing under Version Control | |
1407 | |
1408 The principal VC command is an all-purpose command that performs | |
1409 either locking or check-in, depending on the situation. | |
1410 | |
1411 @table @kbd | |
1412 @itemx C-x v v | |
1413 Perform the next logical version control operation on this file. | |
1414 @end table | |
1415 | |
1416 @findex vc-next-action | |
1417 @kindex C-x v v | |
1418 The precise action of this command depends on the state of the file, | |
1419 and whether the version control system uses locking or not. SCCS and | |
1420 RCS normally use locking; CVS normally does not use locking. | |
1421 | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1422 @findex vc-toggle-read-only |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1423 @kindex C-x C-q @r{(Version Control)} |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1424 As a special convenience that is particularly useful for files with |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1425 locking, you can let Emacs check a file in or out whenever you change |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1426 its read-only flag. This means, for example, that you cannot |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1427 accidentally edit a file without properly checking it out first. To |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1428 achieve this, bind the key @kbd{C-x C-q} to @kbd{vc-toggle-read-only} |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1429 in your @file{~/.emacs} file. (@xref{Init Rebinding}.) |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1430 |
25829 | 1431 @menu |
1432 * VC with Locking:: RCS in its default mode, SCCS, and optionally CVS. | |
1433 * Without Locking:: Without locking: default mode for CVS. | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1434 * Advanced C-x v v:: Advanced features available with a prefix argument. |
25829 | 1435 * Log Buffer:: Features available in log entry buffers. |
1436 @end menu | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1437 |
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1438 @node VC with Locking |
25829 | 1439 @subsubsection Basic Version Control with Locking |
1440 | |
1441 If locking is used for the file (as with SCCS, and RCS in its default | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1442 mode), @kbd{C-x v v} can either lock a file or check it in: |
25829 | 1443 |
1444 @itemize @bullet | |
1445 @item | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1446 If the file is not locked, @kbd{C-x v v} locks it, and |
25829 | 1447 makes it writable so that you can change it. |
1448 | |
1449 @item | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1450 If the file is locked by you, and contains changes, @kbd{C-x v v} checks |
25829 | 1451 in the changes. In order to do this, it first reads the log entry |
1452 for the new version. @xref{Log Buffer}. | |
1453 | |
1454 @item | |
1455 If the file is locked by you, but you have not changed it since you | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1456 locked it, @kbd{C-x v v} releases the lock and makes the file read-only |
25829 | 1457 again. |
1458 | |
1459 @item | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1460 If the file is locked by some other user, @kbd{C-x v v} asks you whether |
25829 | 1461 you want to ``steal the lock'' from that user. If you say yes, the file |
1462 becomes locked by you, but a message is sent to the person who had | |
1463 formerly locked the file, to inform him of what has happened. | |
1464 @end itemize | |
1465 | |
1466 These rules also apply when you use CVS in locking mode, except | |
1467 that there is no such thing as stealing a lock. | |
1468 | |
1469 @node Without Locking | |
1470 @subsubsection Basic Version Control without Locking | |
1471 | |
1472 When there is no locking---the default for CVS---work files are always | |
1473 writable; you do not need to do anything before you begin to edit a | |
1474 file. The status indicator on the mode line is @samp{-} if the file is | |
1475 unmodified; it flips to @samp{:} as soon as you save any changes in the | |
1476 work file. | |
1477 | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1478 Here is what @kbd{C-x v v} does when using CVS: |
25829 | 1479 |
1480 @itemize @bullet | |
1481 @item | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1482 If some other user has checked in changes into the master file, Emacs |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1483 asks you whether you want to merge those changes into your own work |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1484 file. You must do this before you can check in your own changes. (To |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1485 pick up any recent changes from the master file @emph{without} trying |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1486 to commit your own changes, type @kbd{C-x v m @key{RET}}.) |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1487 @xref{Merging}. |
25829 | 1488 |
1489 @item | |
1490 If there are no new changes in the master file, but you have made | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1491 modifications in your work file, @kbd{C-x v v} checks in your changes. |
25829 | 1492 In order to do this, it first reads the log entry for the new version. |
1493 @xref{Log Buffer}. | |
1494 | |
1495 @item | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1496 If the file is not modified, the @kbd{C-x v v} does nothing. |
25829 | 1497 @end itemize |
1498 | |
1499 These rules also apply when you use RCS in the mode that does not | |
1500 require locking, except that automatic merging of changes from the | |
1501 master file is not implemented. Unfortunately, this means that nothing | |
1502 informs you if another user has checked in changes in the same file | |
1503 since you began editing it, and when this happens, his changes will be | |
1504 effectively removed when you check in your version (though they will | |
1505 remain in the master file, so they will not be entirely lost). You must | |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1506 therefore verify that the current version is unchanged, before you |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1507 check in your changes. We hope to eliminate this risk and provide |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1508 automatic merging with RCS in a future Emacs version. |
25829 | 1509 |
1510 In addition, locking is possible with RCS even in this mode, although | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1511 it is not required; @kbd{C-x v v} with an unmodified file locks the |
25829 | 1512 file, just as it does with RCS in its normal (locking) mode. |
1513 | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1514 @node Advanced C-x v v |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1515 @subsubsection Advanced Control in @kbd{C-x v v} |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1516 |
44588 | 1517 @cindex version number to check in/out |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1518 When you give a prefix argument to @code{vc-next-action} (@kbd{C-u |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1519 C-x v v}), it still performs the next logical version control |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1520 operation, but accepts additional arguments to specify precisely how |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1521 to do the operation. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1522 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1523 @itemize @bullet |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1524 @item |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1525 If the file is modified (or locked), you can specify the version |
38739 | 1526 number to use for the new version that you check in. This is one way |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1527 to create a new branch (@pxref{Branches}). |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1528 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1529 @item |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1530 If the file is not modified (and unlocked), you can specify the |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1531 version to select; this lets you start working from an older version, |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1532 or on another branch. If you do not enter any version, that takes you |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1533 to the highest version on the current branch; therefore @kbd{C-u C-x |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1534 v v @key{RET}} is a convenient way to get the latest version of a file from |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1535 the repository. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1536 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1537 @item |
44588 | 1538 @cindex specific version control system |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1539 Instead of the version number, you can also specify the name of a |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1540 version control system. This is useful when one file is being managed |
38739 | 1541 with two version control systems at the same time (@pxref{Local |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1542 Version Control}). |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1543 @end itemize |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1544 |
25829 | 1545 @node Log Buffer |
1546 @subsubsection Features of the Log Entry Buffer | |
1547 | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1548 When you check in changes, @kbd{C-x v v} first reads a log entry. It |
25829 | 1549 pops up a buffer called @samp{*VC-Log*} for you to enter the log entry. |
62784
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1550 |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1551 Sometimes the @samp{*VC-Log*} buffer contains default text when you enter it, |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1552 typically the last log message entered. If it does, mark and point |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1553 are set around the entire contents of the buffer so that it is easy to |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1554 kill the contents of the buffer with @kbd{C-w}. |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1555 |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1556 @findex log-edit-insert-changelog |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1557 If you work by writing entries in the @file{ChangeLog} |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1558 (@pxref{Change Log}) and then commit the change under revision |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1559 control, you can generate the Log Edit text from the ChangeLog using |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1560 @kbd{C-c C-a} (@kbd{log-edit-insert-changelog}). This looks for |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1561 entries for the file(s) concerned in the top entry in the ChangeLog |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1562 and uses those paragraphs as the log text. This text is only inserted |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1563 if the top entry was made under your user name on the current date. |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1564 @xref{Change Logs and VC}, for the opposite way of |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1565 working---generating ChangeLog entries from the revision control log. |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1566 |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1567 In the @samp{*VC-Log*} buffer, @kbd{C-c C-f} (@kbd{M-x log-edit-show-files}) |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1568 shows the list of files to be committed in case you need to check |
63149
6ee6dddcf556
(Log Buffer): Document when there can be more than one file to be committed.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62784
diff
changeset
|
1569 that. (This can be a list of more than one file if you use VC Dired |
6ee6dddcf556
(Log Buffer): Document when there can be more than one file to be committed.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62784
diff
changeset
|
1570 mode or PCL-CVS. @xref{VC Dired Mode}, and @ref{Top, , About PCL-CVS, |
6ee6dddcf556
(Log Buffer): Document when there can be more than one file to be committed.
Luc Teirlinck <teirllm@auburn.edu>
parents:
62784
diff
changeset
|
1571 pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}.) |
62784
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1572 |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1573 When you have finished editing the log message, type @kbd{C-c C-c} to |
269312974c2f
(Log Buffer): Merge in description of Log Edit
Nick Roberts <nickrob@snap.net.nz>
parents:
62474
diff
changeset
|
1574 exit the buffer and commit the change. |
25829 | 1575 |
1576 To abort check-in, just @strong{don't} type @kbd{C-c C-c} in that | |
1577 buffer. You can switch buffers and do other editing. As long as you | |
1578 don't try to check in another file, the entry you were editing remains | |
1579 in the @samp{*VC-Log*} buffer, and you can go back to that buffer at any | |
1580 time to complete the check-in. | |
1581 | |
1582 If you change several source files for the same reason, it is often | |
1583 convenient to specify the same log entry for many of the files. To do | |
1584 this, use the history of previous log entries. The commands @kbd{M-n}, | |
1585 @kbd{M-p}, @kbd{M-s} and @kbd{M-r} for doing this work just like the | |
1586 minibuffer history commands (except that these versions are used outside | |
1587 the minibuffer). | |
1588 | |
1589 @vindex vc-log-mode-hook | |
1590 Each time you check in a file, the log entry buffer is put into VC Log | |
1591 mode, which involves running two hooks: @code{text-mode-hook} and | |
1592 @code{vc-log-mode-hook}. @xref{Hooks}. | |
1593 | |
1594 @node Old Versions | |
1595 @subsection Examining And Comparing Old Versions | |
1596 | |
1597 One of the convenient features of version control is the ability | |
1598 to examine any version of a file, or compare two versions. | |
1599 | |
1600 @table @kbd | |
1601 @item C-x v ~ @var{version} @key{RET} | |
1602 Examine version @var{version} of the visited file, in a buffer of its | |
1603 own. | |
1604 | |
1605 @item C-x v = | |
1606 Compare the current buffer contents with the latest checked-in version | |
1607 of the file. | |
1608 | |
1609 @item C-u C-x v = @var{file} @key{RET} @var{oldvers} @key{RET} @var{newvers} @key{RET} | |
1610 Compare the specified two versions of @var{file}. | |
1611 | |
1612 @item C-x v g | |
58322
9fc5198d2147
(Old Versions): No longer document annotation as "CVS only".
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
58112
diff
changeset
|
1613 Display the file with per-line version information and using colors. |
25829 | 1614 @end table |
1615 | |
1616 @findex vc-version-other-window | |
1617 @kindex C-x v ~ | |
38739 | 1618 To examine an old version in its entirety, visit the file and then type |
25829 | 1619 @kbd{C-x v ~ @var{version} @key{RET}} (@code{vc-version-other-window}). |
1620 This puts the text of version @var{version} in a file named | |
1621 @file{@var{filename}.~@var{version}~}, and visits it in its own buffer | |
1622 in a separate window. (In RCS, you can also select an old version | |
1623 and create a branch from it. @xref{Branches}.) | |
1624 | |
1625 @findex vc-diff | |
1626 @kindex C-x v = | |
36323
7ecef0fc04b0
(Old versions): Fix "But usually is". From Nelson H. F. Beebe
Eli Zaretskii <eliz@gnu.org>
parents:
36322
diff
changeset
|
1627 It is usually more convenient to compare two versions of the file, |
25829 | 1628 with the command @kbd{C-x v =} (@code{vc-diff}). Plain @kbd{C-x v =} |
1629 compares the current buffer contents (saving them in the file if | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1630 necessary) with the last checked-in version of the file. @kbd{C-u C-x |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1631 v =}, with a numeric argument, reads a file name and two version |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1632 numbers, then compares those versions of the specified file. Both |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1633 forms display the output in a special buffer in another window. |
25829 | 1634 |
1635 You can specify a checked-in version by its number; an empty input | |
1636 specifies the current contents of the work file (which may be different | |
1637 from all the checked-in versions). You can also specify a snapshot name | |
1638 (@pxref{Snapshots}) instead of one or both version numbers. | |
1639 | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1640 If you supply a directory name instead of the name of a registered |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1641 file, this command compares the two specified versions of all registered |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1642 files in that directory and its subdirectories. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1643 |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1644 @vindex vc-diff-switches |
38739 | 1645 @vindex vc-rcs-diff-switches |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1646 @kbd{C-x v =} works by running a variant of the @code{diff} utility |
38739 | 1647 designed to work with the version control system in use. When you |
1648 invoke @code{diff} this way, in addition to the options specified by | |
38768
b08b8519c0ab
Fix a stale reference to "Comparing Files".
Eli Zaretskii <eliz@gnu.org>
parents:
38739
diff
changeset
|
1649 @code{diff-switches} (@pxref{Comparing Files}), it receives those |
38739 | 1650 specified by @code{vc-diff-switches}, plus those specified for the |
1651 specific back end by @code{vc-@var{backend}-diff-switches}. For | |
1652 instance, when the version control back end is RCS, @code{diff} uses | |
1653 the options in @code{vc-rcs-diff-switches}. The | |
1654 @samp{vc@dots{}diff-switches} variables are @code{nil} by default. | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1655 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1656 Unlike the @kbd{M-x diff} command, @kbd{C-x v =} does not try to |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1657 locate the changes in the old and new versions. This is because |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1658 normally one or both versions do not exist as files when you compare |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
1659 them; they exist only in the records of the master file. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1660 @xref{Comparing Files}, for more information about @kbd{M-x diff}. |
25829 | 1661 |
1662 @findex vc-annotate | |
1663 @kindex C-x v g | |
58322
9fc5198d2147
(Old Versions): No longer document annotation as "CVS only".
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
58112
diff
changeset
|
1664 For some backends, you can display the file @dfn{annotated} with |
9fc5198d2147
(Old Versions): No longer document annotation as "CVS only".
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
58112
diff
changeset
|
1665 per-line version information and using colors to enhance the visual |
64457
bb4bed090c0a
(Old Versions): Delete duplicate words.
Juri Linkov <juri@jurta.org>
parents:
64154
diff
changeset
|
1666 appearance, with the command @kbd{M-x vc-annotate}. |
58322
9fc5198d2147
(Old Versions): No longer document annotation as "CVS only".
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
58112
diff
changeset
|
1667 It creates a new buffer |
39163
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1668 to display file's text, colored to show how old each part is. Text |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1669 colored red is new, blue means old, and intermediate colors indicate |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1670 intermediate ages. By default, the time scale is 360 days, so that |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1671 everything more than one year old is shown in blue. |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1672 |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1673 When you give a prefix argument to this command, it uses the |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1674 minibuffer to read two arguments: which version number to display and |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1675 annotate (instead of the current file contents), and a stretch factor |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1676 for the time scale. A stretch factor of 0.1 means that the color |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1677 range from red to blue spans the past 36 days instead of 360 days. A |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1678 stretch factor greater than 1 means the color range spans more than a |
8c66ad9acae0
Clarify description of vc-annotate.
Richard M. Stallman <rms@gnu.org>
parents:
38922
diff
changeset
|
1679 year. |
25829 | 1680 |
53633
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1681 From the annotate buffer, you can use the following keys to browse the |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1682 annotations of past revisions, view diffs, or view log entries: |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1683 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1684 @itemize @bullet |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1685 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1686 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1687 Pressing @kbd{P} annotates the previous revision. It also takes a |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1688 numeric prefix argument, so for example @kbd{C-u 10 P} would take you |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1689 back 10 revisions. |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1690 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1691 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1692 Pressing @kbd{N} annotates the next revision. It also takes a numeric |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1693 prefix argument, so for example @kbd{C-u 10 N} would take you forward |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1694 10 revisions. |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1695 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1696 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1697 Pressing @kbd{J} annotates the revision at line (as denoted by the |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1698 version number on the same line). |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1699 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1700 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1701 Pressing @kbd{A} annotates the revision previous to line (as denoted |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1702 by the version number on the same line). This is useful to see the |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1703 state the file was in before the change on the current line was made. |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1704 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1705 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1706 Pressing @kbd{D} shows the diff of the revision at line with its |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1707 previous revision. This is useful to see what actually changed when |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1708 the revision denoted on the current line was committed. |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1709 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1710 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1711 Pressing @kbd{L} shows the log of the revision at line. This is |
56732
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
1712 useful to see the author's description of the changes that occurred |
53633
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1713 when the revision denoted on the current line was committed. |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1714 |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1715 @item |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1716 Pressing @kbd{W} annotates the workfile (most up to date) version. If |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1717 you used @kbd{P} and @kbd{N} to browse to other revisions, use this |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1718 key to return to the latest version. |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1719 @end itemize |
e332688255cd
Describe new key bindings in VC Annotate mode.
André Spiegel <spiegel@gnu.org>
parents:
53244
diff
changeset
|
1720 |
25829 | 1721 @node Secondary VC Commands |
1722 @subsection The Secondary Commands of VC | |
1723 | |
1724 This section explains the secondary commands of VC; those that you might | |
1725 use once a day. | |
1726 | |
1727 @menu | |
1728 * Registering:: Putting a file under version control. | |
1729 * VC Status:: Viewing the VC status of files. | |
56732
1252abee4a21
(Backup Deletion): Correct description of `delete-old-versions'.
Luc Teirlinck <teirllm@auburn.edu>
parents:
55997
diff
changeset
|
1730 * VC Undo:: Canceling changes before or after check-in. |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1731 * VC Dired Mode:: Listing files managed by version control. |
25829 | 1732 * VC Dired Commands:: Commands to use in a VC Dired buffer. |
1733 @end menu | |
1734 | |
1735 @node Registering | |
1736 @subsubsection Registering a File for Version Control | |
1737 | |
1738 @kindex C-x v i | |
1739 @findex vc-register | |
1740 You can put any file under version control by simply visiting it, and | |
1741 then typing @w{@kbd{C-x v i}} (@code{vc-register}). | |
1742 | |
1743 @table @kbd | |
1744 @item C-x v i | |
1745 Register the visited file for version control. | |
1746 @end table | |
1747 | |
1748 To register the file, Emacs must choose which version control system | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1749 to use for it. If the file's directory already contains files |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1750 registered in a version control system, Emacs uses that system. If |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1751 there is more than one system in use for a directory, Emacs uses the one |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
1752 that appears first in @code{vc-handled-backends} (@pxref{Customizing VC}). |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
1753 On the other hand, if there are no files already registered, |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
1754 Emacs uses the first system from @code{vc-handled-backends} that could |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1755 register the file (for example, you cannot register a file under CVS if |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1756 its directory is not already part of a CVS tree); with the default |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1757 value of @code{vc-handled-backends}, this means that Emacs uses RCS in |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1758 this situation. |
25829 | 1759 |
1760 If locking is in use, @kbd{C-x v i} leaves the file unlocked and | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1761 read-only. Type @kbd{C-x v v} if you wish to start editing it. After |
25829 | 1762 registering a file with CVS, you must subsequently commit the initial |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
1763 version by typing @kbd{C-x v v}. |
25829 | 1764 |
1765 @vindex vc-default-init-version | |
44588 | 1766 @cindex initial version number to register |
25829 | 1767 The initial version number for a newly registered file is 1.1, by |
1768 default. You can specify a different default by setting the variable | |
1769 @code{vc-default-init-version}, or you can give @kbd{C-x v i} a numeric | |
1770 argument; then it reads the initial version number for this particular | |
1771 file using the minibuffer. | |
1772 | |
1773 @vindex vc-initial-comment | |
1774 If @code{vc-initial-comment} is non-@code{nil}, @kbd{C-x v i} reads an | |
1775 initial comment to describe the purpose of this source file. Reading | |
1776 the initial comment works like reading a log entry (@pxref{Log Buffer}). | |
1777 | |
1778 @node VC Status | |
1779 @subsubsection VC Status Commands | |
1780 | |
1781 @table @kbd | |
1782 @item C-x v l | |
1783 Display version control state and change history. | |
1784 @end table | |
1785 | |
1786 @kindex C-x v l | |
1787 @findex vc-print-log | |
1788 To view the detailed version control status and history of a file, | |
1789 type @kbd{C-x v l} (@code{vc-print-log}). It displays the history of | |
1790 changes to the current file, including the text of the log entries. The | |
1791 output appears in a separate window. | |
1792 | |
1793 @node VC Undo | |
1794 @subsubsection Undoing Version Control Actions | |
1795 | |
1796 @table @kbd | |
1797 @item C-x v u | |
1798 Revert the buffer and the file to the last checked-in version. | |
1799 | |
1800 @item C-x v c | |
1801 Remove the last-entered change from the master for the visited file. | |
1802 This undoes your last check-in. | |
1803 @end table | |
1804 | |
1805 @kindex C-x v u | |
1806 @findex vc-revert-buffer | |
1807 If you want to discard your current set of changes and revert to the | |
1808 last version checked in, use @kbd{C-x v u} (@code{vc-revert-buffer}). | |
1809 This leaves the file unlocked; if locking is in use, you must first lock | |
1810 the file again before you change it again. @kbd{C-x v u} requires | |
1811 confirmation, unless it sees that you haven't made any changes since the | |
1812 last checked-in version. | |
1813 | |
1814 @kbd{C-x v u} is also the command to unlock a file if you lock it and | |
1815 then decide not to change it. | |
1816 | |
1817 @kindex C-x v c | |
1818 @findex vc-cancel-version | |
1819 To cancel a change that you already checked in, use @kbd{C-x v c} | |
1820 (@code{vc-cancel-version}). This command discards all record of the | |
1821 most recent checked-in version. @kbd{C-x v c} also offers to revert | |
1822 your work file and buffer to the previous version (the one that precedes | |
1823 the version that is deleted). | |
1824 | |
1825 If you answer @kbd{no}, VC keeps your changes in the buffer, and locks | |
1826 the file. The no-revert option is useful when you have checked in a | |
1827 change and then discover a trivial error in it; you can cancel the | |
1828 erroneous check-in, fix the error, and check the file in again. | |
1829 | |
1830 When @kbd{C-x v c} does not revert the buffer, it unexpands all | |
1831 version control headers in the buffer instead (@pxref{Version Headers}). | |
1832 This is because the buffer no longer corresponds to any existing | |
1833 version. If you check it in again, the check-in process will expand the | |
1834 headers properly for the new version number. | |
1835 | |
1836 However, it is impossible to unexpand the RCS @samp{@w{$}Log$} header | |
1837 automatically. If you use that header feature, you have to unexpand it | |
1838 by hand---by deleting the entry for the version that you just canceled. | |
1839 | |
1840 Be careful when invoking @kbd{C-x v c}, as it is easy to lose a lot of | |
1841 work with it. To help you be careful, this command always requires | |
1842 confirmation with @kbd{yes}. Note also that this command is disabled | |
1843 under CVS, because canceling versions is very dangerous and discouraged | |
1844 with CVS. | |
1845 | |
1846 @node VC Dired Mode | |
1847 @subsubsection Dired under VC | |
1848 | |
31076 | 1849 @cindex PCL-CVS |
1850 @pindex cvs | |
1851 @cindex CVS Dired Mode | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1852 The VC Dired Mode described here works with all the version control |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1853 systems that VC supports. Another more powerful facility, designed |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1854 specifically for CVS, is called PCL-CVS. @xref{Top, , About PCL-CVS, |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
1855 pcl-cvs, PCL-CVS --- The Emacs Front-End to CVS}. |
31076 | 1856 |
25829 | 1857 @kindex C-x v d |
1858 @findex vc-directory | |
1859 When you are working on a large program, it is often useful to find | |
1860 out which files have changed within an entire directory tree, or to view | |
1861 the status of all files under version control at once, and to perform | |
1862 version control operations on collections of files. You can use the | |
1863 command @kbd{C-x v d} (@code{vc-directory}) to make a directory listing | |
1864 that includes only files relevant for version control. | |
1865 | |
1866 @vindex vc-dired-terse-display | |
1867 @kbd{C-x v d} creates a buffer which uses VC Dired Mode. This looks | |
1868 much like an ordinary Dired buffer (@pxref{Dired}); however, normally it | |
1869 shows only the noteworthy files (those locked or not up-to-date). This | |
1870 is called @dfn{terse display}. If you set the variable | |
1871 @code{vc-dired-terse-display} to @code{nil}, then VC Dired shows all | |
1872 relevant files---those managed under version control, plus all | |
1873 subdirectories (@dfn{full display}). The command @kbd{v t} in a VC | |
1874 Dired buffer toggles between terse display and full display (@pxref{VC | |
1875 Dired Commands}). | |
1876 | |
1877 @vindex vc-dired-recurse | |
1878 By default, VC Dired produces a recursive listing of noteworthy or | |
1879 relevant files at or below the given directory. You can change this by | |
1880 setting the variable @code{vc-dired-recurse} to @code{nil}; then VC | |
1881 Dired shows only the files in the given directory. | |
1882 | |
1883 The line for an individual file shows the version control state in the | |
1884 place of the hard link count, owner, group, and size of the file. If | |
1885 the file is unmodified, in sync with the master file, the version | |
1886 control state shown is blank. Otherwise it consists of text in | |
1887 parentheses. Under RCS and SCCS, the name of the user locking the file | |
1888 is shown; under CVS, an abbreviated version of the @samp{cvs status} | |
1889 output is used. Here is an example using RCS: | |
1890 | |
1891 @smallexample | |
1892 @group | |
1893 /home/jim/project: | |
1894 | |
1895 -rw-r--r-- (jim) Apr 2 23:39 file1 | |
1896 -r--r--r-- Apr 5 20:21 file2 | |
1897 @end group | |
1898 @end smallexample | |
1899 | |
1900 @noindent | |
1901 The files @samp{file1} and @samp{file2} are under version control, | |
1902 @samp{file1} is locked by user jim, and @samp{file2} is unlocked. | |
1903 | |
1904 Here is an example using CVS: | |
1905 | |
1906 @smallexample | |
1907 @group | |
1908 /home/joe/develop: | |
1909 | |
1910 -rw-r--r-- (modified) Aug 2 1997 file1.c | |
1911 -rw-r--r-- Apr 4 20:09 file2.c | |
1912 -rw-r--r-- (merge) Sep 13 1996 file3.c | |
1913 @end group | |
1914 @end smallexample | |
1915 | |
1916 Here @samp{file1.c} is modified with respect to the repository, and | |
1917 @samp{file2.c} is not. @samp{file3.c} is modified, but other changes | |
1918 have also been checked in to the repository---you need to merge them | |
1919 with the work file before you can check it in. | |
1920 | |
1921 @vindex vc-directory-exclusion-list | |
1922 When VC Dired displays subdirectories (in the ``full'' display mode), | |
1923 it omits some that should never contain any files under version control. | |
1924 By default, this includes Version Control subdirectories such as | |
1925 @samp{RCS} and @samp{CVS}; you can customize this by setting the | |
1926 variable @code{vc-directory-exclusion-list}. | |
1927 | |
1928 You can fine-tune VC Dired's format by typing @kbd{C-u C-x v d}---as in | |
1929 ordinary Dired, that allows you to specify additional switches for the | |
1930 @samp{ls} command. | |
1931 | |
1932 @node VC Dired Commands | |
1933 @subsubsection VC Dired Commands | |
1934 | |
1935 All the usual Dired commands work normally in VC Dired mode, except | |
1936 for @kbd{v}, which is redefined as the version control prefix. You can | |
1937 invoke VC commands such as @code{vc-diff} and @code{vc-print-log} by | |
1938 typing @kbd{v =}, or @kbd{v l}, and so on. Most of these commands apply | |
1939 to the file name on the current line. | |
1940 | |
1941 The command @kbd{v v} (@code{vc-next-action}) operates on all the | |
1942 marked files, so that you can lock or check in several files at once. | |
1943 If it operates on more than one file, it handles each file according to | |
1944 its current state; thus, it might lock one file, but check in another | |
1945 file. This could be confusing; it is up to you to avoid confusing | |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1946 behavior by marking a set of files that are in a similar state. If no |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1947 files are marked, @kbd{v v} operates on the file in the current line. |
25829 | 1948 |
1949 If any files call for check-in, @kbd{v v} reads a single log entry, | |
1950 then uses it for all the files being checked in. This is convenient for | |
1951 registering or checking in several files at once, as part of the same | |
1952 change. | |
1953 | |
1954 @findex vc-dired-toggle-terse-mode | |
1955 @findex vc-dired-mark-locked | |
1956 You can toggle between terse display (only locked files, or files not | |
1957 up-to-date) and full display at any time by typing @kbd{v t} | |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
1958 (@code{vc-dired-toggle-terse-mode}). There is also a special command |
25829 | 1959 @kbd{* l} (@code{vc-dired-mark-locked}), which marks all files currently |
1960 locked (or, with CVS, all files not up-to-date). Thus, typing @kbd{* l | |
1961 t k} is another way to delete from the buffer all files except those | |
1962 currently locked. | |
1963 | |
1964 @node Branches | |
1965 @subsection Multiple Branches of a File | |
1966 @cindex branch (version control) | |
1967 @cindex trunk (version control) | |
1968 | |
1969 One use of version control is to maintain multiple ``current'' | |
1970 versions of a file. For example, you might have different versions of a | |
1971 program in which you are gradually adding various unfinished new | |
1972 features. Each such independent line of development is called a | |
1973 @dfn{branch}. VC allows you to create branches, switch between | |
1974 different branches, and merge changes from one branch to another. | |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
1975 Please note, however, that branches are not supported for SCCS. |
25829 | 1976 |
1977 A file's main line of development is usually called the @dfn{trunk}. | |
1978 The versions on the trunk are normally numbered 1.1, 1.2, 1.3, etc. At | |
1979 any such version, you can start an independent branch. A branch | |
1980 starting at version 1.2 would have version number 1.2.1.1, and consecutive | |
1981 versions on this branch would have numbers 1.2.1.2, 1.2.1.3, 1.2.1.4, | |
1982 and so on. If there is a second branch also starting at version 1.2, it | |
1983 would consist of versions 1.2.2.1, 1.2.2.2, 1.2.2.3, etc. | |
1984 | |
1985 @cindex head version | |
1986 If you omit the final component of a version number, that is called a | |
1987 @dfn{branch number}. It refers to the highest existing version on that | |
1988 branch---the @dfn{head version} of that branch. The branches in the | |
1989 example above have branch numbers 1.2.1 and 1.2.2. | |
1990 | |
1991 @menu | |
1992 * Switching Branches:: How to get to another existing branch. | |
1993 * Creating Branches:: How to start a new branch. | |
1994 * Merging:: Transferring changes between branches. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
1995 * Multi-User Branching:: Multiple users working at multiple branches |
25829 | 1996 in parallel. |
1997 @end menu | |
1998 | |
1999 @node Switching Branches | |
2000 @subsubsection Switching between Branches | |
2001 | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2002 To switch between branches, type @kbd{C-u C-x v v} and specify the |
25829 | 2003 version number you want to select. This version is then visited |
2004 @emph{unlocked} (write-protected), so you can examine it before locking | |
2005 it. Switching branches in this way is allowed only when the file is not | |
2006 locked. | |
2007 | |
2008 You can omit the minor version number, thus giving only the branch | |
2009 number; this takes you to the head version on the chosen branch. If you | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2010 only type @key{RET}, Emacs goes to the highest version on the trunk. |
25829 | 2011 |
2012 After you have switched to any branch (including the main branch), you | |
2013 stay on it for subsequent VC commands, until you explicitly select some | |
2014 other branch. | |
2015 | |
2016 @node Creating Branches | |
2017 @subsubsection Creating New Branches | |
2018 | |
2019 To create a new branch from a head version (one that is the latest in | |
2020 the branch that contains it), first select that version if necessary, | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2021 lock it with @kbd{C-x v v}, and make whatever changes you want. Then, |
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2022 when you check in the changes, use @kbd{C-u C-x v v}. This lets you |
25829 | 2023 specify the version number for the new version. You should specify a |
2024 suitable branch number for a branch starting at the current version. | |
2025 For example, if the current version is 2.5, the branch number should be | |
2026 2.5.1, 2.5.2, and so on, depending on the number of existing branches at | |
2027 that point. | |
2028 | |
2029 To create a new branch at an older version (one that is no longer the | |
2030 head of a branch), first select that version (@pxref{Switching | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2031 Branches}), then lock it with @kbd{C-x v v}. You'll be asked to |
25829 | 2032 confirm, when you lock the old version, that you really mean to create a |
2033 new branch---if you say no, you'll be offered a chance to lock the | |
2034 latest version instead. | |
2035 | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2036 Then make your changes and type @kbd{C-x v v} again to check in a new |
25829 | 2037 version. This automatically creates a new branch starting from the |
2038 selected version. You need not specially request a new branch, because | |
2039 that's the only way to add a new version at a point that is not the head | |
2040 of a branch. | |
2041 | |
2042 After the branch is created, you ``stay'' on it. That means that | |
2043 subsequent check-ins create new versions on that branch. To leave the | |
2044 branch, you must explicitly select a different version with @kbd{C-u C-x | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2045 v v}. To transfer changes from one branch to another, use the merge |
25829 | 2046 command, described in the next section. |
2047 | |
2048 @node Merging | |
2049 @subsubsection Merging Branches | |
2050 | |
2051 @cindex merging changes | |
2052 When you have finished the changes on a certain branch, you will | |
2053 often want to incorporate them into the file's main line of development | |
2054 (the trunk). This is not a trivial operation, because development might | |
2055 also have proceeded on the trunk, so that you must @dfn{merge} the | |
2056 changes into a file that has already been changed otherwise. VC allows | |
2057 you to do this (and other things) with the @code{vc-merge} command. | |
2058 | |
2059 @table @kbd | |
2060 @item C-x v m (vc-merge) | |
2061 Merge changes into the work file. | |
2062 @end table | |
2063 | |
2064 @kindex C-x v m | |
2065 @findex vc-merge | |
2066 @kbd{C-x v m} (@code{vc-merge}) takes a set of changes and merges it | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2067 into the current version of the work file. It firsts asks you in the |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2068 minibuffer where the changes should come from. If you just type |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2069 @key{RET}, Emacs merges any changes that were made on the same branch |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2070 since you checked the file out (we call this @dfn{merging the news}). |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2071 This is the common way to pick up recent changes from the repository, |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2072 regardless of whether you have already changed the file yourself. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2073 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2074 You can also enter a branch number or a pair of version numbers in |
38739 | 2075 the minibuffer. Then @kbd{C-x v m} finds the changes from that |
2076 branch, or the differences between the two versions you specified, and | |
2077 merges them into the current version of the current file. | |
25829 | 2078 |
2079 As an example, suppose that you have finished a certain feature on | |
2080 branch 1.3.1. In the meantime, development on the trunk has proceeded | |
2081 to version 1.5. To merge the changes from the branch to the trunk, | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2082 first go to the head version of the trunk, by typing @kbd{C-u C-x v v |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2083 @key{RET}}. Version 1.5 is now current. If locking is used for the file, |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2084 type @kbd{C-x v v} to lock version 1.5 so that you can change it. Next, |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2085 type @kbd{C-x v m 1.3.1 @key{RET}}. This takes the entire set of changes on |
25829 | 2086 branch 1.3.1 (relative to version 1.3, where the branch started, up to |
2087 the last version on the branch) and merges it into the current version | |
2088 of the work file. You can now check in the changed file, thus creating | |
2089 version 1.6 containing the changes from the branch. | |
2090 | |
2091 It is possible to do further editing after merging the branch, before | |
2092 the next check-in. But it is usually wiser to check in the merged | |
2093 version, then lock it and make the further changes. This will keep | |
2094 a better record of the history of changes. | |
2095 | |
2096 @cindex conflicts | |
2097 @cindex resolving conflicts | |
2098 When you merge changes into a file that has itself been modified, the | |
2099 changes might overlap. We call this situation a @dfn{conflict}, and | |
2100 reconciling the conflicting changes is called @dfn{resolving a | |
2101 conflict}. | |
2102 | |
2103 Whenever conflicts occur during merging, VC detects them, tells you | |
2104 about them in the echo area, and asks whether you want help in merging. | |
2105 If you say yes, it starts an Ediff session (@pxref{Top, | |
2106 Ediff, Ediff, ediff, The Ediff Manual}). | |
2107 | |
2108 If you say no, the conflicting changes are both inserted into the | |
2109 file, surrounded by @dfn{conflict markers}. The example below shows how | |
2110 a conflict region looks; the file is called @samp{name} and the current | |
2111 master file version with user B's changes in it is 1.11. | |
2112 | |
2113 @c @w here is so CVS won't think this is a conflict. | |
2114 @smallexample | |
2115 @group | |
2116 @w{<}<<<<<< name | |
2117 @var{User A's version} | |
2118 ======= | |
2119 @var{User B's version} | |
2120 @w{>}>>>>>> 1.11 | |
2121 @end group | |
2122 @end smallexample | |
2123 | |
2124 @cindex vc-resolve-conflicts | |
2125 Then you can resolve the conflicts by editing the file manually. Or | |
2126 you can type @code{M-x vc-resolve-conflicts} after visiting the file. | |
38739 | 2127 This starts an Ediff session, as described above. Don't forget to |
2128 check in the merged version afterwards. | |
25829 | 2129 |
2130 @node Multi-User Branching | |
2131 @subsubsection Multi-User Branching | |
2132 | |
2133 It is often useful for multiple developers to work simultaneously on | |
2134 different branches of a file. CVS allows this by default; for RCS, it | |
2135 is possible if you create multiple source directories. Each source | |
2136 directory should have a link named @file{RCS} which points to a common | |
2137 directory of RCS master files. Then each source directory can have its | |
2138 own choice of selected versions, but all share the same common RCS | |
2139 records. | |
2140 | |
2141 This technique works reliably and automatically, provided that the | |
2142 source files contain RCS version headers (@pxref{Version Headers}). The | |
2143 headers enable Emacs to be sure, at all times, which version number is | |
2144 present in the work file. | |
2145 | |
2146 If the files do not have version headers, you must instead tell Emacs | |
2147 explicitly in each session which branch you are working on. To do this, | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2148 first find the file, then type @kbd{C-u C-x v v} and specify the correct |
25829 | 2149 branch number. This ensures that Emacs knows which branch it is using |
2150 during this particular editing session. | |
2151 | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2152 @node Remote Repositories |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2153 @subsection Remote Repositories |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2154 @cindex remote repositories (CVS) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2155 |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2156 A common way of using CVS is to set up a central CVS repository on |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2157 some Internet host, then have each developer check out a personal |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2158 working copy of the files on his local machine. Committing changes to |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2159 the repository, and picking up changes from other users into one's own |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2160 working area, then works by direct interactions with the CVS server. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2161 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2162 One difficulty is that access to the CVS server is often slow, and |
39263 | 2163 that developers might need to work off-line as well. VC is designed |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2164 to reduce the amount of network interaction necessary. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2165 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2166 @menu |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2167 * Version Backups:: Keeping local copies of repository versions. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2168 * Local Version Control:: Using another version system for local editing. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2169 @end menu |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2170 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2171 @node Version Backups |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2172 @subsubsection Version Backups |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2173 @cindex version backups |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2174 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2175 @cindex automatic version backups |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2176 When VC sees that the CVS repository for a file is on a remote |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2177 machine, it automatically makes local backups of unmodified versions |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2178 of the file---@dfn{automatic version backups}. This means that you |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2179 can compare the file to the repository version (@kbd{C-x v =}), or |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2180 revert to that version (@kbd{C-x v u}), without any network |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2181 interactions. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2182 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2183 The local copy of the unmodified file is called a @dfn{version |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2184 backup} to indicate that it corresponds exactly to a version that is |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2185 stored in the repository. Note that version backups are not the same |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2186 as ordinary Emacs backup files (@pxref{Backup}). But they follow a |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2187 similar naming convention. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2188 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2189 For a file that comes from a remote CVS repository, VC makes a |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2190 version backup whenever you save the first changes to the file, and |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2191 removes it after you have committed your modified version to the |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2192 repository. You can disable the making of automatic version backups by |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2193 setting @code{vc-cvs-stay-local} to @code{nil} (@pxref{CVS Options}). |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2194 |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2195 @cindex manual version backups |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2196 The name of the automatic version backup for version @var{version} |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2197 of file @var{file} is @code{@var{file}.~@var{version}.~}. This is |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2198 almost the same as the name used by @kbd{C-x v ~} (@pxref{Old |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2199 Versions}), the only difference being the additional dot (@samp{.}) |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2200 after the version number. This similarity is intentional, because |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2201 both kinds of files store the same kind of information. The file made |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2202 by @kbd{C-x v ~} acts as a @dfn{manual version backup}. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2203 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2204 All the VC commands that operate on old versions of a file can use |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2205 both kinds of version backups. For instance, @kbd{C-x v ~} uses |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2206 either an automatic or a manual version backup, if possible, to get |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2207 the contents of the version you request. Likewise, @kbd{C-x v =} and |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2208 @kbd{C-x v u} use either an automatic or a manual version backup, if |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2209 one of them exists, to get the contents of a version to compare or |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2210 revert to. If you changed a file outside of Emacs, so that no |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2211 automatic version backup was created for the previous text, you can |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2212 create a manual backup of that version using @kbd{C-x v ~}, and thus |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2213 obtain the benefit of the local copy for Emacs commands. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2214 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2215 The only difference in Emacs's handling of manual and automatic |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2216 version backups, once they exist, is that Emacs deletes automatic |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2217 version backups when you commit to the repository. By contrast, |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2218 manual version backups remain until you delete them. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2219 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2220 @node Local Version Control |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2221 @subsubsection Local Version Control |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2222 @cindex local version control |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2223 @cindex local back end (version control) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2224 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2225 When you make many changes to a file that comes from a remote |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2226 repository, it can be convenient to have version control on your local |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2227 machine as well. You can then record intermediate versions, revert to |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2228 a previous state, etc., before you actually commit your changes to the |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2229 remote server. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2230 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2231 VC lets you do this by putting a file under a second, local version |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2232 control system, so that the file is effectively registered in two |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2233 systems at the same time. For the description here, we will assume |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2234 that the remote system is CVS, and you use RCS locally, although the |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2235 mechanism works with any combination of version control systems |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2236 (@dfn{back ends}). |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2237 |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2238 To make it work with other back ends, you must make sure that the |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2239 ``more local'' back end comes before the ``more remote'' back end in |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2240 the setting of @code{vc-handled-backends} (@pxref{Customizing VC}). By |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2241 default, this variable is set up so that you can use remote CVS and |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2242 local RCS as described here. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2243 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2244 To start using local RCS for a file that comes from a remote CVS |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2245 server, you must @emph{register the file in RCS}, by typing @kbd{C-u |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2246 C-x v v rcs @key{RET}}. (In other words, use @code{vc-next-action} with a |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2247 prefix argument, and specify RCS as the back end.) |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2248 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2249 You can do this at any time; it does not matter whether you have |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2250 already modified the file with respect to the version in the CVS |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2251 repository. If possible, VC tries to make the RCS master start with |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
2252 the unmodified repository version, then checks in any local changes |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2253 as a new version. This works if you have not made any changes yet, or |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2254 if the unmodified repository version exists locally as a version |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2255 backup (@pxref{Version Backups}). If the unmodified version is not |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2256 available locally, the RCS master starts with the modified version; |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
2257 the only drawback to this is that you cannot compare your changes |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2258 locally to what is stored in the repository. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2259 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2260 The version number of the RCS master is derived from the current CVS |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2261 version, starting a branch from it. For example, if the current CVS |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2262 version is 1.23, the local RCS branch will be 1.23.1. Version 1.23 in |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2263 the RCS master will be identical to version 1.23 under CVS; your first |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2264 changes are checked in as 1.23.1.1. (If the unmodified file is not |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2265 available locally, VC will check in the modified file twice, both as |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2266 1.23 and 1.23.1.1, to make the revision numbers consistent.) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2267 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2268 If you do not use locking under CVS (the default), locking is also |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2269 disabled for RCS, so that editing under RCS works exactly as under |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2270 CVS. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2271 |
36728
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2272 When you are done with local editing, you can commit the final version |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2273 back to the CVS repository by typing @kbd{C-u C-x v v cvs @key{RET}}. |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2274 This initializes the log entry buffer (@pxref{Log Buffer}) to contain |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2275 all the log entries you have recorded in the RCS master; you can edit |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2276 them as you wish, and then commit in CVS by typing @kbd{C-c C-c}. If |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2277 the commit is successful, VC removes the RCS master, so that the file |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2278 is once again registered under CVS only. (The RCS master is not |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2279 actually deleted, just renamed by appending @samp{~} to the name, so |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2280 that you can refer to it later if you wish.) |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2281 |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2282 While using local RCS, you can pick up recent changes from the CVS |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2283 repository into your local file, or commit some of your changes back |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2284 to CVS, without terminating local RCS version control. To do this, |
39263 | 2285 switch to the CVS back end temporarily, with the @kbd{C-x v b} command: |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2286 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2287 @table @kbd |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2288 @item C-x v b |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2289 Switch to another back end that the current file is registered |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2290 under (@code{vc-switch-backend}). |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2291 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2292 @item C-u C-x v b @var{backend} @key{RET} |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2293 Switch to @var{backend} for the current file. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2294 @end table |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2295 |
36360
0774daebf700
(Local Version Control): Fix last change.
Eli Zaretskii <eliz@gnu.org>
parents:
36356
diff
changeset
|
2296 @kindex C-x v b |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2297 @findex vc-switch-backend |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2298 @kbd{C-x v b} does not change the buffer contents, or any files; it |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2299 only changes VC's perspective on how to handle the file. Any |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2300 subsequent VC commands for that file will operate on the back end that |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2301 is currently selected. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2302 |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2303 If the current file is registered in more than one back end, typing |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2304 @kbd{C-x v b} ``cycles'' through all of these back ends. With a |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2305 prefix argument, it asks for the back end to use in the minibuffer. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2306 |
36728
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2307 Thus, if you are using local RCS, and you want to pick up some recent |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2308 changes in the file from remote CVS, first visit the file, then type |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2309 @kbd{C-x v b} to switch to CVS, and finally use @kbd{C-x v m |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2310 @key{RET}} to merge the news (@pxref{Merging}). You can then switch |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2311 back to RCS by typing @kbd{C-x v b} again, and continue to edit |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2312 locally. |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2313 |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2314 But if you do this, the revision numbers in the RCS master no longer |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2315 correspond to those of CVS. Technically, this is not a problem, but |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2316 it can become difficult to keep track of what is in the CVS repository |
4906c8088ad5
Clarify C-u C-x v v cvs RET. Clarify the purpose of C-x v b.
Richard M. Stallman <rms@gnu.org>
parents:
36547
diff
changeset
|
2317 and what is not. So we suggest that you return from time to time to |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2318 CVS-only operation, by committing your local changes back to the |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2319 repository using @kbd{C-u C-x v v cvs @key{RET}}. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2320 |
25829 | 2321 @node Snapshots |
2322 @subsection Snapshots | |
2323 @cindex snapshots and version control | |
2324 | |
2325 A @dfn{snapshot} is a named set of file versions (one for each | |
2326 registered file) that you can treat as a unit. One important kind of | |
2327 snapshot is a @dfn{release}, a (theoretically) stable version of the | |
2328 system that is ready for distribution to users. | |
2329 | |
2330 @menu | |
2331 * Making Snapshots:: The snapshot facilities. | |
2332 * Snapshot Caveats:: Things to be careful of when using snapshots. | |
2333 @end menu | |
2334 | |
2335 @node Making Snapshots | |
2336 @subsubsection Making and Using Snapshots | |
2337 | |
2338 There are two basic commands for snapshots; one makes a | |
2339 snapshot with a given name, the other retrieves a named snapshot. | |
2340 | |
2341 @table @code | |
2342 @kindex C-x v s | |
2343 @findex vc-create-snapshot | |
2344 @item C-x v s @var{name} @key{RET} | |
2345 Define the last saved versions of every registered file in or under the | |
2346 current directory as a snapshot named @var{name} | |
2347 (@code{vc-create-snapshot}). | |
2348 | |
2349 @kindex C-x v r | |
2350 @findex vc-retrieve-snapshot | |
2351 @item C-x v r @var{name} @key{RET} | |
2352 For all registered files at or below the current directory level, select | |
2353 whatever versions correspond to the snapshot @var{name} | |
2354 (@code{vc-retrieve-snapshot}). | |
2355 | |
2356 This command reports an error if any files are locked at or below the | |
2357 current directory, without changing anything; this is to avoid | |
2358 overwriting work in progress. | |
2359 @end table | |
2360 | |
2361 A snapshot uses a very small amount of resources---just enough to record | |
2362 the list of file names and which version belongs to the snapshot. Thus, | |
2363 you need not hesitate to create snapshots whenever they are useful. | |
2364 | |
2365 You can give a snapshot name as an argument to @kbd{C-x v =} or | |
2366 @kbd{C-x v ~} (@pxref{Old Versions}). Thus, you can use it to compare a | |
2367 snapshot against the current files, or two snapshots against each other, | |
2368 or a snapshot against a named version. | |
2369 | |
2370 @node Snapshot Caveats | |
2371 @subsubsection Snapshot Caveats | |
2372 | |
2373 @cindex named configurations (RCS) | |
2374 VC's snapshot facilities are modeled on RCS's named-configuration | |
2375 support. They use RCS's native facilities for this, so under VC | |
2376 snapshots made using RCS are visible even when you bypass VC. | |
2377 | |
2378 @c worded verbosely to avoid overfull hbox. | |
2379 For SCCS, VC implements snapshots itself. The files it uses contain | |
2380 name/file/version-number triples. These snapshots are visible only | |
2381 through VC. | |
2382 | |
2383 A snapshot is a set of checked-in versions. So make sure that all the | |
2384 files are checked in and not locked when you make a snapshot. | |
2385 | |
2386 File renaming and deletion can create some difficulties with snapshots. | |
2387 This is not a VC-specific problem, but a general design issue in version | |
2388 control systems that no one has solved very well yet. | |
2389 | |
2390 If you rename a registered file, you need to rename its master along | |
2391 with it (the command @code{vc-rename-file} does this automatically). If | |
2392 you are using SCCS, you must also update the records of the snapshot, to | |
2393 mention the file by its new name (@code{vc-rename-file} does this, | |
2394 too). An old snapshot that refers to a master file that no longer | |
2395 exists under the recorded name is invalid; VC can no longer retrieve | |
2396 it. It would be beyond the scope of this manual to explain enough about | |
2397 RCS and SCCS to explain how to update the snapshots by hand. | |
2398 | |
2399 Using @code{vc-rename-file} makes the snapshot remain valid for | |
2400 retrieval, but it does not solve all problems. For example, some of the | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
2401 files in your program probably refer to others by name. At the very |
25829 | 2402 least, the makefile probably mentions the file that you renamed. If you |
2403 retrieve an old snapshot, the renamed file is retrieved under its new | |
2404 name, which is not the name that the makefile expects. So the program | |
2405 won't really work as retrieved. | |
2406 | |
2407 @node Miscellaneous VC | |
2408 @subsection Miscellaneous Commands and Features of VC | |
2409 | |
2410 This section explains the less-frequently-used features of VC. | |
2411 | |
2412 @menu | |
2413 * Change Logs and VC:: Generating a change log file from log entries. | |
49600
23a1cea22d13
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49561
diff
changeset
|
2414 * Renaming and VC:: A command to rename both the source and master |
25829 | 2415 file correctly. |
2416 * Version Headers:: Inserting version control headers into working files. | |
2417 @end menu | |
2418 | |
2419 @node Change Logs and VC | |
2420 @subsubsection Change Logs and VC | |
2421 | |
2422 If you use RCS or CVS for a program and also maintain a change log | |
2423 file for it (@pxref{Change Log}), you can generate change log entries | |
2424 automatically from the version control log entries: | |
2425 | |
2426 @table @kbd | |
2427 @item C-x v a | |
2428 @kindex C-x v a | |
2429 @findex vc-update-change-log | |
2430 Visit the current directory's change log file and, for registered files | |
2431 in that directory, create new entries for versions checked in since the | |
2432 most recent entry in the change log file. | |
2433 (@code{vc-update-change-log}). | |
2434 | |
2435 This command works with RCS or CVS only, not with SCCS. | |
2436 | |
2437 @item C-u C-x v a | |
2438 As above, but only find entries for the current buffer's file. | |
2439 | |
2440 @item M-1 C-x v a | |
2441 As above, but find entries for all the currently visited files that are | |
2442 maintained with version control. This works only with RCS, and it puts | |
2443 all entries in the log for the default directory, which may not be | |
2444 appropriate. | |
2445 @end table | |
2446 | |
2447 For example, suppose the first line of @file{ChangeLog} is dated | |
2448 1999-04-10, and that the only check-in since then was by Nathaniel | |
2449 Bowditch to @file{rcs2log} on 1999-05-22 with log text @samp{Ignore log | |
2450 messages that start with `#'.}. Then @kbd{C-x v a} visits | |
2451 @file{ChangeLog} and inserts text like this: | |
2452 | |
2453 @iftex | |
2454 @medbreak | |
2455 @end iftex | |
2456 @smallexample | |
2457 @group | |
2458 1999-05-22 Nathaniel Bowditch <nat@@apn.org> | |
2459 | |
2460 * rcs2log: Ignore log messages that start with `#'. | |
2461 @end group | |
2462 @end smallexample | |
2463 @iftex | |
2464 @medbreak | |
2465 @end iftex | |
2466 | |
2467 @noindent | |
2468 You can then edit the new change log entry further as you wish. | |
2469 | |
38064
b8ea59337400
Proofreading fixes from Art the Lemming <lemming@gimp.shacknet.nu>.
Eli Zaretskii <eliz@gnu.org>
parents:
38020
diff
changeset
|
2470 Some of the new change log entries may duplicate what's already in |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2471 ChangeLog. You will have to remove these duplicates by hand. |
25829 | 2472 |
2473 Normally, the log entry for file @file{foo} is displayed as @samp{* | |
2474 foo: @var{text of log entry}}. The @samp{:} after @file{foo} is omitted | |
2475 if the text of the log entry starts with @w{@samp{(@var{functionname}): | |
2476 }}. For example, if the log entry for @file{vc.el} is | |
2477 @samp{(vc-do-command): Check call-process status.}, then the text in | |
2478 @file{ChangeLog} looks like this: | |
2479 | |
2480 @iftex | |
2481 @medbreak | |
2482 @end iftex | |
2483 @smallexample | |
2484 @group | |
2485 1999-05-06 Nathaniel Bowditch <nat@@apn.org> | |
2486 | |
2487 * vc.el (vc-do-command): Check call-process status. | |
2488 @end group | |
2489 @end smallexample | |
2490 @iftex | |
2491 @medbreak | |
2492 @end iftex | |
2493 | |
2494 When @kbd{C-x v a} adds several change log entries at once, it groups | |
2495 related log entries together if they all are checked in by the same | |
2496 author at nearly the same time. If the log entries for several such | |
2497 files all have the same text, it coalesces them into a single entry. | |
2498 For example, suppose the most recent check-ins have the following log | |
2499 entries: | |
2500 | |
2501 @flushleft | |
2502 @bullet{} For @file{vc.texinfo}: @samp{Fix expansion typos.} | |
2503 @bullet{} For @file{vc.el}: @samp{Don't call expand-file-name.} | |
2504 @bullet{} For @file{vc-hooks.el}: @samp{Don't call expand-file-name.} | |
2505 @end flushleft | |
2506 | |
2507 @noindent | |
2508 They appear like this in @file{ChangeLog}: | |
2509 | |
2510 @iftex | |
2511 @medbreak | |
2512 @end iftex | |
2513 @smallexample | |
2514 @group | |
2515 1999-04-01 Nathaniel Bowditch <nat@@apn.org> | |
2516 | |
2517 * vc.texinfo: Fix expansion typos. | |
2518 | |
2519 * vc.el, vc-hooks.el: Don't call expand-file-name. | |
2520 @end group | |
2521 @end smallexample | |
2522 @iftex | |
2523 @medbreak | |
2524 @end iftex | |
2525 | |
2526 Normally, @kbd{C-x v a} separates log entries by a blank line, but you | |
2527 can mark several related log entries to be clumped together (without an | |
2528 intervening blank line) by starting the text of each related log entry | |
2529 with a label of the form @w{@samp{@{@var{clumpname}@} }}. The label | |
2530 itself is not copied to @file{ChangeLog}. For example, suppose the log | |
2531 entries are: | |
2532 | |
2533 @flushleft | |
2534 @bullet{} For @file{vc.texinfo}: @samp{@{expand@} Fix expansion typos.} | |
2535 @bullet{} For @file{vc.el}: @samp{@{expand@} Don't call expand-file-name.} | |
2536 @bullet{} For @file{vc-hooks.el}: @samp{@{expand@} Don't call expand-file-name.} | |
2537 @end flushleft | |
2538 | |
2539 @noindent | |
2540 Then the text in @file{ChangeLog} looks like this: | |
2541 | |
2542 @iftex | |
2543 @medbreak | |
2544 @end iftex | |
2545 @smallexample | |
2546 @group | |
2547 1999-04-01 Nathaniel Bowditch <nat@@apn.org> | |
2548 | |
2549 * vc.texinfo: Fix expansion typos. | |
2550 * vc.el, vc-hooks.el: Don't call expand-file-name. | |
2551 @end group | |
2552 @end smallexample | |
2553 @iftex | |
2554 @medbreak | |
2555 @end iftex | |
2556 | |
2557 A log entry whose text begins with @samp{#} is not copied to | |
2558 @file{ChangeLog}. For example, if you merely fix some misspellings in | |
2559 comments, you can log the change with an entry beginning with @samp{#} | |
2560 to avoid putting such trivia into @file{ChangeLog}. | |
2561 | |
2562 @node Renaming and VC | |
2563 @subsubsection Renaming VC Work Files and Master Files | |
2564 | |
2565 @findex vc-rename-file | |
2566 When you rename a registered file, you must also rename its master | |
2567 file correspondingly to get proper results. Use @code{vc-rename-file} | |
2568 to rename the source file as you specify, and rename its master file | |
2569 accordingly. It also updates any snapshots (@pxref{Snapshots}) that | |
2570 mention the file, so that they use the new name; despite this, the | |
2571 snapshot thus modified may not completely work (@pxref{Snapshot | |
2572 Caveats}). | |
2573 | |
2574 You cannot use @code{vc-rename-file} on a file that is locked by | |
2575 someone else. | |
2576 | |
2577 @node Version Headers | |
2578 @subsubsection Inserting Version Control Headers | |
2579 | |
2580 Sometimes it is convenient to put version identification strings | |
2581 directly into working files. Certain special strings called | |
2582 @dfn{version headers} are replaced in each successive version by the | |
2583 number of that version. | |
2584 | |
2585 If you are using RCS, and version headers are present in your working | |
2586 files, Emacs can use them to determine the current version and the | |
2587 locking state of the files. This is more reliable than referring to the | |
2588 master files, which is done when there are no version headers. Note | |
2589 that in a multi-branch environment, version headers are necessary to | |
2590 make VC behave correctly (@pxref{Multi-User Branching}). | |
2591 | |
2592 Searching for version headers is controlled by the variable | |
38739 | 2593 @code{vc-consult-headers}. If it is non-@code{nil} (the default), |
2594 Emacs searches for headers to determine the version number you are | |
2595 editing. Setting it to @code{nil} disables this feature. | |
25829 | 2596 |
2597 @kindex C-x v h | |
2598 @findex vc-insert-headers | |
2599 You can use the @kbd{C-x v h} command (@code{vc-insert-headers}) to | |
2600 insert a suitable header string. | |
2601 | |
2602 @table @kbd | |
2603 @item C-x v h | |
2604 Insert headers in a file for use with your version-control system. | |
2605 @end table | |
2606 | |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2607 @vindex vc-@var{backend}-header |
25829 | 2608 The default header string is @samp{@w{$}Id$} for RCS and |
2609 @samp{@w{%}W%} for SCCS. You can specify other headers to insert by | |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2610 setting the variables @code{vc-@var{backend}-header} where |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2611 @var{backend} is @code{rcs} or @code{sccs}. |
25829 | 2612 |
2613 Instead of a single string, you can specify a list of strings; then | |
2614 each string in the list is inserted as a separate header on a line of | |
2615 its own. | |
2616 | |
38739 | 2617 It is often necessary to use ``superfluous'' backslashes when |
2618 writing the strings that you put in this variable. For instance, you | |
2619 might write @code{"$Id\$"} rather than @code{"$Id@w{$}"}. The extra | |
2620 backslash prevents the string constant from being interpreted as a | |
2621 header, if the Emacs Lisp file containing it is maintained with | |
2622 version control. | |
25829 | 2623 |
2624 @vindex vc-comment-alist | |
2625 Each header is inserted surrounded by tabs, inside comment delimiters, | |
2626 on a new line at point. Normally the ordinary comment | |
2627 start and comment end strings of the current mode are used, but for | |
2628 certain modes, there are special comment delimiters for this purpose; | |
2629 the variable @code{vc-comment-alist} specifies them. Each element of | |
2630 this list has the form @code{(@var{mode} @var{starter} @var{ender})}. | |
2631 | |
2632 @vindex vc-static-header-alist | |
2633 The variable @code{vc-static-header-alist} specifies further strings | |
2634 to add based on the name of the buffer. Its value should be a list of | |
2635 elements of the form @code{(@var{regexp} . @var{format})}. Whenever | |
2636 @var{regexp} matches the buffer name, @var{format} is inserted as part | |
2637 of the header. A header line is inserted for each element that matches | |
2638 the buffer name, and for each string specified by | |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2639 @code{vc-@var{backend}-header}. The header line is made by processing the |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2640 string from @code{vc-@var{backend}-header} with the format taken from the |
25829 | 2641 element. The default value for @code{vc-static-header-alist} is as follows: |
2642 | |
2643 @example | |
2644 @group | |
2645 (("\\.c$" . | |
2646 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n\ | |
2647 #endif /* lint */\n")) | |
2648 @end group | |
2649 @end example | |
2650 | |
2651 @noindent | |
2652 It specifies insertion of text of this form: | |
2653 | |
2654 @example | |
2655 @group | |
2656 | |
2657 #ifndef lint | |
2658 static char vcid[] = "@var{string}"; | |
2659 #endif /* lint */ | |
2660 @end group | |
2661 @end example | |
2662 | |
2663 @noindent | |
2664 Note that the text above starts with a blank line. | |
2665 | |
2666 If you use more than one version header in a file, put them close | |
2667 together in the file. The mechanism in @code{revert-buffer} that | |
2668 preserves markers may not handle markers positioned between two version | |
2669 headers. | |
2670 | |
2671 @node Customizing VC | |
2672 @subsection Customizing VC | |
2673 | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2674 @vindex vc-handled-backends |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2675 The variable @code{vc-handled-backends} determines which version |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2676 control systems VC should handle. The default value is @code{(RCS CVS |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2677 SVN SCCS Arch MCVS)}, so it contains all six version systems that are |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2678 currently supported. If you want VC to ignore one or more of these |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2679 systems, exclude its name from the list. To disable VC entirely, set |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2680 this variable to @code{nil}. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2681 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2682 The order of systems in the list is significant: when you visit a file |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2683 registered in more than one system (@pxref{Local Version Control}), |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2684 VC uses the system that comes first in @code{vc-handled-backends} by |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2685 default. The order is also significant when you register a file for |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2686 the first time, @pxref{Registering} for details. |
25829 | 2687 |
2688 @menu | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2689 * General VC Options:: Options that apply to multiple back ends. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2690 * RCS and SCCS:: Options for RCS and SCCS. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2691 * CVS Options:: Options for CVS. |
25829 | 2692 @end menu |
2693 | |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2694 @node General VC Options |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2695 @subsubsection General Options |
25829 | 2696 |
2697 @vindex vc-make-backup-files | |
2698 Emacs normally does not save backup files for source files that are | |
2699 maintained with version control. If you want to make backup files even | |
2700 for files that use version control, set the variable | |
2701 @code{vc-make-backup-files} to a non-@code{nil} value. | |
2702 | |
2703 @vindex vc-keep-workfiles | |
2704 Normally the work file exists all the time, whether it is locked or | |
2705 not. If you set @code{vc-keep-workfiles} to @code{nil}, then checking | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2706 in a new version with @kbd{C-x v v} deletes the work file; but any |
25829 | 2707 attempt to visit the file with Emacs creates it again. (With CVS, work |
2708 files are always kept.) | |
2709 | |
2710 @vindex vc-follow-symlinks | |
2711 Editing a version-controlled file through a symbolic link can be | |
2712 dangerous. It bypasses the version control system---you can edit the | |
2713 file without locking it, and fail to check your changes in. Also, | |
2714 your changes might overwrite those of another user. To protect against | |
2715 this, VC checks each symbolic link that you visit, to see if it points | |
2716 to a file under version control. | |
2717 | |
2718 The variable @code{vc-follow-symlinks} controls what to do when a | |
2719 symbolic link points to a version-controlled file. If it is @code{nil}, | |
2720 VC only displays a warning message. If it is @code{t}, VC automatically | |
2721 follows the link, and visits the real file instead, telling you about | |
2722 this in the echo area. If the value is @code{ask} (the default), VC | |
2723 asks you each time whether to follow the link. | |
2724 | |
2725 @vindex vc-suppress-confirm | |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2726 If @code{vc-suppress-confirm} is non-@code{nil}, then @kbd{C-x v v} |
25829 | 2727 and @kbd{C-x v i} can save the current buffer without asking, and |
2728 @kbd{C-x v u} also operates without asking for confirmation. (This | |
2729 variable does not affect @kbd{C-x v c}; that operation is so drastic | |
2730 that it should always ask for confirmation.) | |
2731 | |
2732 @vindex vc-command-messages | |
2733 VC mode does much of its work by running the shell commands for RCS, | |
2734 CVS and SCCS. If @code{vc-command-messages} is non-@code{nil}, VC | |
2735 displays messages to indicate which shell commands it runs, and | |
2736 additional messages when the commands finish. | |
2737 | |
2738 @vindex vc-path | |
2739 You can specify additional directories to search for version control | |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2740 programs by setting the variable @code{vc-path}. These directories |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2741 are searched before the usual search path. It is rarely necessary to |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2742 set this variable, because VC normally finds the proper files |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2743 automatically. |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2744 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2745 @node RCS and SCCS |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2746 @subsubsection Options for RCS and SCCS |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2747 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2748 @cindex non-strict locking (RCS) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2749 @cindex locking, non-strict (RCS) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2750 By default, RCS uses locking to coordinate the activities of several |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2751 users, but there is a mode called @dfn{non-strict locking} in which |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2752 you can check-in changes without locking the file first. Use |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2753 @samp{rcs -U} to switch to non-strict locking for a particular file, |
39263 | 2754 see the @code{rcs} manual page for details. |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2755 |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2756 When deducing the version control state of an RCS file, VC first |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2757 looks for an RCS version header string in the file (@pxref{Version |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2758 Headers}). If there is no header string, VC normally looks at the |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2759 file permissions of the work file; this is fast. But there might be |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2760 situations when the file permissions cannot be trusted. In this case |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2761 the master file has to be consulted, which is rather expensive. Also |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2762 the master file can only tell you @emph{if} there's any lock on the |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2763 file, but not whether your work file really contains that locked |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2764 version. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2765 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2766 @vindex vc-consult-headers |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2767 You can tell VC not to use version headers to determine the file |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2768 status by setting @code{vc-consult-headers} to @code{nil}. VC then |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2769 always uses the file permissions (if it is supposed to trust them), or |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2770 else checks the master file. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2771 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2772 @vindex vc-mistrust-permissions |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2773 You can specify the criterion for whether to trust the file |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2774 permissions by setting the variable @code{vc-mistrust-permissions}. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2775 Its value can be @code{t} (always mistrust the file permissions and |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2776 check the master file), @code{nil} (always trust the file |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2777 permissions), or a function of one argument which makes the decision. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2778 The argument is the directory name of the @file{RCS} subdirectory. A |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2779 non-@code{nil} value from the function says to mistrust the file |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2780 permissions. If you find that the file permissions of work files are |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2781 changed erroneously, set @code{vc-mistrust-permissions} to @code{t}. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2782 Then VC always checks the master file to determine the file's status. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2783 |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2784 VC determines the version control state of files under SCCS much as |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2785 with RCS. It does not consider SCCS version headers, though. Thus, |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2786 the variable @code{vc-mistrust-permissions} affects SCCS use, but |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2787 @code{vc-consult-headers} does not. |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2788 |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2789 @node CVS Options |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2790 @subsubsection Options specific for CVS |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2791 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2792 @cindex locking (CVS) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2793 By default, CVS does not use locking to coordinate the activities of |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2794 several users; anyone can change a work file at any time. However, |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2795 there are ways to restrict this, resulting in behavior that resembles |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2796 locking. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2797 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2798 @cindex CVSREAD environment variable (CVS) |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2799 For one thing, you can set the @env{CVSREAD} environment variable |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2800 (the value you use makes no difference). If this variable is defined, |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2801 CVS makes your work files read-only by default. In Emacs, you must |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2802 type @kbd{C-x v v} to make the file writable, so that editing works |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2803 in fact similar as if locking was used. Note however, that no actual |
39263 | 2804 locking is performed, so several users can make their files writable |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2805 at the same time. When setting @env{CVSREAD} for the first time, make |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2806 sure to check out all your modules anew, so that the file protections |
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2807 are set correctly. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2808 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2809 @cindex cvs watch feature |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2810 @cindex watching files (CVS) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2811 Another way to achieve something similar to locking is to use the |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2812 @dfn{watch} feature of CVS. If a file is being watched, CVS makes it |
46458
7e33dc6a6f56
Document C-x v v as the main version control command, not C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
46384
diff
changeset
|
2813 read-only by default, and you must also use @kbd{C-x v v} in Emacs to |
39263 | 2814 make it writable. VC calls @code{cvs edit} to make the file writable, |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2815 and CVS takes care to notify other developers of the fact that you |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2816 intend to change the file. See the CVS documentation for details on |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2817 using the watch feature. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2818 |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2819 @vindex vc-cvs-stay-local |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2820 @cindex remote repositories (CVS) |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2821 When a file's repository is on a remote machine, VC tries to keep |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2822 network interactions to a minimum. This is controlled by the variable |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2823 @code{vc-cvs-stay-local}. If it is @code{t} (the default), then VC uses |
36356
a10bf38295d2
(CVS Options): Mention that t is the default for vc-cvs-stay-local.
André Spiegel <spiegel@gnu.org>
parents:
36355
diff
changeset
|
2824 only the entry in the local CVS subdirectory to determine the file's |
a10bf38295d2
(CVS Options): Mention that t is the default for vc-cvs-stay-local.
André Spiegel <spiegel@gnu.org>
parents:
36355
diff
changeset
|
2825 state (and possibly information returned by previous CVS commands). One |
a10bf38295d2
(CVS Options): Mention that t is the default for vc-cvs-stay-local.
André Spiegel <spiegel@gnu.org>
parents:
36355
diff
changeset
|
2826 consequence of this is that when you have modified a file, and somebody |
a10bf38295d2
(CVS Options): Mention that t is the default for vc-cvs-stay-local.
André Spiegel <spiegel@gnu.org>
parents:
36355
diff
changeset
|
2827 else has already checked in other changes to the file, you are not |
a10bf38295d2
(CVS Options): Mention that t is the default for vc-cvs-stay-local.
André Spiegel <spiegel@gnu.org>
parents:
36355
diff
changeset
|
2828 notified of it until you actually try to commit. (But you can try to |
a10bf38295d2
(CVS Options): Mention that t is the default for vc-cvs-stay-local.
André Spiegel <spiegel@gnu.org>
parents:
36355
diff
changeset
|
2829 pick up any recent changes from the repository first, using @kbd{C-x v m |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2830 @key{RET}}, @pxref{Merging}). |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2831 |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2832 @vindex vc-cvs-global-switches |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2833 The variable @code{vc-cvs-global-switches}, if non-@code{nil}, |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2834 should be a string specifying switches to pass to CVS for all CVS |
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2835 operations. |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2836 |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2837 When @code{vc-cvs-stay-local} is @code{t}, VC also makes local |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2838 version backups, so that simple diff and revert operations are |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2839 completely local (@pxref{Version Backups}). |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2840 |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2841 On the other hand, if you set @code{vc-cvs-stay-local} to @code{nil}, |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2842 then VC queries the remote repository @emph{before} it decides what to |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2843 do in @code{vc-next-action} (@kbd{C-x v v}), just as it does for local |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2844 repositories. It also does not make any version backups. |
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2845 |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2846 You can also set @code{vc-cvs-stay-local} to a regular expression |
39263 | 2847 that is matched against the repository host name; VC then stays local |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
2848 only for repositories from hosts that match the pattern. |
36355
d8c0e3d0f0aa
VC section updated. Added a subsection on remote repositories,
André Spiegel <spiegel@gnu.org>
parents:
36327
diff
changeset
|
2849 |
25829 | 2850 @node Directories |
2851 @section File Directories | |
2852 | |
2853 @cindex file directory | |
2854 @cindex directory listing | |
2855 The file system groups files into @dfn{directories}. A @dfn{directory | |
2856 listing} is a list of all the files in a directory. Emacs provides | |
2857 commands to create and delete directories, and to make directory | |
2858 listings in brief format (file names only) and verbose format (sizes, | |
2859 dates, and authors included). There is also a directory browser called | |
2860 Dired; see @ref{Dired}. | |
2861 | |
2862 @table @kbd | |
2863 @item C-x C-d @var{dir-or-pattern} @key{RET} | |
2864 Display a brief directory listing (@code{list-directory}). | |
2865 @item C-u C-x C-d @var{dir-or-pattern} @key{RET} | |
2866 Display a verbose directory listing. | |
2867 @item M-x make-directory @key{RET} @var{dirname} @key{RET} | |
2868 Create a new directory named @var{dirname}. | |
2869 @item M-x delete-directory @key{RET} @var{dirname} @key{RET} | |
2870 Delete the directory named @var{dirname}. It must be empty, | |
2871 or you get an error. | |
2872 @end table | |
2873 | |
2874 @findex list-directory | |
2875 @kindex C-x C-d | |
2876 The command to display a directory listing is @kbd{C-x C-d} | |
2877 (@code{list-directory}). It reads using the minibuffer a file name | |
2878 which is either a directory to be listed or a wildcard-containing | |
2879 pattern for the files to be listed. For example, | |
2880 | |
2881 @example | |
2882 C-x C-d /u2/emacs/etc @key{RET} | |
2883 @end example | |
2884 | |
2885 @noindent | |
2886 lists all the files in directory @file{/u2/emacs/etc}. Here is an | |
2887 example of specifying a file name pattern: | |
2888 | |
2889 @example | |
2890 C-x C-d /u2/emacs/src/*.c @key{RET} | |
2891 @end example | |
2892 | |
38870
d44abb4e68b2
Don't use "print" for displaying a message.
Richard M. Stallman <rms@gnu.org>
parents:
38768
diff
changeset
|
2893 Normally, @kbd{C-x C-d} displays a brief directory listing containing |
25829 | 2894 just file names. A numeric argument (regardless of value) tells it to |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
2895 make a verbose listing including sizes, dates, and owners (like |
25829 | 2896 @samp{ls -l}). |
2897 | |
2898 @vindex list-directory-brief-switches | |
2899 @vindex list-directory-verbose-switches | |
46212
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2900 The text of a directory listing is mostly obtained by running |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2901 @code{ls} in an inferior process. Two Emacs variables control the |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2902 switches passed to @code{ls}: @code{list-directory-brief-switches} is |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2903 a string giving the switches to use in brief listings (@code{"-CF"} by |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2904 default), and @code{list-directory-verbose-switches} is a string |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2905 giving the switches to use in a verbose listing (@code{"-l"} by |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2906 default). |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2907 |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2908 @vindex directory-free-space-program |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2909 @vindex directory-free-space-args |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2910 Emacs adds information about the amount of free space on the disk |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2911 that contains the directory. To do this, it runs the program |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2912 specified by @code{directory-free-space-program} with arguments |
895fd595b5fb
Explain that $FOO stands for itself if FOO is not defined.
Richard M. Stallman <rms@gnu.org>
parents:
45979
diff
changeset
|
2913 @code{directory-free-space-args}. |
25829 | 2914 |
2915 @node Comparing Files | |
2916 @section Comparing Files | |
2917 @cindex comparing files | |
2918 | |
2919 @findex diff | |
2920 @vindex diff-switches | |
2921 The command @kbd{M-x diff} compares two files, displaying the | |
38739 | 2922 differences in an Emacs buffer named @samp{*diff*}. It works by |
2923 running the @code{diff} program, using options taken from the variable | |
2924 @code{diff-switches}. The value of @code{diff-switches} should be a | |
2925 string; the default is @code{"-c"} to specify a context diff. | |
25829 | 2926 |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2927 @findex diff-goto-source |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2928 After running @kbd{M-x diff}, you can use @kbd{C-x `} to visit |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2929 successive changed locations in the two source files, as in |
64952
d643a38f75fc
(Comparing Files): Replace xref to `Compilation' with `Compilation Mode'.
Juri Linkov <juri@jurta.org>
parents:
64890
diff
changeset
|
2930 Compilation mode (@pxref{Compilation Mode}.) In the @samp{*diff*} buffer, |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2931 you can move to a particular hunk of changes and type @kbd{C-c C-c} |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2932 (@code{diff-goto-source}) to visit the corresponding source location. |
25829 | 2933 |
2934 @findex diff-backup | |
2935 The command @kbd{M-x diff-backup} compares a specified file with its most | |
2936 recent backup. If you specify the name of a backup file, | |
2937 @code{diff-backup} compares it with the source file that it is a backup | |
2938 of. | |
2939 | |
2940 @findex compare-windows | |
64828
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2941 The command @kbd{M-x compare-windows} compares the text in the |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2942 current window with that in the next window. (For more information |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2943 about windows in Emacs, @ref{Windows}.) Comparison starts at point in |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2944 each window, after pushing each initial point value on the mark ring |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2945 in its respective buffer. Then it moves point forward in each window, |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2946 one character at a time, until it reaches characters that don't match. |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2947 Then the command exits. |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2948 |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2949 If point in the two windows is followed by non-matching text when |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2950 the command starts, it tries heuristically to advance up to matching |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2951 text in the two windows, and then exits. So if you use @kbd{M-x |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2952 compare-windows} repeatedly, each time it either skips one matching |
7959083b57a2
(Comparing Files): Clarify compare-windows.
Richard M. Stallman <rms@gnu.org>
parents:
64591
diff
changeset
|
2953 range or finds the start of another. |
25829 | 2954 |
2955 @vindex compare-ignore-case | |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2956 @vindex compare-ignore-whitespace |
25829 | 2957 With a numeric argument, @code{compare-windows} ignores changes in |
2958 whitespace. If the variable @code{compare-ignore-case} is | |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2959 non-@code{nil}, the comparison ignores differences in case as well. |
61011
755f6a803e71
Several small changes in addition to:
Luc Teirlinck <teirllm@auburn.edu>
parents:
60976
diff
changeset
|
2960 If the variable @code{compare-ignore-whitespace} is non-@code{nil}, |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2961 @code{compare-windows} normally ignores changes in whitespace, and a |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
2962 prefix argument turns that off. |
25829 | 2963 |
31076 | 2964 @findex diff-mode |
2965 @cindex diffs | |
2966 @cindex patches | |
2967 @cindex Diff mode | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2968 Differences between versions of files are often distributed as |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2969 @dfn{patches}, which are the output from @command{diff} or a version |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2970 control system that uses @command{diff}. @kbd{M-x diff-mode} turns on |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2971 Diff mode, a major mode for viewing and editing patches, either as |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2972 ``unified diffs'' or ``context diffs.'' |
31076 | 2973 |
2974 @cindex Smerge mode | |
2975 @findex smerge-mode | |
2976 @cindex failed merges | |
2977 @cindex merges, failed | |
36274
91f2160d4468
Remove two more redundant index entries.
Eli Zaretskii <eliz@gnu.org>
parents:
36263
diff
changeset
|
2978 @cindex comparing 3 files (@code{diff3}) |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2979 You can use @kbd{M-x smerge-mode} to turn on Smerge mode, a minor |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2980 mode for editing output from the @command{diff3} program. This is |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2981 typically the result of a failed merge from a version control system |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2982 ``update'' outside VC, due to conflicting changes to a file. Smerge |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2983 mode provides commands to resolve conflicts by selecting specific |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2984 changes. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2985 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2986 See also @ref{Emerge}, and @ref{Top,,, ediff, The Ediff Manual}, for |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
2987 convenient facilities for merging two similar files. |
25829 | 2988 |
2989 @node Misc File Ops | |
2990 @section Miscellaneous File Operations | |
2991 | |
2992 Emacs has commands for performing many other operations on files. | |
2993 All operate on one file; they do not accept wildcard file names. | |
2994 | |
2995 @findex view-file | |
2996 @cindex viewing | |
2997 @cindex View mode | |
2998 @cindex mode, View | |
2999 @kbd{M-x view-file} allows you to scan or read a file by sequential | |
3000 screenfuls. It reads a file name argument using the minibuffer. After | |
3001 reading the file into an Emacs buffer, @code{view-file} displays the | |
3002 beginning. You can then type @key{SPC} to scroll forward one windowful, | |
3003 or @key{DEL} to scroll backward. Various other commands are provided | |
3004 for moving around in the file, but none for changing it; type @kbd{?} | |
3005 while viewing for a list of them. They are mostly the same as normal | |
3006 Emacs cursor motion commands. To exit from viewing, type @kbd{q}. | |
57404
634541ce83f0
(Misc File Ops): View mode is a minor mode.
Luc Teirlinck <teirllm@auburn.edu>
parents:
56732
diff
changeset
|
3007 The commands for viewing are defined by a special minor mode called View |
25829 | 3008 mode. |
3009 | |
3010 A related command, @kbd{M-x view-buffer}, views a buffer already present | |
3011 in Emacs. @xref{Misc Buffer}. | |
3012 | |
38739 | 3013 @kindex C-x i |
25829 | 3014 @findex insert-file |
38739 | 3015 @kbd{M-x insert-file} (also @kbd{C-x i}) inserts a copy of the |
3016 contents of the specified file into the current buffer at point, | |
3017 leaving point unchanged before the contents and the mark after them. | |
25829 | 3018 |
3019 @findex write-region | |
3020 @kbd{M-x write-region} is the inverse of @kbd{M-x insert-file}; it | |
3021 copies the contents of the region into the specified file. @kbd{M-x | |
65532
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
3022 append-to-file} adds the text of the region to the end of the |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
3023 specified file. @xref{Accumulating Text}. The variable |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
3024 @code{write-region-inhibit-fsync} applies to these commands, as well |
1a6c78b455d7
(Saving Commands): New node, broken out of Saving.
Richard M. Stallman <rms@gnu.org>
parents:
65515
diff
changeset
|
3025 as saving files; see @ref{Customize Save}. |
25829 | 3026 |
3027 @findex delete-file | |
3028 @cindex deletion (of files) | |
3029 @kbd{M-x delete-file} deletes the specified file, like the @code{rm} | |
3030 command in the shell. If you are deleting many files in one directory, it | |
3031 may be more convenient to use Dired (@pxref{Dired}). | |
3032 | |
3033 @findex rename-file | |
3034 @kbd{M-x rename-file} reads two file names @var{old} and @var{new} using | |
38739 | 3035 the minibuffer, then renames file @var{old} as @var{new}. If the file name |
25829 | 3036 @var{new} already exists, you must confirm with @kbd{yes} or renaming is not |
3037 done; this is because renaming causes the old meaning of the name @var{new} | |
3038 to be lost. If @var{old} and @var{new} are on different file systems, the | |
3039 file @var{old} is copied and deleted. | |
3040 | |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3041 If the argument @var{new} is just a directory name, the real new |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3042 name is in that directory, with the same non-directory component as |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3043 @var{old}. For example, @kbd{M-x rename-file RET ~/foo RET /tmp RET} |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3044 renames @file{~/foo} to @file{/tmp/foo}. The same rule applies to all |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3045 the remaining commands in this section. All of them ask for |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3046 confirmation when the new file name already exists, too. |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3047 |
25829 | 3048 @findex add-name-to-file |
38739 | 3049 @cindex hard links (creation) |
25829 | 3050 The similar command @kbd{M-x add-name-to-file} is used to add an |
3051 additional name to an existing file without removing its old name. | |
38739 | 3052 The new name is created as a ``hard link'' to the existing file. |
25829 | 3053 The new name must belong on the same file system that the file is on. |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3054 On MS-Windows, this command works only if the file resides in an NTFS |
37349
9aada84f08c8
Clarify link commands for MS systems.
Richard M. Stallman <rms@gnu.org>
parents:
37315
diff
changeset
|
3055 file system. On MS-DOS, it works by copying the file. |
25829 | 3056 |
3057 @findex copy-file | |
3058 @cindex copying files | |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3059 @kbd{M-x copy-file} reads the file @var{old} and writes a new file |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3060 named @var{new} with the same contents. |
25829 | 3061 |
3062 @findex make-symbolic-link | |
52575
3a79db508c6c
(File Aliases, Misc File Ops): Add @cindex entries.
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
3063 @cindex symbolic links (creation) |
25829 | 3064 @kbd{M-x make-symbolic-link} reads two file names @var{target} and |
60792
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3065 @var{linkname}, then creates a symbolic link named @var{linkname}, |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3066 which points at @var{target}. The effect is that future attempts to |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3067 open file @var{linkname} will refer to whatever file is named |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3068 @var{target} at the time the opening is done, or will get an error if |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3069 the name @var{target} is nonexistent at that time. This command does |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3070 not expand the argument @var{target}, so that it allows you to specify |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3071 a relative name as the target of the link. |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3072 |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3073 Not all systems support symbolic links; on systems that don't |
4fbe0af1e69a
(Visiting): Document large-file-warning-threshold.
Richard M. Stallman <rms@gnu.org>
parents:
60426
diff
changeset
|
3074 support them, this command is not defined. |
25829 | 3075 |
3076 @node Compressed Files | |
3077 @section Accessing Compressed Files | |
3078 @cindex compression | |
3079 @cindex uncompression | |
3080 @cindex Auto Compression mode | |
3081 @cindex mode, Auto Compression | |
3082 @pindex gzip | |
3083 | |
61952
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3084 Emacs automatically uncompresses compressed files when you visit |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3085 them, and automatically recompress them if you alter them and save |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3086 them. Emacs recognizes compressed files by their file names. File |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3087 names ending in @samp{.gz} indicate a file compressed with |
25829 | 3088 @code{gzip}. Other endings indicate other compression programs. |
3089 | |
3090 Automatic uncompression and compression apply to all the operations in | |
3091 which Emacs uses the contents of a file. This includes visiting it, | |
3092 saving it, inserting its contents into a buffer, loading it, and byte | |
3093 compiling it. | |
3094 | |
61952
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3095 @findex auto-compression-mode |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3096 @vindex auto-compression-mode |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3097 To disable this feature, type the command @kbd{M-x |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3098 auto-compression-mode}. You can disenable it permanently by |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3099 customizing the variable @code{auto-compression-mode}. |
7f9d1d01d274
(Compressed Files): Auto Compression normally enabled.
Richard M. Stallman <rms@gnu.org>
parents:
61847
diff
changeset
|
3100 |
28123
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3101 @node File Archives |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3102 @section File Archives |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3103 @cindex mode, tar |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3104 @cindex Tar mode |
36274
91f2160d4468
Remove two more redundant index entries.
Eli Zaretskii <eliz@gnu.org>
parents:
36263
diff
changeset
|
3105 @cindex file archives |
29683
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3106 |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3107 A file whose name ends in @samp{.tar} is normally an @dfn{archive} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3108 made by the @code{tar} program. Emacs views these files in a special |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3109 mode called Tar mode which provides a Dired-like list of the contents |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3110 (@pxref{Dired}). You can move around through the list just as you |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3111 would in Dired, and visit the subfiles contained in the archive. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3112 However, not all Dired commands are available in Tar mode. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3113 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3114 If you enable Auto Compression mode (@pxref{Compressed Files}), then |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3115 Tar mode is used also for compressed archives---files with extensions |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3116 @samp{.tgz}, @code{.tar.Z} and @code{.tar.gz}. |
29683
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3117 |
36385
d7ca85bd6906
Clean up recent VC updates.
Richard M. Stallman <rms@gnu.org>
parents:
36360
diff
changeset
|
3118 The keys @kbd{e}, @kbd{f} and @key{RET} all extract a component file |
29683
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3119 into its own buffer. You can edit it there and when you save the buffer |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3120 the edited version will replace the version in the Tar buffer. @kbd{v} |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3121 extracts a file into a buffer in View mode. @kbd{o} extracts the file |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3122 and displays it in another window, so you could edit the file and |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3123 operate on the archive simultaneously. @kbd{d} marks a file for |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3124 deletion when you later use @kbd{x}, and @kbd{u} unmarks a file, as in |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3125 Dired. @kbd{C} copies a file from the archive to disk and @kbd{R} |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3126 renames a file. @kbd{g} reverts the buffer from the archive on disk. |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3127 |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3128 The keys @kbd{M}, @kbd{G}, and @kbd{O} change the file's permission |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3129 bits, group, and owner, respectively. |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3130 |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3131 If your display supports colors and the mouse, moving the mouse |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3132 pointer across a file name highlights that file name, indicating that |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3133 you can click on it. Clicking @kbd{Mouse-2} on the highlighted file |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3134 name extracts the file into a buffer and displays that buffer. |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3135 |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3136 Saving the Tar buffer writes a new version of the archive to disk with |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3137 the changes you made to the components. |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3138 |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3139 You don't need the @code{tar} program to use Tar mode---Emacs reads |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3140 the archives directly. However, accessing compressed archives |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3141 requires the appropriate uncompression program. |
31076 | 3142 |
28123
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3143 @cindex Archive mode |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3144 @cindex mode, archive |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3145 @cindex @code{arc} |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3146 @cindex @code{jar} |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3147 @cindex @code{zip} |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3148 @cindex @code{lzh} |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3149 @cindex @code{zoo} |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3150 @pindex arc |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3151 @pindex jar |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3152 @pindex zip |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3153 @pindex lzh |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3154 @pindex zoo |
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3155 @cindex Java class archives |
29683
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3156 @cindex unzip archives |
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3157 A separate but similar Archive mode is used for archives produced by |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3158 the programs @code{arc}, @code{jar}, @code{lzh}, @code{zip}, and |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3159 @code{zoo}, which have extensions corresponding to the program names. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3160 |
39263 | 3161 The key bindings of Archive mode are similar to those in Tar mode, |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3162 with the addition of the @kbd{m} key which marks a file for subsequent |
29683
324386e590b7
(File Archives): Remove redundant index entries. Add some more Tar
Eli Zaretskii <eliz@gnu.org>
parents:
29556
diff
changeset
|
3163 operations, and @kbd{M-@key{DEL}} which unmarks all the marked files. |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3164 Also, the @kbd{a} key toggles the display of detailed file |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3165 information, for those archive types where it won't fit in a single |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3166 line. Operations such as renaming a subfile, or changing its mode or |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3167 owner, are supported only for some of the archive formats. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3168 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3169 Unlike Tar mode, Archive mode runs the archiving program to unpack |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3170 and repack archives. Details of the program names and their options |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3171 can be set in the @samp{Archive} Customize group. However, you don't |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3172 need these programs to look at the archive table of contents, only to |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3173 extract or manipulate the subfiles in the archive. |
28123
6e2e72ee55a6
(Compressed Files): Note custom option.
Dave Love <fx@gnu.org>
parents:
26105
diff
changeset
|
3174 |
25829 | 3175 @node Remote Files |
3176 @section Remote Files | |
3177 | |
45892
58c783d19649
@node{Remote Files}: Mention Tramp.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
44717
diff
changeset
|
3178 @cindex Tramp |
25829 | 3179 @cindex FTP |
3180 @cindex remote file access | |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3181 You can refer to files on other machines using a special file name |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3182 syntax: |
25829 | 3183 |
3184 @example | |
3185 @group | |
3186 /@var{host}:@var{filename} | |
3187 /@var{user}@@@var{host}:@var{filename} | |
26105 | 3188 /@var{user}@@@var{host}#@var{port}:@var{filename} |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3189 /@var{method}:@var{user}@@@var{host}:@var{filename} |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3190 /@var{method}:@var{user}@@@var{host}#@var{port}:@var{filename} |
25829 | 3191 @end group |
3192 @end example | |
3193 | |
3194 @noindent | |
59886 | 3195 To carry out this request, Emacs uses either the FTP program or a |
3196 remote-login program such as @command{ssh}, @command{rlogin}, or | |
3197 @command{telnet}. You can always specify in the file name which | |
3198 method to use---for example, | |
46384 | 3199 @file{/ftp:@var{user}@@@var{host}:@var{filename}} uses FTP, whereas |
47001
66b6d19633ed
Remote files: new default method for Tramp is ssh, not sm.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46918
diff
changeset
|
3200 @file{/ssh:@var{user}@@@var{host}:@var{filename}} uses @command{ssh}. |
59886 | 3201 When you don't specify a method in the file name, Emacs chooses |
3202 the method as follows: | |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3203 |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3204 @enumerate |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3205 @item |
59886 | 3206 If the host name starts with @samp{ftp.} (with dot), then Emacs uses |
3207 FTP. | |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3208 @item |
59886 | 3209 If the user name is @samp{ftp} or @samp{anonymous}, then Emacs uses |
3210 FTP. | |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3211 @item |
59886 | 3212 Otherwise, Emacs uses @command{ssh}. |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3213 @end enumerate |
45892
58c783d19649
@node{Remote Files}: Mention Tramp.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
44717
diff
changeset
|
3214 |
58c783d19649
@node{Remote Files}: Mention Tramp.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
44717
diff
changeset
|
3215 @noindent |
46346
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3216 Remote file access through FTP is handled by the Ange-FTP package, which |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3217 is documented in the following. Remote file access through the other |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3218 methods is handled by the Tramp package, which has its own manual. |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3219 @xref{Top, The Tramp Manual,, tramp, The Tramp Manual}. |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3220 |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3221 When the Ange-FTP package is used, Emacs logs in through FTP using your |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3222 user name or the name @var{user}. It may ask you for a password from |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3223 time to time; this is used for logging in on @var{host}. The form using |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3224 @var{port} allows you to access servers running on a non-default TCP |
49f06e689a20
* files.texi (Remote Files): Explain new unified file name synatx.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
46215
diff
changeset
|
3225 port. |
45892
58c783d19649
@node{Remote Files}: Mention Tramp.
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
44717
diff
changeset
|
3226 |
35908
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3227 @cindex backups for remote files |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3228 @vindex ange-ftp-make-backup-files |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3229 If you want to disable backups for remote files, set the variable |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3230 @code{ange-ftp-make-backup-files} to @code{nil}. |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3231 |
44717
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
3232 By default, the auto-save files (@pxref{Auto Save Files}) for remote |
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
3233 files are made in the temporary file directory on the local machine. |
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
3234 This is achieved using the variable @code{auto-save-file-name-transforms}. |
1fdf19dbc2e8
(Auto Save Files): Mention auto-save-file-name-transforms.
Glenn Morris <rgm@gnu.org>
parents:
44588
diff
changeset
|
3235 |
25829 | 3236 @cindex ange-ftp |
3237 @vindex ange-ftp-default-user | |
35908
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3238 @cindex user name for remote file access |
25829 | 3239 Normally, if you do not specify a user name in a remote file name, |
3240 that means to use your own user name. But if you set the variable | |
3241 @code{ange-ftp-default-user} to a string, that string is used instead. | |
3242 (The Emacs package that implements FTP file access is called | |
3243 @code{ange-ftp}.) | |
3244 | |
35908
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3245 @cindex anonymous FTP |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3246 @vindex ange-ftp-generate-anonymous-password |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3247 To visit files accessible by anonymous FTP, you use special user |
36155
3594ca3f5f64
Fix some Texinfo usage.
Richard M. Stallman <rms@gnu.org>
parents:
36136
diff
changeset
|
3248 names @samp{anonymous} or @samp{ftp}. Passwords for these user names |
3594ca3f5f64
Fix some Texinfo usage.
Richard M. Stallman <rms@gnu.org>
parents:
36136
diff
changeset
|
3249 are handled specially. The variable |
35908
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3250 @code{ange-ftp-generate-anonymous-password} controls what happens: if |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3251 the value of this variable is a string, then that string is used as |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3252 the password; if non-@code{nil} (the default), then the value of |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3253 @code{user-mail-address} is used; if @code{nil}, the user is prompted |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3254 for a password as normal. |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3255 |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3256 @cindex firewall, and accessing remote files |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3257 @cindex gateway, and remote file access with @code{ange-ftp} |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3258 @vindex ange-ftp-smart-gateway |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3259 @vindex ange-ftp-gateway-host |
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3260 Sometimes you may be unable to access files on a remote machine |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3261 because a @dfn{firewall} in between blocks the connection for security |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3262 reasons. If you can log in on a @dfn{gateway} machine from which the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3263 target files @emph{are} accessible, and whose FTP server supports |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3264 gatewaying features, you can still use remote file names; all you have |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3265 to do is specify the name of the gateway machine by setting the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3266 variable @code{ange-ftp-gateway-host}, and set |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3267 @code{ange-ftp-smart-gateway} to @code{t}. Otherwise you may be able |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3268 to make remote file names work, but the procedure is complex. You can |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3269 read the instructions by typing @kbd{M-x finder-commentary @key{RET} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3270 ange-ftp @key{RET}}. |
35908
4ba2a6029c03
(Remote Files): Explain how to use ange-ftp behind firewalls. Add a
Eli Zaretskii <eliz@gnu.org>
parents:
35731
diff
changeset
|
3271 |
25829 | 3272 @vindex file-name-handler-alist |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3273 @cindex disabling remote files |
26105 | 3274 You can entirely turn off the FTP file name feature by removing the |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3275 entries @code{ange-ftp-completion-hook-function} and |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3276 @code{ange-ftp-hook-function} from the variable |
28327
f7b17a6af3db
(Visiting): List wildcard chars. Mention find-file-wildcards.
Dave Love <fx@gnu.org>
parents:
28123
diff
changeset
|
3277 @code{file-name-handler-alist}. You can turn off the feature in |
f7b17a6af3db
(Visiting): List wildcard chars. Mention find-file-wildcards.
Dave Love <fx@gnu.org>
parents:
28123
diff
changeset
|
3278 individual cases by quoting the file name with @samp{/:} (@pxref{Quoted |
f7b17a6af3db
(Visiting): List wildcard chars. Mention find-file-wildcards.
Dave Love <fx@gnu.org>
parents:
28123
diff
changeset
|
3279 File Names}). |
25829 | 3280 |
3281 @node Quoted File Names | |
3282 @section Quoted File Names | |
3283 | |
3284 @cindex quoting file names | |
64591
c502137f8bb7
(Quoted File Names): Add index entry.
Eli Zaretskii <eliz@gnu.org>
parents:
64493
diff
changeset
|
3285 @cindex file names, quote special characters |
25829 | 3286 You can @dfn{quote} an absolute file name to prevent special |
3287 characters and syntax in it from having their special effects. | |
3288 The way to do this is to add @samp{/:} at the beginning. | |
3289 | |
3290 For example, you can quote a local file name which appears remote, to | |
3291 prevent it from being treated as a remote file name. Thus, if you have | |
3292 a directory named @file{/foo:} and a file named @file{bar} in it, you | |
3293 can refer to that file in Emacs as @samp{/:/foo:/bar}. | |
3294 | |
3295 @samp{/:} can also prevent @samp{~} from being treated as a special | |
3296 character for a user's home directory. For example, @file{/:/tmp/~hack} | |
3297 refers to a file whose name is @file{~hack} in directory @file{/tmp}. | |
3298 | |
44143
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3299 Quoting with @samp{/:} is also a way to enter in the minibuffer a |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3300 file name that contains @samp{$}. In order for this to work, the |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3301 @samp{/:} must be at the beginning of the minibuffer contents. (You |
44327
1e166973cd8b
Don't use @samp in an anchor.
Richard M. Stallman <rms@gnu.org>
parents:
44143
diff
changeset
|
3302 can also double each @samp{$}; see @ref{File Names with $}.) |
25829 | 3303 |
3304 You can also quote wildcard characters with @samp{/:}, for visiting. | |
44143
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3305 For example, @file{/:/tmp/foo*bar} visits the file |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3306 @file{/tmp/foo*bar}. |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3307 |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3308 Another method of getting the same result is to enter |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3309 @file{/tmp/foo[*]bar}, which is a wildcard specification that matches |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3310 only @file{/tmp/foo*bar}. However, in many cases there is no need to |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3311 quote the wildcard characters because even unquoted they give the |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3312 right result. For example, if the only file name in @file{/tmp} that |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3313 starts with @samp{foo} and ends with @samp{bar} is @file{foo*bar}, |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3314 then specifying @file{/tmp/foo*bar} will visit only |
f7a64b7a993d
(Quoted File Names): Minor clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
44086
diff
changeset
|
3315 @file{/tmp/foo*bar}. |
28526
297e03ccd7e6
(Backup): backup-enable-predicate.
Dave Love <fx@gnu.org>
parents:
28327
diff
changeset
|
3316 |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3317 @node File Name Cache |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3318 @section File Name Cache |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3319 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3320 @cindex file name caching |
28671 | 3321 @cindex cache of file names |
3322 @pindex find | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3323 @kindex C-@key{TAB} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3324 @findex file-cache-minibuffer-complete |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3325 You can use the @dfn{file name cache} to make it easy to locate a |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3326 file by name, without having to remember exactly where it is located. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3327 When typing a file name in the minibuffer, @kbd{C-@key{tab}} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3328 (@code{file-cache-minibuffer-complete}) completes it using the file |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3329 name cache. If you repeat @kbd{C-@key{tab}}, that cycles through the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3330 possible completions of what you had originally typed. Note that the |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3331 @kbd{C-@key{tab}} character cannot be typed on most text-only |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3332 terminals. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3333 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3334 The file name cache does not fill up automatically. Instead, you |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3335 load file names into the cache using these commands: |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3336 |
31076 | 3337 @findex file-cache-add-directory |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3338 @table @kbd |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3339 @item M-x file-cache-add-directory @key{RET} @var{directory} @key{RET} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3340 Add each file name in @var{directory} to the file name cache. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3341 @item M-x file-cache-add-directory-using-find @key{RET} @var{directory} @key{RET} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3342 Add each file name in @var{directory} and all of its nested |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3343 subdirectories to the file name cache. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3344 @item M-x file-cache-add-directory-using-locate @key{RET} @var{directory} @key{RET} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3345 Add each file name in @var{directory} and all of its nested |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3346 subdirectories to the file name cache, using @command{locate} to find |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3347 them all. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3348 @item M-x file-cache-add-directory-list @key{RET} @var{variable} @key{RET} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3349 Add each file name in each directory listed in @var{variable} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3350 to the file name cache. @var{variable} should be a Lisp variable |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3351 such as @code{load-path} or @code{exec-path}, whose value is a list |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3352 of directory names. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3353 @item M-x file-cache-clear-cache @key{RET} |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3354 Clear the cache; that is, remove all file names from it. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3355 @end table |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3356 |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3357 @node File Conveniences |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3358 @section Convenience Features for Finding Files |
31076 | 3359 |
61046
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3360 In this section, we introduce some convenient facilities for finding |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3361 recently-opened files, reading file names from a buffer, and viewing |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3362 image files. |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3363 |
31076 | 3364 @findex recentf-mode |
3365 @vindex recentf-mode | |
3366 @findex recentf-save-list | |
3367 @findex recentf-edit-list | |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3368 If you enable Recentf mode, with @kbd{M-x recentf-mode}, the |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3369 @samp{File} menu includes a submenu containing a list of recently |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3370 opened files. @kbd{M-x recentf-save-list} saves the current |
37315
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3371 @code{recent-file-list} to a file, and @kbd{M-x recentf-edit-list} |
702729e72132
Change @var to @code in many places.
Richard M. Stallman <rms@gnu.org>
parents:
37090
diff
changeset
|
3372 edits it. |
32221 | 3373 |
36136
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3374 The @kbd{M-x ffap} command generalizes @code{find-file} with more |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3375 powerful heuristic defaults (@pxref{FFAP}), often based on the text at |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3376 point. Partial Completion mode offers other features extending |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3377 @code{find-file}, which can be used with @code{ffap}. |
a5ae50ec6fe7
Many small clarifications.
Richard M. Stallman <rms@gnu.org>
parents:
35919
diff
changeset
|
3378 @xref{Completion Options}. |
52401 | 3379 |
61847 | 3380 @findex image-mode |
3381 @findex image-toggle-display | |
3382 @cindex images, viewing | |
3383 Visiting image files automatically selects Image mode. This major | |
3384 mode allows you to toggle between displaying the file as an image in | |
3385 the Emacs buffer, and displaying its underlying text representation, | |
3386 using the command @kbd{C-c C-c} (@code{image-toggle-display}). This | |
3387 works only when Emacs can display the specific image type. | |
3388 | |
61046
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3389 @findex thumbs-mode |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3390 @findex mode, thumbs |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3391 Thumbs mode is a major mode for viewing directories containing many |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3392 image files. To use it, type @kbd{M-x thumbs} and specify the |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3393 directory to view. The images in that directory will be displayed in |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3394 a @samp{Thumbs} buffer as @dfn{thumbnails}; type @kbd{RET} on a |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3395 thumbnail to view the full-size image. Thumbs mode requires the |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3396 @file{convert} program, which is part of the ImageMagick software |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3397 package. |
89f67218c46b
(File Conveniences): Delete Auto Image File mode.
Richard M. Stallman <rms@gnu.org>
parents:
61011
diff
changeset
|
3398 |
61847 | 3399 @node Filesets |
3400 @section Filesets | |
3401 @cindex filesets | |
3402 | |
3403 @findex filesets-init | |
3404 If you regularly edit a certain group of files, you can define them | |
3405 as a @dfn{fileset}. This lets you perform certain operations, such as | |
3406 visiting, @code{query-replace}, and shell commands on all the files | |
3407 at once. To make use of filesets, you must first add the expression | |
3408 @code{(filesets-init)} to your @file{.emacs} file (@pxref{Init File}). | |
3409 This adds a @samp{Filesets} menu to the menu bar. | |
3410 | |
3411 @findex filesets-add-buffer | |
3412 @findex filesets-remove-buffer | |
3413 The simplest way to define filesets is by adding files to them one | |
3414 at a time. To add a file to fileset @var{name}, visit the file and | |
3415 type @kbd{M-x filesets-add-buffer @kbd{RET} @var{name} @kbd{RET}}. If | |
3416 there is no fileset @var{name}, this creates a new one, which | |
3417 initially creates only the current file. The command @kbd{M-x | |
3418 filesets-remove-buffer} removes the current file from a fileset. | |
3419 | |
3420 You can also edit the list of filesets directly, with @kbd{M-x | |
3421 filesets-edit} (or by choosing @samp{Edit Filesets} from the | |
3422 @samp{Filesets} menu). The editing is performed in a Customize buffer | |
3423 (@pxref{Easy Customization}). Filesets need not be a simple list of | |
3424 files---you can also define filesets using regular expression matching | |
3425 file names. Some examples of these more complicated filesets are | |
3426 shown in the Customize buffer. Remember to select @samp{Save for | |
3427 future sessions} if you want to use the same filesets in future Emacs | |
3428 sessions. | |
3429 | |
3430 You can use the command @kbd{M-x filesets-open} to visit all the | |
3431 files in a fileset, and @kbd{M-x filesets-close} to close them. Use | |
3432 @kbd{M-x filesets-run-cmd} to run a shell command on all the files in | |
3433 a fileset. These commands are also available from the @samp{Filesets} | |
3434 menu, where each existing fileset is represented by a submenu. | |
3435 | |
52401 | 3436 @ignore |
3437 arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250 | |
3438 @end ignore |