Mercurial > hg > pyhgsh
annotate doc/hg.1.txt @ 1016:836667830fee
Teach annotate about binary files
| author | mpm@selenic.com |
|---|---|
| date | Tue, 23 Aug 2005 20:21:52 -0700 |
| parents | 22571b8d35d3 |
| children | 7c00f5f2c967 |
| 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 |
| 177 | 20 --debug, -d:: |
| 21 enable debugging output | |
| 22 | |
| 23 --quiet, -q:: | |
| 24 suppress output | |
| 25 | |
| 26 --verbose, -v:: | |
| 27 enable additional output | |
| 28 | |
| 29 --noninteractive, -y:: | |
| 30 do not prompt, assume 'yes' for any required answers | |
| 31 | |
| 32 COMMAND ELEMENTS | |
| 33 ---------------- | |
| 34 | |
| 35 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
|
36 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
|
37 "FILE NAME PATTERNS" for information on pattern matching |
| 177 | 38 |
| 39 path:: | |
| 40 indicates a path on the local machine | |
| 41 | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
42 revision:: |
| 438 | 43 indicates a changeset which can be specified as a changeset revision |
| 44 number, a tag, or a unique substring of the changeset hash value | |
| 177 | 45 |
| 46 repository path:: | |
| 498 | 47 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
|
48 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
|
49 fast and the old-http:// protocol which is much slower but does not |
| 438 | 50 require a special server on the web host. |
| 177 | 51 |
| 52 COMMANDS | |
| 53 -------- | |
| 438 | 54 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
55 add [options] [files ...]:: |
| 497 | 56 Schedule files to be version controlled and added to the repository. |
| 57 | |
| 498 | 58 The files will be added to the repository at the next commit. |
| 177 | 59 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
60 If no names are given, add all files in the current directory and |
| 728 | 61 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
|
62 |
|
766
b444a7e053f1
Get addremove to use new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
761
diff
changeset
|
63 addremove [options] [files ...]:: |
| 497 | 64 Add all new files and remove all missing files from the repository. |
| 65 | |
| 66 New files are ignored if they match any of the patterns in .hgignore. As | |
| 498 | 67 with add, these changes take effect at the next commit. |
| 177 | 68 |
| 438 | 69 annotate [-r <rev> -u -n -c] [files ...]:: |
| 497 | 70 List changes in files, showing the revision id responsible for each line |
| 71 | |
| 72 This command is useful to discover who did a change or when a change took | |
| 73 place. | |
| 1016 | 74 |
| 75 Without the -a option, annotate will avoid processing files it | |
| 76 detects as binary. With -a, annotate will generate an annotation | |
| 77 anyway, probably with undesirable results. | |
| 497 | 78 |
| 438 | 79 options: |
| 1016 | 80 -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
|
81 -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
|
82 -X, --exclude <pat> exclude names matching the given patterns |
| 438 | 83 -r, --revision <rev> annotate the specified revision |
| 84 -u, --user list the author | |
| 85 -c, --changeset list the changeset | |
| 86 -n, --number list the revision number (default) | |
| 177 | 87 |
| 438 | 88 cat <file> [revision]:: |
| 497 | 89 Output to stdout the given revision for the specified file. |
| 90 | |
| 498 | 91 If no revision is given then the tip is used. |
| 177 | 92 |
| 485 | 93 clone [-U] <source> [dest]:: |
| 497 | 94 Create a copy of an existing repository in a new directory. |
| 95 | |
|
523
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
509
diff
changeset
|
96 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
|
97 basename of the source. |
| 497 | 98 |
| 498 | 99 The source is added to the new repository's .hg/hgrc file to be used in |
| 497 | 100 future pulls. |
| 101 | |
| 498 | 102 For efficiency, hardlinks are used for cloning whenever the |
| 103 source and destination are on the same filesystem. | |
| 497 | 104 |
| 105 options: | |
| 505 | 106 -U, --noupdate do not update the new working directory |
|
963
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
107 -e, --ssh specify ssh command to use |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
108 --remotecmd specify hg command to run on the remote side |
| 497 | 109 |
|
813
80fd2958235a
Adapt commit to use file matching code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
811
diff
changeset
|
110 commit [options] [files...]:: |
| 498 | 111 Commit changes to the given files into the repository. |
| 497 | 112 |
| 498 | 113 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
|
114 from the root of the repository will be commited. |
| 497 | 115 |
| 498 | 116 The HGEDITOR or EDITOR environment variables are used to start an |
| 117 editor to add a commit comment. | |
| 497 | 118 |
| 119 Options: | |
| 120 | |
| 121 -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
|
122 -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
|
123 -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
|
124 -m, --message <text> use <text> as commit message |
| 497 | 125 -l, --logfile <file> show the commit message for the given file |
| 126 -d, --date <datecode> record datecode as commit date | |
| 127 -u, --user <user> record user as commiter | |
| 128 | |
| 129 aliases: ci | |
| 130 | |
| 131 copy <source> <dest>:: | |
| 132 Mark <dest> file as a copy or rename of a <source> one | |
| 133 | |
| 134 This command takes effect for the next commit. | |
| 135 | |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
136 diff [-a] [-r revision] [-r revision] [files ...]:: |
| 497 | 137 Show differences between revisions for the specified files. |
| 138 | |
| 139 Differences between files are shown using the unified diff format. | |
| 140 | |
| 498 | 141 When two revision arguments are given, then changes are shown |
| 142 between those revisions. If only one revision is specified then | |
| 143 that revision is compared to the working directory, and, when no | |
| 144 revisions are specified, the working directory files are compared | |
| 145 to its parent. | |
| 497 | 146 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
147 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
|
148 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
|
149 probably with undesirable results. |
|
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
150 |
|
734
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
151 options: |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
152 -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
|
153 -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
|
154 -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
|
155 |
| 580 | 156 export [-o filespec] [revision] ...:: |
| 157 Print the changeset header and diffs for one or more revisions. | |
| 158 | |
| 159 The information shown in the changeset header is: author, | |
| 160 changeset hash, parent and commit comment. | |
| 161 | |
| 162 Output may be to a file, in which case the name of the file is | |
| 163 given using a format string. The formatting rules are as follows: | |
| 497 | 164 |
| 580 | 165 %% literal "%" character |
| 166 %H changeset hash (40 bytes of hexadecimal) | |
| 167 %N number of patches being generated | |
| 168 %R changeset revision number | |
| 169 %b basename of the exporting repository | |
| 170 %h short-form changeset hash (12 bytes of hexadecimal) | |
| 171 %n zero-padded sequence number, starting at 1 | |
| 172 %r zero-padded changeset revision number | |
| 173 | |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
174 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
|
175 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
|
176 probably with undesirable results. |
| 580 | 177 |
|
1015
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
178 options: |
|
22571b8d35d3
Add automatic binary file detection to diff and export
mpm@selenic.com
parents:
981
diff
changeset
|
179 -a, --text treat all files as text |
| 580 | 180 -o, --output <filespec> print output to file with formatted named |
| 497 | 181 |
|
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
182 forget [options] [files]:: |
| 497 | 183 Undo an 'hg add' scheduled for the next commit. |
| 184 | |
|
810
790a0ff306f2
Move commands.forget over to using new walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
766
diff
changeset
|
185 options: |
|
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
186 -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
|
187 -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
|
188 |
| 497 | 189 heads:: |
| 190 Show all repository head changesets. | |
| 191 | |
| 498 | 192 Repository "heads" are changesets that don't have children |
| 193 changesets. They are where development generally takes place and | |
| 194 are the usual targets for update and merge operations. | |
| 497 | 195 |
| 196 identify:: | |
| 197 Print a short summary of the current state of the repo. | |
| 198 | |
| 199 This summary identifies the repository state using one or two parent | |
| 200 hash identifiers, followed by a "+" if there are uncommitted changes | |
| 201 in the working directory, followed by a list of tags for this revision. | |
| 202 | |
| 203 aliases: id | |
| 204 | |
|
966
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
963
diff
changeset
|
205 import [-p <n> -b <base> -f] <patches>:: |
| 497 | 206 Import a list of patches and commit them individually. |
| 207 | |
| 208 options: | |
| 209 -p, --strip <n> directory strip option for patch. This has the same | |
| 210 meaning as the correnponding patch option | |
| 211 -b <path> base directory to read patches from | |
|
966
022bcc738389
hg import: abort with uncommitted changes, override with --force
mpm@selenic.com
parents:
963
diff
changeset
|
212 -f, --force skip check for outstanding uncommitted changes |
| 497 | 213 |
| 214 aliases: patch | |
| 215 | |
|
928
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
216 incoming [source]:: |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
217 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
|
218 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
|
219 was requested. |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
220 |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
221 Currently only local repositories are supported. |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
222 |
| 940 | 223 aliases: in |
| 224 | |
|
907
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
225 init [dest]:: |
|
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
226 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
|
227 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
|
228 |
|
652507dc9fce
Modify init command to take an optional directory to set up.
Bryan O'Sullivan <bos@serpentine.com>
parents:
896
diff
changeset
|
229 If no directory is given, the current directory is used. |
| 177 | 230 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
231 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
|
232 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
|
233 given patterns. |
| 627 | 234 |
| 235 This command searches the current directory and its | |
| 236 subdirectories. To search an entire repository, move to the root | |
| 237 of the repository. | |
| 238 | |
| 239 If no patterns are given to match, this command prints all file | |
| 240 names. | |
| 241 | |
| 242 If you want to feed the output of this command into the "xargs" | |
| 243 command, use the "-0" option to both this command and "xargs". | |
| 244 This will avoid the problem of "xargs" treating single filenames | |
| 245 that contain white space as multiple file names. | |
| 246 | |
| 247 options: | |
| 248 | |
| 249 -0, --print0 end filenames with NUL, for use with xargs | |
| 250 -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
|
251 -I, --include <pat> include names matching the given patterns |
| 627 | 252 -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
|
253 -X, --exclude <pat> exclude names matching the given patterns |
| 627 | 254 |
|
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
255 log [-r revision ...] [-p] [file]:: |
| 509 | 256 Print the revision history of the specified file or the entire project. |
| 177 | 257 |
| 509 | 258 By default this command outputs: changeset id and hash, tags, |
| 259 parents, user, date and time, and a summary for each commit. The | |
| 260 -v switch adds some more detail, such as changed files, manifest | |
| 261 hashes or message signatures. | |
| 262 | |
|
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
263 options: |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
264 -r, --rev <A>, ... When a revision argument is given, only this file or |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
265 changelog revision is displayed. With two revision |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
266 arguments all revisions in this range are listed. |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
267 Additional revision arguments may be given repeating |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
268 the above cycle. |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
269 -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
|
270 |
| 509 | 271 aliases: history |
| 497 | 272 |
| 438 | 273 manifest [revision]:: |
| 497 | 274 Print a list of version controlled files for the given revision. |
| 275 | |
| 276 The manifest is the list of files being version controlled. If no revision | |
| 277 is given then the tip is used. | |
| 438 | 278 |
|
928
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
279 outgoing [dest]:: |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
280 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
|
281 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
|
282 if a push was requested. |
|
6f2c3bcbfaaf
hg incoming/outgoing: fix tests and update man page
mpm@selenic.com
parents:
924
diff
changeset
|
283 |
| 940 | 284 aliases: out |
| 285 | |
| 438 | 286 parents:: |
| 287 Print the working directory's parent revisions. | |
| 288 | |
|
924
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
289 paths [NAME]:: |
|
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
290 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
|
291 definition of available names. |
|
ab681ea2857e
updated help text and added manpage section for hg paths
TK Soh <teekaysoh@yahoo.com>
parents:
910
diff
changeset
|
292 |
|
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
|
293 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
|
294 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
|
295 |
| 438 | 296 pull <repository path>:: |
| 498 | 297 Pull changes from a remote repository to a local one. |
| 497 | 298 |
| 498 | 299 This finds all changes from the repository at the specified path |
| 300 or URL and adds them to the local repository. By default, this | |
| 301 does not update the copy of the project in the working directory. | |
| 438 | 302 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
303 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
|
304 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
305 local/filesystem/path |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
306 http://[user@]host[:port][/path] |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
307 https://[user@]host[:port][/path] |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
308 ssh://[user@]host[:port][/path] |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
309 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
310 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
|
311 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
|
312 |
| 438 | 313 options: |
| 314 -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
|
315 -e, --ssh specify ssh command to use |
|
84355e3e4493
Add -e and --remotecmd for clone and pull too
mpm@selenic.com
parents:
962
diff
changeset
|
316 --remotecmd specify hg command to run on the remote side |
| 438 | 317 |
| 318 push <destination>:: | |
| 497 | 319 Push changes from the local repository to the given destination. |
| 320 | |
| 498 | 321 This is the symmetrical operation for pull. It helps to move |
| 322 changes from the current repository to a different one. If the | |
| 323 destination is local this is identical to a pull in that directory | |
| 324 from the current one. | |
| 438 | 325 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
326 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
|
327 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
|
328 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
|
329 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
330 Valid URLs are of the form: |
| 438 | 331 |
|
962
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
332 local/filesystem/path |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
333 ssh://[user@]host[:port][/path] |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
334 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
335 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
|
336 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
|
337 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
338 options: |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
339 |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
340 -f, --force force update |
|
5730e90c025b
Doc updates for push, pull, hooks, local tags, and ssh options
mpm@selenic.com
parents:
953
diff
changeset
|
341 -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
|
342 --remotecmd specify hg command to run on the remote side |
| 438 | 343 |
| 747 | 344 rawcommit [-p -d -u -F -m -l]:: |
| 497 | 345 Lowlevel commit, for use in helper scripts. |
| 346 | |
| 347 This command is not intended to be used by normal users, as it is | |
| 348 primarily useful for importing from other SCMs. | |
| 177 | 349 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
350 recover:: |
| 497 | 351 Recover from an interrupted commit or pull. |
| 352 | |
| 353 This command tries to fix the repository status after an interrupted | |
| 354 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
|
355 |
| 177 | 356 remove [files ...]:: |
| 497 | 357 Schedule the indicated files for removal from the repository. |
| 358 | |
| 498 | 359 This command shedules the files to be removed at the next commit. |
| 360 This only removes files from the current branch, not from the | |
| 361 entire project history. | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
362 |
| 438 | 363 aliases: rm |
| 177 | 364 |
| 588 | 365 revert [names ...]:: |
| 366 Revert any uncommitted modifications made to the named files or | |
| 367 directories. This restores the contents of the affected files to | |
| 368 an unmodified state. | |
| 369 | |
| 370 If a file has been deleted, it is recreated. If the executable | |
| 371 mode of a file was changed, it is reset. | |
| 372 | |
| 373 If a directory is given, all files in that directory and its | |
| 374 subdirectories are reverted. | |
| 375 | |
| 376 If no arguments are given, all files in the current directory and | |
| 377 its subdirectories are reverted. | |
| 378 | |
| 379 options: | |
| 380 -r, --rev <rev> revision to revert to | |
| 381 -n, --nonrecursive do not recurse into subdirectories | |
| 382 | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
383 root:: |
|
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
384 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
|
385 |
|
606
ea4526f9b1a5
[PATCH] Fix thinko in "serve" man page entry.
mpm@selenic.com
parents:
605
diff
changeset
|
386 serve [options]:: |
| 438 | 387 Start a local HTTP repository browser and pull server. |
| 388 | |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
389 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
|
390 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
|
391 |
| 438 | 392 options: |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
393 -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
|
394 -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
|
395 -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
|
396 -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
|
397 -n, --name <name> name to show in web pages (default: working dir) |
| 438 | 398 -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
|
399 -6, --ipv6 use IPv6 in addition to IPv4 |
| 177 | 400 |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
401 status [options] [files]:: |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
402 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
|
403 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
|
404 given names are shown. |
| 438 | 405 |
| 497 | 406 The codes used to show the status of files are: |
| 407 | |
| 746 | 408 M = changed |
| 438 | 409 A = added |
| 410 R = removed | |
| 411 ? = not tracked | |
| 412 | |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
413 options: |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
414 |
|
840
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
415 -m, --modified show only modified files |
|
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
416 -a, --added show only added files |
|
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
417 -r, --removed show only removed files |
|
141744605b51
hg status: added options to select files by status.
tksoh@users.sourceforge.net
parents:
839
diff
changeset
|
418 -u, --unknown show only unknown (not tracked) files |
|
811
fa9aaf3bbdd7
Fix documentation of -I and -X options.
Bryan O'Sullivan <bos@serpentine.com>
parents:
810
diff
changeset
|
419 -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
|
420 -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
|
421 |
| 750 | 422 tag [-l -m <text> -d <datecode> -u <user>] <name> [revision]:: |
| 497 | 423 Name a particular revision using <name>. |
| 424 | |
| 425 Tags are used to name particular revisions of the repository and are | |
| 426 very useful to compare different revision, to go back to significant | |
| 498 | 427 earlier versions or to mark branch points as releases, etc. |
| 497 | 428 |
| 498 | 429 If no revision is given, the tip is used. |
| 438 | 430 |
| 498 | 431 To facilitate version control, distribution, and merging of tags, |
| 432 they are stored as a file named ".hgtags" which is managed | |
| 433 similarly to other project files and can be hand-edited if | |
| 434 necessary. | |
| 435 | |
| 438 | 436 options: |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
437 -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
|
438 -m, --message <text> message for tag commit log entry |
| 438 | 439 -d, --date <datecode> datecode for commit |
| 440 -u, --user <user> user for commit | |
| 177 | 441 |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
442 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
|
443 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
|
444 a public tag with the same name, local tag is used. |
| 498 | 445 |
| 177 | 446 tags:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
447 List the repository tags. |
| 438 | 448 |
| 498 | 449 This lists both regular and local tags. |
| 497 | 450 |
| 438 | 451 tip:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
452 Show the tip revision. |
| 177 | 453 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
454 undo:: |
| 438 | 455 Undo the last commit or pull transaction. |
| 456 | |
| 595 | 457 Roll back the last pull or commit transaction on the |
| 458 repository, restoring the project to its earlier state. | |
| 459 | |
| 460 This command should be used with care. There is only one level of | |
| 461 undo and there is no redo. | |
| 462 | |
| 463 This command is not intended for use on public repositories. Once | |
| 464 a change is visible for pull by other users, undoing it locally is | |
| 465 ineffective. | |
| 466 | |
| 438 | 467 update [-m -C] [revision]:: |
| 498 | 468 Update the working directory to the specified revision. |
| 438 | 469 |
| 498 | 470 By default, update will refuse to run if doing so would require |
| 471 merging or discarding local changes. | |
| 472 | |
| 473 With the -m option, a merge will be performed. | |
| 474 | |
| 475 With the -C option, local changes will be lost. | |
| 497 | 476 |
| 438 | 477 options: |
| 478 -m, --merge allow merging of branches | |
| 479 -C, --clean overwrite locally modified files | |
| 480 | |
| 481 aliases: up checkout co | |
| 482 | |
| 483 verify:: | |
| 484 Verify the integrity of the current repository. | |
| 485 | |
| 486 This will perform an extensive check of the repository's | |
| 487 integrity, validating the hashes and checksums of each entry in | |
| 488 the changelog, manifest, and tracked files, as well as the | |
| 489 integrity of their crosslinks and indices. | |
| 490 | |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
491 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
|
492 ------------------ |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
493 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
494 Mercurial accepts several notations for identifying one or more |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
495 file at a time. |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
496 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
497 By default, Mercurial treats file names as shell-style extended |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
498 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
|
499 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
500 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
|
501 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
502 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
|
503 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
|
504 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
|
505 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
506 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
|
507 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
|
508 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
|
509 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
510 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
|
511 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
|
512 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
513 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
|
514 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
|
515 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
516 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
|
517 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
518 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
|
519 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
|
520 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
|
521 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
522 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
|
523 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
524 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
|
525 *.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
|
526 **.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
|
527 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
|
528 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
|
529 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
|
530 subdirectory |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
531 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
532 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
|
533 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
534 re:.*\.c$ any name ending in ".c", anywhere in the repsitory |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
535 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
536 |
| 580 | 537 SPECIFYING SINGLE REVISIONS |
| 538 --------------------------- | |
| 539 | |
| 540 Mercurial accepts several notations for identifying individual | |
| 541 revisions. | |
| 542 | |
| 543 A plain integer is treated as a revision number. Negative | |
| 544 integers are treated as offsets from the tip, with -1 denoting the | |
| 545 tip. | |
| 546 | |
| 547 A 40-digit hexadecimal string is treated as a unique revision | |
| 548 identifier. | |
| 549 | |
| 550 A hexadecimal string less than 40 characters long is treated as a | |
| 551 unique revision identifier, and referred to as a short-form | |
| 552 identifier. A short-form identifier is only valid if it is the | |
| 553 prefix of one full-length identifier. | |
| 554 | |
| 555 Any other string is treated as a tag name, which is a symbolic | |
| 556 name associated with a revision identifier. Tag names may not | |
| 557 contain the ":" character. | |
| 558 | |
| 559 The reserved name "tip" is a special tag that always identifies | |
| 560 the most recent revision. | |
| 561 | |
| 562 SPECIFYING MULTIPLE REVISIONS | |
| 563 ----------------------------- | |
| 564 | |
| 565 When Mercurial accepts more than one revision, they may be | |
| 566 specified individually, or provided as a continuous range, | |
| 567 separated by the ":" character. | |
| 568 | |
| 569 The syntax of range notation is [BEGIN]:[END], where BEGIN and END | |
| 570 are revision identifiers. Both BEGIN and END are optional. If | |
| 571 BEGIN is not specified, it defaults to revision number 0. If END | |
| 572 is not specified, it defaults to the tip. The range ":" thus | |
| 573 means "all revisions". | |
| 574 | |
| 575 If BEGIN is greater than END, revisions are treated in reverse | |
| 576 order. | |
| 577 | |
|
860
8ccbac05cf59
Use correct term "closed interval" for ranges.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
840
diff
changeset
|
578 A range acts as a closed interval. This means that a range of 3:5 |
| 580 | 579 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
|
580 |
| 177 | 581 ENVIRONMENT VARIABLES |
| 582 --------------------- | |
| 438 | 583 |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
584 HGEDITOR:: |
|
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
585 This is the name of the editor to use when committing. Defaults to the |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
586 value of EDITOR. |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
587 |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
588 (deprecated, use .hgrc) |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
589 |
| 177 | 590 HGMERGE:: |
| 498 | 591 An executable to use for resolving merge conflicts. The program |
| 438 | 592 will be executed with three arguments: local file, remote file, |
| 593 ancestor file. | |
| 594 | |
| 595 The default program is "hgmerge", which is a shell script provided | |
| 596 by Mercurial with some sensible defaults. | |
| 177 | 597 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
598 (deprecated, use .hgrc) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
599 |
| 177 | 600 HGUSER:: |
| 438 | 601 This is the string used for the author of a commit. |
| 177 | 602 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
603 (deprecated, use .hgrc) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
604 |
| 177 | 605 EMAIL:: |
| 438 | 606 If HGUSER is not set, this will be used as the author for a commit. |
| 177 | 607 |
| 608 LOGNAME:: | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
609 If neither HGUSER nor EMAIL is set, LOGNAME will be used (with |
| 438 | 610 '@hostname' appended) as the author value for a commit. |
| 177 | 611 |
| 612 EDITOR:: | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
613 This is the name of the editor used in the hgmerge script. It will be |
| 498 | 614 used for commit messages if HGEDITOR isn't set. Defaults to 'vi'. |
| 438 | 615 |
| 616 PYTHONPATH:: | |
| 617 This is used by Python to find imported modules and may need to be set | |
| 618 appropriately if Mercurial is not installed system-wide. | |
| 177 | 619 |
| 620 FILES | |
| 621 ----- | |
| 622 .hgignore:: | |
| 438 | 623 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
|
624 names that should be ignored by hg. |
| 177 | 625 |
| 626 .hgtags:: | |
| 438 | 627 This file contains changeset hash values and text tag names (one of each |
| 177 | 628 seperated by spaces) that correspond to tagged versions of the repository |
| 629 contents. | |
| 630 | |
|
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
|
631 /etc/mercurial/hgrc, $HOME/.hgrc, .hg/hgrc:: |
| 438 | 632 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
|
633 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
|
634 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
|
635 the contents and format of these files. |
| 321 | 636 |
| 177 | 637 BUGS |
| 638 ---- | |
| 639 Probably lots, please post them to the mailing list (See Resources below) | |
| 640 when you find them. | |
| 641 | |
|
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
642 SEE ALSO |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
643 -------- |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
644 hgrc(5) |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
645 |
| 177 | 646 AUTHOR |
| 647 ------ | |
| 648 Written by Matt Mackall <mpm@selenic.com> | |
| 649 | |
| 650 RESOURCES | |
| 651 --------- | |
| 652 http://selenic.com/mercurial[Main Web Site] | |
| 653 | |
|
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
654 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
|
655 |
| 177 | 656 http://selenic.com/hg[Source code repository] |
| 657 | |
| 658 http://selenic.com/mailman/listinfo/mercurial[Mailing list] | |
| 659 | |
| 660 COPYING | |
| 661 ------- | |
| 662 Copyright (C) 2005 Matt Mackall. | |
| 663 Free use of this software is granted under the terms of the GNU General | |
| 664 Public License (GPL). |