author | Bryan O'Sullivan <bos@serpentine.com> |
Wed, 14 Sep 2005 14:29:02 -0700 | |
changeset 1249 | a5355fa5e33a |
parent 1247 | 7a70dafbf4b9 |
child 1253 | a45e717c61a8 |
permissions | -rw-r--r-- |
177 | 1 |
HG(1) |
2 |
===== |
|
3 |
Matt Mackall <mpm@selenic.com> |
|
4 |
||
5 |
NAME |
|
6 |
---- |
|
438 | 7 |
hg - Mercurial source code management system |
177 | 8 |
|
9 |
SYNOPSIS |
|
10 |
-------- |
|
11 |
'hg' [-v -d -q -y] <command> [command options] [files] |
|
12 |
||
13 |
DESCRIPTION |
|
14 |
----------- |
|
15 |
The hg(1) command provides a command line interface to the Mercurial system. |
|
16 |
||
17 |
OPTIONS |
|
18 |
------- |
|
438 | 19 |
|
1084
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
20 |
-R, --repository:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
21 |
repository root directory |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
22 |
|
1084
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
23 |
--cwd:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
24 |
change working directory |
177 | 25 |
|
1084
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
26 |
-y, --noninteractive:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
27 |
do not prompt, assume 'yes' for any required answers |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
28 |
|
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
29 |
-q, --quiet:: |
177 | 30 |
suppress output |
31 |
||
1084
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
32 |
-v, --verbose:: |
177 | 33 |
enable additional output |
34 |
||
1084
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
35 |
--debug:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
36 |
enable debugging output |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
37 |
|
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
38 |
--traceback:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
39 |
print traceback on exception |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
40 |
|
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
41 |
--time:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
42 |
time how long the command takes |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
43 |
|
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
44 |
--profile:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
45 |
print command execution profile |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
46 |
|
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
47 |
--version:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
48 |
output version information and exit |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
49 |
|
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
50 |
-h, --help:: |
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
51 |
display help and exit |
177 | 52 |
|
53 |
COMMAND ELEMENTS |
|
54 |
---------------- |
|
55 |
||
56 |
files ...:: |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
57 |
indicates one or more filename or relative path filenames; see |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
58 |
"FILE NAME PATTERNS" for information on pattern matching |
177 | 59 |
|
60 |
path:: |
|
61 |
indicates a path on the local machine |
|
62 |
||
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
63 |
revision:: |
438 | 64 |
indicates a changeset which can be specified as a changeset revision |
65 |
number, a tag, or a unique substring of the changeset hash value |
|
177 | 66 |
|
67 |
repository path:: |
|
498 | 68 |
either the pathname of a local repository or the URI of a remote |
181
038e4d8602bd
updated for .hgpaths and http/old-http protocol name change
jake@edge2.net
parents:
177
diff
changeset
|
69 |
repository. There are two available URI protocols, http:// which is |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
70 |
fast and the old-http:// protocol which is much slower but does not |
438 | 71 |
require a special server on the web host. |
177 | 72 |
|
73 |
COMMANDS |
|
74 |
-------- |
|
438 | 75 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
76 |
add [options] [files ...]:: |
497 | 77 |
Schedule files to be version controlled and added to the repository. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
78 |
|
498 | 79 |
The files will be added to the repository at the next commit. |
177 | 80 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
81 |
If no names are given, add all files in the current directory and |
728 | 82 |
its subdirectories. |
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
83 |
|
766
b444a7e053f1
Get addremove to use new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
761
diff
changeset
|
84 |
addremove [options] [files ...]:: |
497 | 85 |
Add all new files and remove all missing files from the repository. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
86 |
|
497 | 87 |
New files are ignored if they match any of the patterns in .hgignore. As |
498 | 88 |
with add, these changes take effect at the next commit. |
177 | 89 |
|
438 | 90 |
annotate [-r <rev> -u -n -c] [files ...]:: |
497 | 91 |
List changes in files, showing the revision id responsible for each line |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
92 |
|
497 | 93 |
This command is useful to discover who did a change or when a change took |
94 |
place. |
|
1016 | 95 |
|
96 |
Without the -a option, annotate will avoid processing files it |
|
97 |
detects as binary. With -a, annotate will generate an annotation |
|
98 |
anyway, probably with undesirable results. |
|
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
99 |
|
438 | 100 |
options: |
1016 | 101 |
-a, --text treat all files as text |
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
102 |
-I, --include <pat> include names matching the given patterns |
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
103 |
-X, --exclude <pat> exclude names matching the given patterns |
438 | 104 |
-r, --revision <rev> annotate the specified revision |
105 |
-u, --user list the author |
|
106 |
-c, --changeset list the changeset |
|
107 |
-n, --number list the revision number (default) |
|
177 | 108 |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
109 |
bundle <file> <other>:: |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
110 |
(EXPERIMENTAL) |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
111 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
112 |
Generate a compressed changegroup file collecting all changesets |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
113 |
not found in the other repository. |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
114 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
115 |
This file can then be transferred using conventional means and |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
116 |
applied to another repository with the unbundle command. This is |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
117 |
useful when native push and pull are not available or when |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
118 |
exporting an entire repository is undesirable. The standard file |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
119 |
extension is ".hg". |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
120 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
121 |
Unlike import/export, this exactly preserves all changeset |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
122 |
contents including permissions, rename data, and revision history. |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
123 |
|
438 | 124 |
cat <file> [revision]:: |
497 | 125 |
Output to stdout the given revision for the specified file. |
126 |
||
498 | 127 |
If no revision is given then the tip is used. |
177 | 128 |
|
485 | 129 |
clone [-U] <source> [dest]:: |
497 | 130 |
Create a copy of an existing repository in a new directory. |
131 |
||
523
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
509
diff
changeset
|
132 |
If no destination directory name is specified, it defaults to the |
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
509
diff
changeset
|
133 |
basename of the source. |
497 | 134 |
|
498 | 135 |
The source is added to the new repository's .hg/hgrc file to be used in |
497 | 136 |
future pulls. |
137 |
||
498 | 138 |
For efficiency, hardlinks are used for cloning whenever the |
139 |
source and destination are on the same filesystem. |
|
497 | 140 |
|
141 |
options: |
|
505 | 142 |
-U, --noupdate do not update the new working directory |
963
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
143 |
-e, --ssh specify ssh command to use |
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
144 |
--remotecmd specify hg command to run on the remote side |
497 | 145 |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
811
diff
changeset
|
146 |
commit [options] [files...]:: |
498 | 147 |
Commit changes to the given files into the repository. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
148 |
|
498 | 149 |
If a list of files is omitted, all changes reported by "hg status" |
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
811
diff
changeset
|
150 |
from the root of the repository will be commited. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
151 |
|
498 | 152 |
The HGEDITOR or EDITOR environment variables are used to start an |
153 |
editor to add a commit comment. |
|
497 | 154 |
|
155 |
Options: |
|
156 |
||
157 |
-A, --addremove run addremove during commit |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
811
diff
changeset
|
158 |
-I, --include <pat> include names matching the given patterns |
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
811
diff
changeset
|
159 |
-X, --exclude <pat> exclude names matching the given patterns |
761
0fb498458905
Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com>
parents:
750
diff
changeset
|
160 |
-m, --message <text> use <text> as commit message |
1084
069b4311a81b
updated manpage on global options and typo fix.
TK Soh <teekaysoh@yahoo.com>
parents:
1045
diff
changeset
|
161 |
-l, --logfile <file> read the commit message from <file> |
497 | 162 |
-d, --date <datecode> record datecode as commit date |
163 |
-u, --user <user> record user as commiter |
|
164 |
||
165 |
aliases: ci |
|
166 |
||
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
167 |
copy <source ...> <dest>:: |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
168 |
Mark dest as having copies of source files. If dest is a |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
169 |
directory, copies are put in that directory. If dest is a file, |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
170 |
there can only be one source. |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
171 |
|
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
172 |
By default, this command copies the contents of files as they |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
173 |
stand in the working directory. If invoked with --after, the |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
174 |
operation is recorded, but no copying is performed. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
175 |
|
497 | 176 |
This command takes effect for the next commit. |
177 |
||
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
178 |
Options: |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
179 |
-A, --after record a copy that has already occurred |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
180 |
-f, --force forcibly copy over an existing managed file |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
181 |
-p, --parents append source path to dest |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
182 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
183 |
diff [-a] [-r revision] [-r revision] [files ...]:: |
497 | 184 |
Show differences between revisions for the specified files. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
185 |
|
497 | 186 |
Differences between files are shown using the unified diff format. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
187 |
|
498 | 188 |
When two revision arguments are given, then changes are shown |
189 |
between those revisions. If only one revision is specified then |
|
190 |
that revision is compared to the working directory, and, when no |
|
191 |
revisions are specified, the working directory files are compared |
|
192 |
to its parent. |
|
497 | 193 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
194 |
Without the -a option, diff will avoid generating diffs of files |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
195 |
it detects as binary. With -a, diff will generate a diff anyway, |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
196 |
probably with undesirable results. |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
197 |
|
734
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
198 |
options: |
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
199 |
-a, --text treat all files as text |
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
200 |
-I, --include <pat> include names matching the given patterns |
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
201 |
-X, --exclude <pat> exclude names matching the given patterns |
734
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
202 |
|
580 | 203 |
export [-o filespec] [revision] ...:: |
204 |
Print the changeset header and diffs for one or more revisions. |
|
205 |
||
206 |
The information shown in the changeset header is: author, |
|
207 |
changeset hash, parent and commit comment. |
|
208 |
||
209 |
Output may be to a file, in which case the name of the file is |
|
210 |
given using a format string. The formatting rules are as follows: |
|
497 | 211 |
|
580 | 212 |
%% literal "%" character |
213 |
%H changeset hash (40 bytes of hexadecimal) |
|
214 |
%N number of patches being generated |
|
215 |
%R changeset revision number |
|
216 |
%b basename of the exporting repository |
|
217 |
%h short-form changeset hash (12 bytes of hexadecimal) |
|
218 |
%n zero-padded sequence number, starting at 1 |
|
219 |
%r zero-padded changeset revision number |
|
220 |
||
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
221 |
Without the -a option, export will avoid generating diffs of files |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
222 |
it detects as binary. With -a, export will generate a diff anyway, |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
223 |
probably with undesirable results. |
580 | 224 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
225 |
options: |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
226 |
-a, --text treat all files as text |
580 | 227 |
-o, --output <filespec> print output to file with formatted named |
497 | 228 |
|
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
229 |
forget [options] [files]:: |
497 | 230 |
Undo an 'hg add' scheduled for the next commit. |
231 |
||
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
232 |
options: |
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
233 |
-I, --include <pat> include names matching the given patterns |
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
234 |
-X, --exclude <pat> exclude names matching the given patterns |
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
235 |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
236 |
grep [options] pattern [files]:: |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
237 |
Search revisions of files for a regular expression. |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
238 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
239 |
This command behaves differently than Unix grep. It only accepts |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
240 |
Python/Perl regexps. It searches repository history, not the |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
241 |
working directory. It always prints the revision number in which |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
242 |
a match appears. |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
243 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
244 |
By default, grep only prints output for the first revision of a |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
245 |
file in which it finds a match. To get it to print every revision |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
246 |
that contains a change in match status ("-" for a match that |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
247 |
becomes a non-match, or "+" for a non-match that becomes a match), |
1212 | 248 |
use the --all flag. |
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
249 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
250 |
options: |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
251 |
-0, --print0 end fields with NUL |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
252 |
-I, --include <pat> include names matching the given patterns |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
253 |
-X, --exclude <pat> exclude names matching the given patterns |
1212 | 254 |
--all print all revisions that match |
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
255 |
-i, --ignore-case ignore case when matching |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
256 |
-l, --files-with-matches print only file names and revs that match |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
257 |
-n, --line-number print matching line numbers |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
258 |
-r <rev>, --rev <rev> search in given revision range |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
259 |
-u, --user print user who committed change |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
260 |
|
497 | 261 |
heads:: |
262 |
Show all repository head changesets. |
|
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
263 |
|
498 | 264 |
Repository "heads" are changesets that don't have children |
265 |
changesets. They are where development generally takes place and |
|
266 |
are the usual targets for update and merge operations. |
|
497 | 267 |
|
268 |
identify:: |
|
269 |
Print a short summary of the current state of the repo. |
|
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
270 |
|
497 | 271 |
This summary identifies the repository state using one or two parent |
272 |
hash identifiers, followed by a "+" if there are uncommitted changes |
|
273 |
in the working directory, followed by a list of tags for this revision. |
|
274 |
||
275 |
aliases: id |
|
276 |
||
966
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
963
diff
changeset
|
277 |
import [-p <n> -b <base> -f] <patches>:: |
497 | 278 |
Import a list of patches and commit them individually. |
279 |
||
1211 | 280 |
If there are outstanding changes in the working directory, import |
281 |
will abort unless given the -f flag. |
|
282 |
||
1190
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1188
diff
changeset
|
283 |
If a patch looks like a mail message (its first line starts with |
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1188
diff
changeset
|
284 |
"From " or looks like an RFC822 header), it will not be applied |
1211 | 285 |
unless the -f option is used. The importer neither parses nor |
286 |
discards mail headers, so use -f only to override the "mailness" |
|
1190
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1188
diff
changeset
|
287 |
safety check, not to import a real mail message. |
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1188
diff
changeset
|
288 |
|
497 | 289 |
options: |
290 |
-p, --strip <n> directory strip option for patch. This has the same |
|
1045
b35d5b86e240
run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1036
diff
changeset
|
291 |
meaning as the corresponding patch option |
497 | 292 |
-b <path> base directory to read patches from |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
293 |
-f, --force skip check for outstanding uncommitted changes |
497 | 294 |
|
295 |
aliases: patch |
|
296 |
||
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
297 |
incoming [-p] [source]:: |
928
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
298 |
Show new changesets found in the specified repo or the default |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
299 |
pull repo. These are the changesets that would be pulled if a pull |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
300 |
was requested. |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
301 |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
302 |
Currently only local repositories are supported. |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
303 |
|
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
304 |
options: |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
305 |
-p, --patch show patch |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
306 |
|
940 | 307 |
aliases: in |
308 |
||
907
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
309 |
init [dest]:: |
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
310 |
Initialize a new repository in the given directory. If the given |
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
311 |
directory does not exist, it is created. |
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
312 |
|
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
313 |
If no directory is given, the current directory is used. |
177 | 314 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
315 |
locate [options] [files]:: |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
316 |
Print all files under Mercurial control whose names match the |
629
2fdf3b1659b9
Clarify man page entry for locate a little.
Bryan O'Sullivan <bos@serpentine.com>
parents:
627
diff
changeset
|
317 |
given patterns. |
627 | 318 |
|
319 |
This command searches the current directory and its |
|
320 |
subdirectories. To search an entire repository, move to the root |
|
321 |
of the repository. |
|
322 |
||
323 |
If no patterns are given to match, this command prints all file |
|
324 |
names. |
|
325 |
||
326 |
If you want to feed the output of this command into the "xargs" |
|
327 |
command, use the "-0" option to both this command and "xargs". |
|
328 |
This will avoid the problem of "xargs" treating single filenames |
|
329 |
that contain white space as multiple file names. |
|
330 |
||
331 |
options: |
|
332 |
||
333 |
-0, --print0 end filenames with NUL, for use with xargs |
|
334 |
-f, --fullpath print complete paths from the filesystem root |
|
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
335 |
-I, --include <pat> include names matching the given patterns |
627 | 336 |
-r, --rev <rev> search the repository as it stood at rev |
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
337 |
-X, --exclude <pat> exclude names matching the given patterns |
627 | 338 |
|
1036 | 339 |
log [-r revision ...] [-p] [files]:: |
340 |
Print the revision history of the specified files or the entire project. |
|
177 | 341 |
|
509 | 342 |
By default this command outputs: changeset id and hash, tags, |
343 |
parents, user, date and time, and a summary for each commit. The |
|
344 |
-v switch adds some more detail, such as changed files, manifest |
|
345 |
hashes or message signatures. |
|
346 |
||
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
347 |
options: |
1036 | 348 |
-I, --include <pat> include names matching the given patterns |
349 |
-X, --exclude <pat> exclude names matching the given patterns |
|
350 |
-r, --rev <A> show the specified revision or range |
|
351 |
-p, --patch show patch |
|
552
2204311609a0
Allow specifying revisions in 'hg log' like with 'hg diff'.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
523
diff
changeset
|
352 |
|
509 | 353 |
aliases: history |
497 | 354 |
|
438 | 355 |
manifest [revision]:: |
497 | 356 |
Print a list of version controlled files for the given revision. |
357 |
||
358 |
The manifest is the list of files being version controlled. If no revision |
|
359 |
is given then the tip is used. |
|
438 | 360 |
|
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
361 |
outgoing [-p] [dest]:: |
928
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
362 |
Show changesets not found in the specified destination repo or the |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
363 |
default push repo. These are the changesets that would be pushed |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
364 |
if a push was requested. |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
365 |
|
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
366 |
options: |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
367 |
-p, --patch show patch |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
368 |
|
940 | 369 |
aliases: out |
370 |
||
438 | 371 |
parents:: |
372 |
Print the working directory's parent revisions. |
|
373 |
||
924
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
374 |
paths [NAME]:: |
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
375 |
Show definition of symbolic path name NAME. If no name is given, show |
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
376 |
definition of available names. |
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
377 |
|
951
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
378 |
Path names are defined in the [paths] section of /etc/mercurial/hgrc |
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
379 |
and $HOME/.hgrc. If run inside a repository, .hg/hgrc is used, too. |
924
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
380 |
|
438 | 381 |
pull <repository path>:: |
498 | 382 |
Pull changes from a remote repository to a local one. |
497 | 383 |
|
498 | 384 |
This finds all changes from the repository at the specified path |
385 |
or URL and adds them to the local repository. By default, this |
|
386 |
does not update the copy of the project in the working directory. |
|
438 | 387 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
388 |
Valid URLs are of the form: |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
389 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
390 |
local/filesystem/path |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
391 |
http://[user@]host[:port][/path] |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
392 |
https://[user@]host[:port][/path] |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
393 |
ssh://[user@]host[:port][/path] |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
394 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
395 |
SSH requires an accessible shell account on the destination |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
396 |
machine and a copy of hg in the remote path. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
397 |
|
438 | 398 |
options: |
399 |
-u, --update update the working directory to tip after pull |
|
963
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
400 |
-e, --ssh specify ssh command to use |
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
401 |
--remotecmd specify hg command to run on the remote side |
438 | 402 |
|
403 |
push <destination>:: |
|
497 | 404 |
Push changes from the local repository to the given destination. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
405 |
|
498 | 406 |
This is the symmetrical operation for pull. It helps to move |
407 |
changes from the current repository to a different one. If the |
|
408 |
destination is local this is identical to a pull in that directory |
|
409 |
from the current one. |
|
438 | 410 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
411 |
By default, push will refuse to run if it detects the result would |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
412 |
increase the number of remote heads. This generally indicates the |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
413 |
the client has forgotten to sync and merge before pushing. |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
414 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
415 |
Valid URLs are of the form: |
438 | 416 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
417 |
local/filesystem/path |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
418 |
ssh://[user@]host[:port][/path] |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
419 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
420 |
SSH requires an accessible shell account on the destination |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
421 |
machine and a copy of hg in the remote path. |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
422 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
423 |
options: |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
424 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
425 |
-f, --force force update |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
426 |
-e, --ssh specify ssh command to use |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
427 |
--remotecmd specify hg command to run on the remote side |
438 | 428 |
|
747 | 429 |
rawcommit [-p -d -u -F -m -l]:: |
497 | 430 |
Lowlevel commit, for use in helper scripts. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
431 |
|
497 | 432 |
This command is not intended to be used by normal users, as it is |
433 |
primarily useful for importing from other SCMs. |
|
177 | 434 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
435 |
recover:: |
497 | 436 |
Recover from an interrupted commit or pull. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
437 |
|
497 | 438 |
This command tries to fix the repository status after an interrupted |
439 |
operation. It should only be necessary when Mercurial suggests it. |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
440 |
|
1188
b3ceb2d470fc
Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1187
diff
changeset
|
441 |
remove [options] [files ...]:: |
497 | 442 |
Schedule the indicated files for removal from the repository. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
443 |
|
1045
b35d5b86e240
run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1036
diff
changeset
|
444 |
This command schedules the files to be removed at the next commit. |
498 | 445 |
This only removes files from the current branch, not from the |
1247
7a70dafbf4b9
Make remove command really unlink files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1218
diff
changeset
|
446 |
entire project history. If the files still exist in the working |
7a70dafbf4b9
Make remove command really unlink files.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1218
diff
changeset
|
447 |
directory, they will be deleted from it. |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
448 |
|
438 | 449 |
aliases: rm |
177 | 450 |
|
588 | 451 |
revert [names ...]:: |
452 |
Revert any uncommitted modifications made to the named files or |
|
453 |
directories. This restores the contents of the affected files to |
|
454 |
an unmodified state. |
|
455 |
||
456 |
If a file has been deleted, it is recreated. If the executable |
|
457 |
mode of a file was changed, it is reset. |
|
458 |
||
459 |
If a directory is given, all files in that directory and its |
|
460 |
subdirectories are reverted. |
|
461 |
||
462 |
If no arguments are given, all files in the current directory and |
|
463 |
its subdirectories are reverted. |
|
464 |
||
465 |
options: |
|
466 |
-r, --rev <rev> revision to revert to |
|
467 |
-n, --nonrecursive do not recurse into subdirectories |
|
468 |
||
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
469 |
root:: |
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
470 |
Print the root directory of the current repository. |
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
471 |
|
606
ea4526f9b1a5
[PATCH] Fix thinko in "serve" man page entry.
mpm@selenic.com
parents:
605
diff
changeset
|
472 |
serve [options]:: |
438 | 473 |
Start a local HTTP repository browser and pull server. |
474 |
||
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
475 |
By default, the server logs accesses to stdout and errors to |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
476 |
stderr. Use the "-A" and "-E" options to log to files. |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
477 |
|
438 | 478 |
options: |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
479 |
-A, --accesslog <file> name of access log file to write to |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
480 |
-E, --errorlog <file> name of error log file to write to |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
481 |
-a, --address <addr> address to use |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
482 |
-p, --port <n> port to use (default: 8000) |
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
483 |
-n, --name <name> name to show in web pages (default: working dir) |
438 | 484 |
-t, --templatedir <path> web templates to use |
825
0108c602feb9
Add an option to hg serve to serve file using IPv6
Samuel Tardieu <sam@rfc1149.net>
parents:
814
diff
changeset
|
485 |
-6, --ipv6 use IPv6 in addition to IPv4 |
177 | 486 |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
487 |
status [options] [files]:: |
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
488 |
Show changed files in the working directory. If no names are |
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
489 |
given, all files are shown. Otherwise, only files matching the |
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
490 |
given names are shown. |
438 | 491 |
|
497 | 492 |
The codes used to show the status of files are: |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
493 |
|
746 | 494 |
M = changed |
438 | 495 |
A = added |
496 |
R = removed |
|
497 |
? = not tracked |
|
498 |
||
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
499 |
options: |
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
500 |
|
840
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
501 |
-m, --modified show only modified files |
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
502 |
-a, --added show only added files |
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
503 |
-r, --removed show only removed files |
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
504 |
-u, --unknown show only unknown (not tracked) files |
1113 | 505 |
-n, --no-status hide status prefix |
1088
39b916b1d8e4
updated manpage for new options of status
TK Soh <teekaysoh@yahoo.com>
parents:
1084
diff
changeset
|
506 |
-0, --print0 end filenames with NUL, for use with xargs |
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
507 |
-I, --include <pat> include names matching the given patterns |
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
508 |
-X, --exclude <pat> exclude names matching the given patterns |
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
509 |
|
750 | 510 |
tag [-l -m <text> -d <datecode> -u <user>] <name> [revision]:: |
497 | 511 |
Name a particular revision using <name>. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
512 |
|
497 | 513 |
Tags are used to name particular revisions of the repository and are |
514 |
very useful to compare different revision, to go back to significant |
|
498 | 515 |
earlier versions or to mark branch points as releases, etc. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
516 |
|
498 | 517 |
If no revision is given, the tip is used. |
438 | 518 |
|
498 | 519 |
To facilitate version control, distribution, and merging of tags, |
520 |
they are stored as a file named ".hgtags" which is managed |
|
521 |
similarly to other project files and can be hand-edited if |
|
522 |
necessary. |
|
523 |
||
438 | 524 |
options: |
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
525 |
-l, --local make the tag local |
761
0fb498458905
Change all references to -t --text commit message to -m and --message.
Andrew Thompson <andrewkt@aktzero.com>
parents:
750
diff
changeset
|
526 |
-m, --message <text> message for tag commit log entry |
438 | 527 |
-d, --date <datecode> datecode for commit |
528 |
-u, --user <user> user for commit |
|
177 | 529 |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
530 |
Note: Local tags are not version-controlled or distributed and are |
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
531 |
stored in the .hg/localtags file. If there exists a local tag and |
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
532 |
a public tag with the same name, local tag is used. |
498 | 533 |
|
177 | 534 |
tags:: |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
535 |
List the repository tags. |
438 | 536 |
|
498 | 537 |
This lists both regular and local tags. |
497 | 538 |
|
438 | 539 |
tip:: |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
540 |
Show the tip revision. |
177 | 541 |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
542 |
unbundle <file>:: |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
543 |
(EXPERIMENTAL) |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
544 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
545 |
Apply a compressed changegroup file generated by the bundle |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
546 |
command. |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
547 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
548 |
undo:: |
438 | 549 |
Undo the last commit or pull transaction. |
550 |
||
595 | 551 |
Roll back the last pull or commit transaction on the |
552 |
repository, restoring the project to its earlier state. |
|
553 |
||
554 |
This command should be used with care. There is only one level of |
|
555 |
undo and there is no redo. |
|
556 |
||
557 |
This command is not intended for use on public repositories. Once |
|
558 |
a change is visible for pull by other users, undoing it locally is |
|
559 |
ineffective. |
|
560 |
||
438 | 561 |
update [-m -C] [revision]:: |
498 | 562 |
Update the working directory to the specified revision. |
438 | 563 |
|
498 | 564 |
By default, update will refuse to run if doing so would require |
565 |
merging or discarding local changes. |
|
566 |
||
567 |
With the -m option, a merge will be performed. |
|
568 |
||
569 |
With the -C option, local changes will be lost. |
|
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
570 |
|
438 | 571 |
options: |
572 |
-m, --merge allow merging of branches |
|
573 |
-C, --clean overwrite locally modified files |
|
574 |
||
575 |
aliases: up checkout co |
|
576 |
||
577 |
verify:: |
|
578 |
Verify the integrity of the current repository. |
|
579 |
||
580 |
This will perform an extensive check of the repository's |
|
581 |
integrity, validating the hashes and checksums of each entry in |
|
582 |
the changelog, manifest, and tracked files, as well as the |
|
583 |
integrity of their crosslinks and indices. |
|
584 |
||
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
585 |
FILE NAME PATTERNS |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
586 |
------------------ |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
587 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
588 |
Mercurial accepts several notations for identifying one or more |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
589 |
file at a time. |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
590 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
591 |
By default, Mercurial treats file names as shell-style extended |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
592 |
glob patterns. |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
593 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
594 |
Alternate pattern notations must be specified explicitly. |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
595 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
596 |
To use a plain path name without any pattern matching, start a |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
597 |
name with "path:". These path names must match completely, from |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
598 |
the root of the current repository. |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
599 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
600 |
To use an extended glob, start a name with "glob:". Globs are |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
601 |
rooted at the current directory; a glob such as "*.c" will match |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
602 |
files ending in ".c" in the current directory only. |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
603 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
604 |
The supported glob syntax extensions are "**" to match any string |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
605 |
across path separators, and "{a,b}" to mean "a or b". |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
606 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
607 |
To use a Perl/Python regular expression, start a name with "re:". |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
608 |
Regexp pattern matching is anchored at the root of the repository. |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
609 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
610 |
Plain examples: |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
611 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
612 |
path:foo/bar a name bar in a directory named foo in the root of |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
613 |
the repository |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
614 |
path:path:name a file or directory named "path:name" |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
615 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
616 |
Glob examples: |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
617 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
618 |
glob:*.c any name ending in ".c" in the current directory |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
619 |
*.c any name ending in ".c" in the current directory |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
620 |
**.c any name ending in ".c" in the current directory, or |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
621 |
any subdirectory |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
622 |
foo/*.c any name ending in ".c" in the directory foo |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
623 |
foo/**.c any name ending in ".c" in the directory foo, or any |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
624 |
subdirectory |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
625 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
626 |
Regexp examples: |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
627 |
|
1045
b35d5b86e240
run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1036
diff
changeset
|
628 |
re:.*\.c$ any name ending in ".c", anywhere in the repository |
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
629 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
630 |
|
580 | 631 |
SPECIFYING SINGLE REVISIONS |
632 |
--------------------------- |
|
633 |
||
634 |
Mercurial accepts several notations for identifying individual |
|
635 |
revisions. |
|
636 |
||
637 |
A plain integer is treated as a revision number. Negative |
|
638 |
integers are treated as offsets from the tip, with -1 denoting the |
|
639 |
tip. |
|
640 |
||
641 |
A 40-digit hexadecimal string is treated as a unique revision |
|
642 |
identifier. |
|
643 |
||
644 |
A hexadecimal string less than 40 characters long is treated as a |
|
645 |
unique revision identifier, and referred to as a short-form |
|
646 |
identifier. A short-form identifier is only valid if it is the |
|
647 |
prefix of one full-length identifier. |
|
648 |
||
649 |
Any other string is treated as a tag name, which is a symbolic |
|
650 |
name associated with a revision identifier. Tag names may not |
|
651 |
contain the ":" character. |
|
652 |
||
653 |
The reserved name "tip" is a special tag that always identifies |
|
654 |
the most recent revision. |
|
655 |
||
656 |
SPECIFYING MULTIPLE REVISIONS |
|
657 |
----------------------------- |
|
658 |
||
659 |
When Mercurial accepts more than one revision, they may be |
|
660 |
specified individually, or provided as a continuous range, |
|
661 |
separated by the ":" character. |
|
662 |
||
663 |
The syntax of range notation is [BEGIN]:[END], where BEGIN and END |
|
664 |
are revision identifiers. Both BEGIN and END are optional. If |
|
665 |
BEGIN is not specified, it defaults to revision number 0. If END |
|
666 |
is not specified, it defaults to the tip. The range ":" thus |
|
667 |
means "all revisions". |
|
668 |
||
669 |
If BEGIN is greater than END, revisions are treated in reverse |
|
670 |
order. |
|
671 |
||
860
8ccbac05cf59
Use correct term "closed interval" for ranges.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
672 |
A range acts as a closed interval. This means that a range of 3:5 |
580 | 673 |
gives 3, 4 and 5. Similarly, a range of 4:2 gives 4, 3, and 2. |
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
674 |
|
177 | 675 |
ENVIRONMENT VARIABLES |
676 |
--------------------- |
|
438 | 677 |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
678 |
HGEDITOR:: |
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
679 |
This is the name of the editor to use when committing. Defaults to the |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
680 |
value of EDITOR. |
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
681 |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
682 |
(deprecated, use .hgrc) |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
683 |
|
177 | 684 |
HGMERGE:: |
498 | 685 |
An executable to use for resolving merge conflicts. The program |
438 | 686 |
will be executed with three arguments: local file, remote file, |
687 |
ancestor file. |
|
688 |
||
689 |
The default program is "hgmerge", which is a shell script provided |
|
690 |
by Mercurial with some sensible defaults. |
|
177 | 691 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
692 |
(deprecated, use .hgrc) |
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
693 |
|
177 | 694 |
HGUSER:: |
438 | 695 |
This is the string used for the author of a commit. |
177 | 696 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
697 |
(deprecated, use .hgrc) |
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
698 |
|
177 | 699 |
EMAIL:: |
438 | 700 |
If HGUSER is not set, this will be used as the author for a commit. |
177 | 701 |
|
702 |
LOGNAME:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
703 |
If neither HGUSER nor EMAIL is set, LOGNAME will be used (with |
438 | 704 |
'@hostname' appended) as the author value for a commit. |
177 | 705 |
|
706 |
EDITOR:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
707 |
This is the name of the editor used in the hgmerge script. It will be |
498 | 708 |
used for commit messages if HGEDITOR isn't set. Defaults to 'vi'. |
438 | 709 |
|
710 |
PYTHONPATH:: |
|
711 |
This is used by Python to find imported modules and may need to be set |
|
712 |
appropriately if Mercurial is not installed system-wide. |
|
177 | 713 |
|
714 |
FILES |
|
715 |
----- |
|
716 |
.hgignore:: |
|
438 | 717 |
This file contains regular expressions (one per line) that describe file |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
718 |
names that should be ignored by hg. |
177 | 719 |
|
720 |
.hgtags:: |
|
438 | 721 |
This file contains changeset hash values and text tag names (one of each |
1045
b35d5b86e240
run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1036
diff
changeset
|
722 |
separated by spaces) that correspond to tagged versions of the repository |
177 | 723 |
contents. |
724 |
||
951
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
725 |
/etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc:: |
438 | 726 |
This file contains defaults and configuration. Values in .hg/hgrc |
951
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
727 |
override those in $HOME/.hgrc, and these override settings made in the |
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
728 |
global /etc/mercurial/hgrc configuration. See hgrc(5) for details of |
859de3ebc041
Read global config file /etc/mercurial/hgrc and fix reading hgrc on Windows.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
940
diff
changeset
|
729 |
the contents and format of these files. |
321 | 730 |
|
177 | 731 |
BUGS |
732 |
---- |
|
733 |
Probably lots, please post them to the mailing list (See Resources below) |
|
734 |
when you find them. |
|
735 |
||
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
736 |
SEE ALSO |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
737 |
-------- |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
738 |
hgrc(5) |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
739 |
|
177 | 740 |
AUTHOR |
741 |
------ |
|
742 |
Written by Matt Mackall <mpm@selenic.com> |
|
743 |
||
744 |
RESOURCES |
|
745 |
--------- |
|
746 |
http://selenic.com/mercurial[Main Web Site] |
|
747 |
||
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
748 |
http://www.serpentine.com/mercurial[Wiki site] |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
749 |
|
177 | 750 |
http://selenic.com/hg[Source code repository] |
751 |
||
752 |
http://selenic.com/mailman/listinfo/mercurial[Mailing list] |
|
753 |
||
754 |
COPYING |
|
755 |
------- |
|
756 |
Copyright (C) 2005 Matt Mackall. |
|
757 |
Free use of this software is granted under the terms of the GNU General |
|
758 |
Public License (GPL). |