author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
Fri, 27 Jan 2006 12:15:39 +0100 | |
changeset 1643 | 747c8d03bd29 |
parent 1608 | 722fd16f6f8c |
child 1657 | dbb8bba48510 |
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 |
|
1522 | 90 |
annotate [-r <rev> -u -n -c -d] [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 |
|
1522 | 106 |
-d, --date list the commit date |
438 | 107 |
-c, --changeset list the changeset |
108 |
-n, --number list the revision number (default) |
|
177 | 109 |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
110 |
bundle <file> <other>:: |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
111 |
(EXPERIMENTAL) |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
112 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
113 |
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
|
114 |
not found in the other repository. |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
115 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
116 |
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
|
117 |
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
|
118 |
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
|
119 |
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
|
120 |
extension is ".hg". |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
121 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
122 |
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
|
123 |
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
|
124 |
|
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
125 |
cat [options] <file ...>:: |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
126 |
Print the specified files as they were at the given revision. |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
127 |
If no revision is given then the tip is used. |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
128 |
|
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
129 |
Output may be to a file, in which case the name of the file is |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
130 |
given using a format string. The formatting rules are the same as |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
131 |
for the export command, with the following additions: |
497 | 132 |
|
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
133 |
%s basename of file being printed |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
134 |
%d dirname of file being printed, or '.' if in repo root |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
135 |
%p root-relative path name of file being printed |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
136 |
|
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
137 |
options: |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
138 |
-I, --include <pat> include names matching the given patterns |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
139 |
-X, --exclude <pat> exclude names matching the given patterns |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
140 |
-o, --output <filespec> print output to file with formatted name |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
141 |
-r, --rev <rev> print the given revision |
177 | 142 |
|
1281
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
143 |
clone [options] <source> [dest]:: |
497 | 144 |
Create a copy of an existing repository in a new directory. |
145 |
||
523
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
509
diff
changeset
|
146 |
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
|
147 |
basename of the source. |
497 | 148 |
|
1281
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
149 |
The location of the source is added to the new repository's |
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
150 |
.hg/hgrc file, as the default to be used for future pulls. |
497 | 151 |
|
1281
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
152 |
For efficiency, hardlinks are used for cloning whenever the source |
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
153 |
and destination are on the same filesystem. Some filesystems, |
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
154 |
such as AFS, implement hardlinking incorrectly, but do not report |
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
155 |
errors. In these cases, use the --pull option to avoid |
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
156 |
hardlinking. |
497 | 157 |
|
158 |
options: |
|
505 | 159 |
-U, --noupdate do not update the new working directory |
1281
84df9951532a
Add --pull option to clone.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1274
diff
changeset
|
160 |
--pull use pull protocol to copy metadata |
963
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
161 |
-e, --ssh specify ssh command to use |
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
162 |
--remotecmd specify hg command to run on the remote side |
497 | 163 |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
811
diff
changeset
|
164 |
commit [options] [files...]:: |
498 | 165 |
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
|
166 |
|
498 | 167 |
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
|
168 |
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
|
169 |
|
498 | 170 |
The HGEDITOR or EDITOR environment variables are used to start an |
171 |
editor to add a commit comment. |
|
497 | 172 |
|
173 |
Options: |
|
174 |
||
175 |
-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
|
176 |
-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
|
177 |
-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
|
178 |
-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
|
179 |
-l, --logfile <file> read the commit message from <file> |
497 | 180 |
-d, --date <datecode> record datecode as commit date |
181 |
-u, --user <user> record user as commiter |
|
182 |
||
183 |
aliases: ci |
|
184 |
||
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
185 |
copy <source ...> <dest>:: |
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
186 |
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
|
187 |
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
|
188 |
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
|
189 |
|
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
190 |
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
|
191 |
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
|
192 |
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
|
193 |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
194 |
This command takes effect in the next commit. |
497 | 195 |
|
1256
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
196 |
NOTE: This command should be treated as experimental. While it |
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
197 |
should properly record copied files, this information is not yet |
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
198 |
fully used by merge, nor fully reported by log. |
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
199 |
|
1249
a5355fa5e33a
Fix up copy command to behave more like regular "cp".
Bryan O'Sullivan <bos@serpentine.com>
parents:
1247
diff
changeset
|
200 |
Options: |
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
201 |
-A, --after record a copy that has already occurred |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
202 |
-I, --include <pat> include names matching the given patterns |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
203 |
-X, --exclude <pat> exclude names matching the given patterns |
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
204 |
-f, --force forcibly copy over an existing managed file |
1308
2073e5a71008
Cleanup of tabs and trailing spaces.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1281
diff
changeset
|
205 |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
206 |
aliases: cp |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
207 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
208 |
diff [-a] [-r revision] [-r revision] [files ...]:: |
497 | 209 |
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
|
210 |
|
497 | 211 |
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
|
212 |
|
498 | 213 |
When two revision arguments are given, then changes are shown |
214 |
between those revisions. If only one revision is specified then |
|
215 |
that revision is compared to the working directory, and, when no |
|
216 |
revisions are specified, the working directory files are compared |
|
217 |
to its parent. |
|
497 | 218 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
219 |
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
|
220 |
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
|
221 |
probably with undesirable results. |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
222 |
|
734
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
223 |
options: |
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
224 |
-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
|
225 |
-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
|
226 |
-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
|
227 |
|
580 | 228 |
export [-o filespec] [revision] ...:: |
229 |
Print the changeset header and diffs for one or more revisions. |
|
230 |
||
231 |
The information shown in the changeset header is: author, |
|
232 |
changeset hash, parent and commit comment. |
|
233 |
||
234 |
Output may be to a file, in which case the name of the file is |
|
235 |
given using a format string. The formatting rules are as follows: |
|
497 | 236 |
|
580 | 237 |
%% literal "%" character |
238 |
%H changeset hash (40 bytes of hexadecimal) |
|
239 |
%N number of patches being generated |
|
240 |
%R changeset revision number |
|
241 |
%b basename of the exporting repository |
|
242 |
%h short-form changeset hash (12 bytes of hexadecimal) |
|
243 |
%n zero-padded sequence number, starting at 1 |
|
244 |
%r zero-padded changeset revision number |
|
245 |
||
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
246 |
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
|
247 |
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
|
248 |
probably with undesirable results. |
580 | 249 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
250 |
options: |
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
251 |
-a, --text treat all files as text |
1254
e6560042b7b8
Switch cat command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1253
diff
changeset
|
252 |
-o, --output <filespec> print output to file with formatted name |
497 | 253 |
|
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
254 |
forget [options] [files]:: |
497 | 255 |
Undo an 'hg add' scheduled for the next commit. |
256 |
||
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
257 |
options: |
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
258 |
-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
|
259 |
-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
|
260 |
|
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
261 |
grep [options] pattern [files]:: |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
262 |
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
|
263 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
264 |
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
|
265 |
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
|
266 |
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
|
267 |
a match appears. |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
268 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
269 |
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
|
270 |
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
|
271 |
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
|
272 |
becomes a non-match, or "+" for a non-match that becomes a match), |
1212 | 273 |
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
|
274 |
|
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
275 |
options: |
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
276 |
-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
|
277 |
-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
|
278 |
-X, --exclude <pat> exclude names matching the given patterns |
1212 | 279 |
--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
|
280 |
-i, --ignore-case ignore case when matching |
1274 | 281 |
-l, --files-with-matches print only filenames and revs that match |
1146
9061f79c6c6f
grep: extend functionality, add man page entry, add unit test.
bos@serpentine.internal.keyresearch.com
parents:
1113
diff
changeset
|
282 |
-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
|
283 |
-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
|
284 |
-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
|
285 |
|
497 | 286 |
heads:: |
287 |
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
|
288 |
|
498 | 289 |
Repository "heads" are changesets that don't have children |
290 |
changesets. They are where development generally takes place and |
|
291 |
are the usual targets for update and merge operations. |
|
497 | 292 |
|
293 |
identify:: |
|
294 |
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
|
295 |
|
497 | 296 |
This summary identifies the repository state using one or two parent |
297 |
hash identifiers, followed by a "+" if there are uncommitted changes |
|
298 |
in the working directory, followed by a list of tags for this revision. |
|
299 |
||
300 |
aliases: id |
|
301 |
||
966
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
963
diff
changeset
|
302 |
import [-p <n> -b <base> -f] <patches>:: |
497 | 303 |
Import a list of patches and commit them individually. |
304 |
||
1211 | 305 |
If there are outstanding changes in the working directory, import |
306 |
will abort unless given the -f flag. |
|
307 |
||
1190
737f9b90c571
Make import command reject patches that resemble email messages.
bos@serpentine.internal.keyresearch.com
parents:
1188
diff
changeset
|
308 |
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
|
309 |
"From " or looks like an RFC822 header), it will not be applied |
1211 | 310 |
unless the -f option is used. The importer neither parses nor |
311 |
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
|
312 |
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
|
313 |
|
497 | 314 |
options: |
315 |
-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
|
316 |
meaning as the corresponding patch option |
497 | 317 |
-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
|
318 |
-f, --force skip check for outstanding uncommitted changes |
497 | 319 |
|
320 |
aliases: patch |
|
321 |
||
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
322 |
incoming [-p] [source]:: |
928
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
323 |
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
|
324 |
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
|
325 |
was requested. |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
326 |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
327 |
Currently only local repositories are supported. |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
328 |
|
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
329 |
options: |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
330 |
-p, --patch show patch |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
331 |
|
940 | 332 |
aliases: in |
333 |
||
907
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
334 |
init [dest]:: |
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
335 |
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
|
336 |
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
|
337 |
|
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
338 |
If no directory is given, the current directory is used. |
177 | 339 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
340 |
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
|
341 |
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
|
342 |
given patterns. |
627 | 343 |
|
344 |
This command searches the current directory and its |
|
345 |
subdirectories. To search an entire repository, move to the root |
|
346 |
of the repository. |
|
347 |
||
348 |
If no patterns are given to match, this command prints all file |
|
349 |
names. |
|
350 |
||
351 |
If you want to feed the output of this command into the "xargs" |
|
352 |
command, use the "-0" option to both this command and "xargs". |
|
353 |
This will avoid the problem of "xargs" treating single filenames |
|
1274 | 354 |
that contain white space as multiple filenames. |
627 | 355 |
|
356 |
options: |
|
357 |
||
358 |
-0, --print0 end filenames with NUL, for use with xargs |
|
359 |
-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
|
360 |
-I, --include <pat> include names matching the given patterns |
627 | 361 |
-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
|
362 |
-X, --exclude <pat> exclude names matching the given patterns |
627 | 363 |
|
1036 | 364 |
log [-r revision ...] [-p] [files]:: |
365 |
Print the revision history of the specified files or the entire project. |
|
177 | 366 |
|
509 | 367 |
By default this command outputs: changeset id and hash, tags, |
368 |
parents, user, date and time, and a summary for each commit. The |
|
369 |
-v switch adds some more detail, such as changed files, manifest |
|
370 |
hashes or message signatures. |
|
371 |
||
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
372 |
options: |
1036 | 373 |
-I, --include <pat> include names matching the given patterns |
374 |
-X, --exclude <pat> exclude names matching the given patterns |
|
375 |
-r, --rev <A> show the specified revision or range |
|
376 |
-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
|
377 |
|
509 | 378 |
aliases: history |
497 | 379 |
|
438 | 380 |
manifest [revision]:: |
497 | 381 |
Print a list of version controlled files for the given revision. |
382 |
||
383 |
The manifest is the list of files being version controlled. If no revision |
|
384 |
is given then the tip is used. |
|
438 | 385 |
|
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
386 |
outgoing [-p] [dest]:: |
928
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
387 |
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
|
388 |
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
|
389 |
if a push was requested. |
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
390 |
|
1192
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
391 |
options: |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
392 |
-p, --patch show patch |
6e165de907c5
Add -p to incoming and outgoing commands to show patch
TK Soh <teekaysoh@yahoo.com>
parents:
1191
diff
changeset
|
393 |
|
940 | 394 |
aliases: out |
395 |
||
438 | 396 |
parents:: |
397 |
Print the working directory's parent revisions. |
|
398 |
||
924
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
399 |
paths [NAME]:: |
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
400 |
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
|
401 |
definition of available names. |
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
402 |
|
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
|
403 |
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
|
404 |
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
|
405 |
|
438 | 406 |
pull <repository path>:: |
498 | 407 |
Pull changes from a remote repository to a local one. |
497 | 408 |
|
498 | 409 |
This finds all changes from the repository at the specified path |
410 |
or URL and adds them to the local repository. By default, this |
|
411 |
does not update the copy of the project in the working directory. |
|
438 | 412 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
413 |
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
|
414 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
415 |
local/filesystem/path |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
416 |
http://[user@]host[:port][/path] |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
417 |
https://[user@]host[:port][/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] |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
419 |
|
1265
979c04997448
Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1256
diff
changeset
|
420 |
SSH requires an accessible shell account on the destination machine |
979c04997448
Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1256
diff
changeset
|
421 |
and a copy of hg in the remote path. With SSH, paths are relative |
979c04997448
Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1256
diff
changeset
|
422 |
to the remote user's home directory by default; use two slashes at |
979c04997448
Update doc for ssh URL, describing path handling more clearly.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1256
diff
changeset
|
423 |
the start of a path to specify it as relative to the filesystem root. |
1216
1639fc7c2ccf
Cleanup of tabs and trailing spaces in documentation.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1212
diff
changeset
|
424 |
|
438 | 425 |
options: |
426 |
-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
|
427 |
-e, --ssh specify ssh command to use |
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
428 |
--remotecmd specify hg command to run on the remote side |
438 | 429 |
|
430 |
push <destination>:: |
|
497 | 431 |
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
|
432 |
|
498 | 433 |
This is the symmetrical operation for pull. It helps to move |
434 |
changes from the current repository to a different one. If the |
|
435 |
destination is local this is identical to a pull in that directory |
|
436 |
from the current one. |
|
438 | 437 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
438 |
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
|
439 |
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
|
440 |
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
|
441 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
442 |
Valid URLs are of the form: |
438 | 443 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
444 |
local/filesystem/path |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
445 |
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
|
446 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
447 |
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
|
448 |
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
|
449 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
450 |
options: |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
451 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
452 |
-f, --force force update |
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
453 |
-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
|
454 |
--remotecmd specify hg command to run on the remote side |
438 | 455 |
|
747 | 456 |
rawcommit [-p -d -u -F -m -l]:: |
497 | 457 |
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
|
458 |
|
497 | 459 |
This command is not intended to be used by normal users, as it is |
460 |
primarily useful for importing from other SCMs. |
|
177 | 461 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
462 |
recover:: |
497 | 463 |
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
|
464 |
|
497 | 465 |
This command tries to fix the repository status after an interrupted |
466 |
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
|
467 |
|
1188
b3ceb2d470fc
Fix up remove command to use walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1187
diff
changeset
|
468 |
remove [options] [files ...]:: |
497 | 469 |
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
|
470 |
|
1045
b35d5b86e240
run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1036
diff
changeset
|
471 |
This command schedules the files to be removed at the next commit. |
498 | 472 |
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
|
473 |
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
|
474 |
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
|
475 |
|
438 | 476 |
aliases: rm |
177 | 477 |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
478 |
rename <source ...> <dest>:: |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
479 |
Mark dest as copies of sources; mark sources for deletion. If |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
480 |
dest is a directory, copies are put in that directory. If dest is |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
481 |
a file, there can only be one source. |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
482 |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
483 |
By default, this command copies the contents of files as they |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
484 |
stand in the working directory. If invoked with --after, the |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
485 |
operation is recorded, but no copying is performed. |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
486 |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
487 |
This command takes effect in the next commit. |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
488 |
|
1256
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
489 |
NOTE: This command should be treated as experimental. While it |
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
490 |
should properly record rename files, this information is not yet |
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
491 |
fully used by merge, nor fully reported by log. |
8054fdb0b145
mark copy/rename as experimental in the docs
mpm@selenic.com
parents:
1254
diff
changeset
|
492 |
|
1253
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
493 |
Options: |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
494 |
-A, --after record a rename that has already occurred |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
495 |
-f, --force forcibly copy over an existing managed file |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
496 |
|
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
497 |
aliases: mv |
a45e717c61a8
Add rename/mv command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1249
diff
changeset
|
498 |
|
588 | 499 |
revert [names ...]:: |
1608
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
500 |
The revert command has two modes of operation. |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
501 |
|
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
502 |
In its default mode, it reverts any uncommitted modifications made |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
503 |
to the named files or directories. This restores the contents of |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
504 |
the affected files to an unmodified state. |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
505 |
|
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
506 |
Using the -r option, it reverts the given files or directories to |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
507 |
their state as of an earlier revision. This can be helpful to "roll |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
508 |
back" some or all of a change that should not have been committed. |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
509 |
|
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
510 |
Revert modifies the working directory. It does not commit any |
722fd16f6f8c
document revert command more accurately.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1522
diff
changeset
|
511 |
changes, or change the parent of the current working directory. |
588 | 512 |
|
513 |
If a file has been deleted, it is recreated. If the executable |
|
514 |
mode of a file was changed, it is reset. |
|
515 |
||
516 |
If a directory is given, all files in that directory and its |
|
517 |
subdirectories are reverted. |
|
518 |
||
519 |
If no arguments are given, all files in the current directory and |
|
520 |
its subdirectories are reverted. |
|
521 |
||
522 |
options: |
|
523 |
-r, --rev <rev> revision to revert to |
|
524 |
-n, --nonrecursive do not recurse into subdirectories |
|
525 |
||
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
526 |
root:: |
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
527 |
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
|
528 |
|
606
ea4526f9b1a5
[PATCH] Fix thinko in "serve" man page entry.
mpm@selenic.com
parents:
605
diff
changeset
|
529 |
serve [options]:: |
438 | 530 |
Start a local HTTP repository browser and pull server. |
531 |
||
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
532 |
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
|
533 |
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
|
534 |
|
438 | 535 |
options: |
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
536 |
-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
|
537 |
-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
|
538 |
-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
|
539 |
-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
|
540 |
-n, --name <name> name to show in web pages (default: working dir) |
438 | 541 |
-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
|
542 |
-6, --ipv6 use IPv6 in addition to IPv4 |
177 | 543 |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
544 |
status [options] [files]:: |
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
545 |
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
|
546 |
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
|
547 |
given names are shown. |
438 | 548 |
|
497 | 549 |
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
|
550 |
|
746 | 551 |
M = changed |
438 | 552 |
A = added |
553 |
R = removed |
|
554 |
? = not tracked |
|
555 |
||
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
556 |
options: |
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
557 |
|
840
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
558 |
-m, --modified show only modified files |
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
559 |
-a, --added show only added files |
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
560 |
-r, --removed show only removed files |
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
561 |
-u, --unknown show only unknown (not tracked) files |
1113 | 562 |
-n, --no-status hide status prefix |
1088
39b916b1d8e4
updated manpage for new options of status
TK Soh <teekaysoh@yahoo.com>
parents:
1084
diff
changeset
|
563 |
-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
|
564 |
-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
|
565 |
-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
|
566 |
|
750 | 567 |
tag [-l -m <text> -d <datecode> -u <user>] <name> [revision]:: |
497 | 568 |
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
|
569 |
|
497 | 570 |
Tags are used to name particular revisions of the repository and are |
571 |
very useful to compare different revision, to go back to significant |
|
498 | 572 |
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
|
573 |
|
498 | 574 |
If no revision is given, the tip is used. |
438 | 575 |
|
498 | 576 |
To facilitate version control, distribution, and merging of tags, |
577 |
they are stored as a file named ".hgtags" which is managed |
|
578 |
similarly to other project files and can be hand-edited if |
|
579 |
necessary. |
|
580 |
||
438 | 581 |
options: |
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
582 |
-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
|
583 |
-m, --message <text> message for tag commit log entry |
438 | 584 |
-d, --date <datecode> datecode for commit |
585 |
-u, --user <user> user for commit |
|
177 | 586 |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
587 |
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
|
588 |
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
|
589 |
a public tag with the same name, local tag is used. |
498 | 590 |
|
177 | 591 |
tags:: |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
592 |
List the repository tags. |
438 | 593 |
|
498 | 594 |
This lists both regular and local tags. |
497 | 595 |
|
438 | 596 |
tip:: |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
597 |
Show the tip revision. |
177 | 598 |
|
1218
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
599 |
unbundle <file>:: |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
600 |
(EXPERIMENTAL) |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
601 |
|
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
602 |
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
|
603 |
command. |
cde6818e082a
Add preliminary support for the bundle and unbundle commands
mpm@selenic.com
parents:
1216
diff
changeset
|
604 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
605 |
undo:: |
438 | 606 |
Undo the last commit or pull transaction. |
607 |
||
595 | 608 |
Roll back the last pull or commit transaction on the |
609 |
repository, restoring the project to its earlier state. |
|
610 |
||
611 |
This command should be used with care. There is only one level of |
|
612 |
undo and there is no redo. |
|
613 |
||
614 |
This command is not intended for use on public repositories. Once |
|
615 |
a change is visible for pull by other users, undoing it locally is |
|
616 |
ineffective. |
|
617 |
||
438 | 618 |
update [-m -C] [revision]:: |
498 | 619 |
Update the working directory to the specified revision. |
438 | 620 |
|
498 | 621 |
By default, update will refuse to run if doing so would require |
622 |
merging or discarding local changes. |
|
623 |
||
624 |
With the -m option, a merge will be performed. |
|
625 |
||
626 |
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
|
627 |
|
438 | 628 |
options: |
629 |
-m, --merge allow merging of branches |
|
630 |
-C, --clean overwrite locally modified files |
|
631 |
||
632 |
aliases: up checkout co |
|
633 |
||
634 |
verify:: |
|
635 |
Verify the integrity of the current repository. |
|
636 |
||
637 |
This will perform an extensive check of the repository's |
|
638 |
integrity, validating the hashes and checksums of each entry in |
|
639 |
the changelog, manifest, and tracked files, as well as the |
|
640 |
integrity of their crosslinks and indices. |
|
641 |
||
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
642 |
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
|
643 |
------------------ |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
644 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
645 |
Mercurial accepts several notations for identifying one or more |
1274 | 646 |
files at a time. |
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
647 |
|
1274 | 648 |
By default, Mercurial treats filenames as shell-style extended |
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
649 |
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
|
650 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
651 |
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
|
652 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
653 |
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
|
654 |
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
|
655 |
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
|
656 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
657 |
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
|
658 |
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
|
659 |
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
|
660 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
661 |
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
|
662 |
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
|
663 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
664 |
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
|
665 |
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
|
666 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
667 |
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
|
668 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
669 |
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
|
670 |
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
|
671 |
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
|
672 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
673 |
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
|
674 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
675 |
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
|
676 |
*.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
|
677 |
**.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
|
678 |
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
|
679 |
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
|
680 |
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
|
681 |
subdirectory |
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
682 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
683 |
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
|
684 |
|
1045
b35d5b86e240
run the doc/* through aspell.
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
1036
diff
changeset
|
685 |
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
|
686 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
687 |
|
580 | 688 |
SPECIFYING SINGLE REVISIONS |
689 |
--------------------------- |
|
690 |
||
691 |
Mercurial accepts several notations for identifying individual |
|
692 |
revisions. |
|
693 |
||
694 |
A plain integer is treated as a revision number. Negative |
|
695 |
integers are treated as offsets from the tip, with -1 denoting the |
|
696 |
tip. |
|
697 |
||
698 |
A 40-digit hexadecimal string is treated as a unique revision |
|
699 |
identifier. |
|
700 |
||
701 |
A hexadecimal string less than 40 characters long is treated as a |
|
702 |
unique revision identifier, and referred to as a short-form |
|
703 |
identifier. A short-form identifier is only valid if it is the |
|
704 |
prefix of one full-length identifier. |
|
705 |
||
706 |
Any other string is treated as a tag name, which is a symbolic |
|
707 |
name associated with a revision identifier. Tag names may not |
|
708 |
contain the ":" character. |
|
709 |
||
710 |
The reserved name "tip" is a special tag that always identifies |
|
711 |
the most recent revision. |
|
712 |
||
713 |
SPECIFYING MULTIPLE REVISIONS |
|
714 |
----------------------------- |
|
715 |
||
716 |
When Mercurial accepts more than one revision, they may be |
|
717 |
specified individually, or provided as a continuous range, |
|
718 |
separated by the ":" character. |
|
719 |
||
720 |
The syntax of range notation is [BEGIN]:[END], where BEGIN and END |
|
721 |
are revision identifiers. Both BEGIN and END are optional. If |
|
722 |
BEGIN is not specified, it defaults to revision number 0. If END |
|
723 |
is not specified, it defaults to the tip. The range ":" thus |
|
724 |
means "all revisions". |
|
725 |
||
726 |
If BEGIN is greater than END, revisions are treated in reverse |
|
727 |
order. |
|
728 |
||
860
8ccbac05cf59
Use correct term "closed interval" for ranges.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
729 |
A range acts as a closed interval. This means that a range of 3:5 |
580 | 730 |
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
|
731 |
|
177 | 732 |
ENVIRONMENT VARIABLES |
733 |
--------------------- |
|
438 | 734 |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
735 |
HGEDITOR:: |
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
736 |
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
|
737 |
value of EDITOR. |
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
738 |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
739 |
(deprecated, use .hgrc) |
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
740 |
|
177 | 741 |
HGMERGE:: |
498 | 742 |
An executable to use for resolving merge conflicts. The program |
438 | 743 |
will be executed with three arguments: local file, remote file, |
744 |
ancestor file. |
|
745 |
||
746 |
The default program is "hgmerge", which is a shell script provided |
|
747 |
by Mercurial with some sensible defaults. |
|
177 | 748 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
749 |
(deprecated, use .hgrc) |
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
750 |
|
177 | 751 |
HGUSER:: |
438 | 752 |
This is the string used for the author of a commit. |
177 | 753 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
754 |
(deprecated, use .hgrc) |
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
755 |
|
177 | 756 |
EMAIL:: |
438 | 757 |
If HGUSER is not set, this will be used as the author for a commit. |
177 | 758 |
|
759 |
LOGNAME:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
760 |
If neither HGUSER nor EMAIL is set, LOGNAME will be used (with |
438 | 761 |
'@hostname' appended) as the author value for a commit. |
177 | 762 |
|
763 |
EDITOR:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
764 |
This is the name of the editor used in the hgmerge script. It will be |
498 | 765 |
used for commit messages if HGEDITOR isn't set. Defaults to 'vi'. |
438 | 766 |
|
767 |
PYTHONPATH:: |
|
768 |
This is used by Python to find imported modules and may need to be set |
|
769 |
appropriately if Mercurial is not installed system-wide. |
|
177 | 770 |
|
771 |
FILES |
|
772 |
----- |
|
773 |
.hgignore:: |
|
438 | 774 |
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
|
775 |
names that should be ignored by hg. |
177 | 776 |
|
777 |
.hgtags:: |
|
438 | 778 |
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
|
779 |
separated by spaces) that correspond to tagged versions of the repository |
177 | 780 |
contents. |
781 |
||
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
|
782 |
/etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc:: |
438 | 783 |
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
|
784 |
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
|
785 |
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
|
786 |
the contents and format of these files. |
321 | 787 |
|
177 | 788 |
BUGS |
789 |
---- |
|
790 |
Probably lots, please post them to the mailing list (See Resources below) |
|
791 |
when you find them. |
|
792 |
||
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
793 |
SEE ALSO |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
794 |
-------- |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
795 |
hgrc(5) |
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
796 |
|
177 | 797 |
AUTHOR |
798 |
------ |
|
799 |
Written by Matt Mackall <mpm@selenic.com> |
|
800 |
||
801 |
RESOURCES |
|
802 |
--------- |
|
803 |
http://selenic.com/mercurial[Main Web Site] |
|
804 |
||
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
805 |
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
|
806 |
|
177 | 807 |
http://selenic.com/hg[Source code repository] |
808 |
||
809 |
http://selenic.com/mailman/listinfo/mercurial[Mailing list] |
|
810 |
||
811 |
COPYING |
|
812 |
------- |
|
1341 | 813 |
Copyright \(C) 2005 Matt Mackall. |
177 | 814 |
Free use of this software is granted under the terms of the GNU General |
815 |
Public License (GPL). |