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