Mercurial > hg > mercurial-crew-with-dirclash
comparison doc/hg.1.txt @ 740:d2422f10c136
Merge from BOS
manifest hash: 2276dbd96bb4221e579c871a1de2403c92c85659
author | mpm@selenic.com |
---|---|
date | Wed, 20 Jul 2005 20:00:29 -0500 |
parents | efa4a7e2f322 8db4d406b3d3 |
children | 9246ae925d57 |
comparison
equal
deleted
inserted
replaced
722:e5b39ce2c3c9 | 740:d2422f10c136 |
---|---|
31 | 31 |
32 COMMAND ELEMENTS | 32 COMMAND ELEMENTS |
33 ---------------- | 33 ---------------- |
34 | 34 |
35 files ...:: | 35 files ...:: |
36 indicates one or more filename or relative path filenames | 36 indicates one or more filename or relative path filenames; see |
37 "FILE NAME PATTERNS" for information on pattern matching | |
37 | 38 |
38 path:: | 39 path:: |
39 indicates a path on the local machine | 40 indicates a path on the local machine |
40 | 41 |
41 revision:: | 42 revision:: |
49 require a special server on the web host. | 50 require a special server on the web host. |
50 | 51 |
51 COMMANDS | 52 COMMANDS |
52 -------- | 53 -------- |
53 | 54 |
54 add [files ...]:: | 55 add [options] [files ...]:: |
55 Schedule files to be version controlled and added to the repository. | 56 Schedule files to be version controlled and added to the repository. |
56 | 57 |
57 The files will be added to the repository at the next commit. | 58 The files will be added to the repository at the next commit. |
59 | |
60 If no names are given, add all files in the current directory and | |
61 its subdirectories. | |
58 | 62 |
59 addremove:: | 63 addremove:: |
60 Add all new files and remove all missing files from the repository. | 64 Add all new files and remove all missing files from the repository. |
61 | 65 |
62 New files are ignored if they match any of the patterns in .hgignore. As | 66 New files are ignored if they match any of the patterns in .hgignore. As |
67 | 71 |
68 This command is useful to discover who did a change or when a change took | 72 This command is useful to discover who did a change or when a change took |
69 place. | 73 place. |
70 | 74 |
71 options: | 75 options: |
76 -I, --include <pat> include directories matching the given patterns | |
77 -X, --exclude <pat> exclude directories matching the given patterns | |
72 -r, --revision <rev> annotate the specified revision | 78 -r, --revision <rev> annotate the specified revision |
73 -u, --user list the author | 79 -u, --user list the author |
74 -c, --changeset list the changeset | 80 -c, --changeset list the changeset |
75 -n, --number list the revision number (default) | 81 -n, --number list the revision number (default) |
76 | 82 |
126 When two revision arguments are given, then changes are shown | 132 When two revision arguments are given, then changes are shown |
127 between those revisions. If only one revision is specified then | 133 between those revisions. If only one revision is specified then |
128 that revision is compared to the working directory, and, when no | 134 that revision is compared to the working directory, and, when no |
129 revisions are specified, the working directory files are compared | 135 revisions are specified, the working directory files are compared |
130 to its parent. | 136 to its parent. |
137 | |
138 options: | |
139 -I, --include <pat> include directories matching the given patterns | |
140 -X, --exclude <pat> exclude directories matching the given patterns | |
131 | 141 |
132 export [-o filespec] [revision] ...:: | 142 export [-o filespec] [revision] ...:: |
133 Print the changeset header and diffs for one or more revisions. | 143 Print the changeset header and diffs for one or more revisions. |
134 | 144 |
135 The information shown in the changeset header is: author, | 145 The information shown in the changeset header is: author, |
181 aliases: patch | 191 aliases: patch |
182 | 192 |
183 init:: | 193 init:: |
184 Initialize a new repository in the current directory. | 194 Initialize a new repository in the current directory. |
185 | 195 |
186 locate [options] [patterns]:: | 196 locate [options] [files]:: |
187 Print all files under Mercurial control whose basenames match the | 197 Print all files under Mercurial control whose names match the |
188 given patterns. | 198 given patterns. |
189 | |
190 Patterns are shell-style globs. To restrict searches to specific | |
191 directories, use the "-i <pat>" option. To eliminate particular | |
192 directories from searching, use the "-x <pat>" option. | |
193 | 199 |
194 This command searches the current directory and its | 200 This command searches the current directory and its |
195 subdirectories. To search an entire repository, move to the root | 201 subdirectories. To search an entire repository, move to the root |
196 of the repository. | 202 of the repository. |
197 | 203 |
205 | 211 |
206 options: | 212 options: |
207 | 213 |
208 -0, --print0 end filenames with NUL, for use with xargs | 214 -0, --print0 end filenames with NUL, for use with xargs |
209 -f, --fullpath print complete paths from the filesystem root | 215 -f, --fullpath print complete paths from the filesystem root |
210 -i, --include <pat> include directories matching the given globs | 216 -I, --include <pat> include directories matching the given patterns |
211 -r, --rev <rev> search the repository as it stood at rev | 217 -r, --rev <rev> search the repository as it stood at rev |
212 -x, --exclude <pat> exclude directories matching the given globs | 218 -X, --exclude <pat> exclude directories matching the given patterns |
213 | 219 |
214 log [-r revision ...] [-p] [file]:: | 220 log [-r revision ...] [-p] [file]:: |
215 Print the revision history of the specified file or the entire project. | 221 Print the revision history of the specified file or the entire project. |
216 | 222 |
217 By default this command outputs: changeset id and hash, tags, | 223 By default this command outputs: changeset id and hash, tags, |
317 -a, --address <addr> address to use | 323 -a, --address <addr> address to use |
318 -p, --port <n> port to use (default: 8000) | 324 -p, --port <n> port to use (default: 8000) |
319 -n, --name <name> name to show in web pages (default: working dir) | 325 -n, --name <name> name to show in web pages (default: working dir) |
320 -t, --templatedir <path> web templates to use | 326 -t, --templatedir <path> web templates to use |
321 | 327 |
322 status:: | 328 status [options] [files]:: |
323 Show changed files in the working directory. | 329 Show changed files in the working directory. If no names are |
330 given, all files are shown. Otherwise, only files matching the | |
331 given names are shown. | |
324 | 332 |
325 The codes used to show the status of files are: | 333 The codes used to show the status of files are: |
326 | 334 |
327 C = changed | 335 C = changed |
328 A = added | 336 A = added |
329 R = removed | 337 R = removed |
330 ? = not tracked | 338 ? = not tracked |
331 | 339 |
340 options: | |
341 | |
342 -I, --include <pat> include directories matching the given patterns | |
343 -X, --exclude <pat> exclude directories matching the given patterns | |
344 | |
332 tag [-l -t <text> -d <datecode> -u <user>] <name> [revision]:: | 345 tag [-l -t <text> -d <datecode> -u <user>] <name> [revision]:: |
333 Name a particular revision using <name>. | 346 Name a particular revision using <name>. |
334 | 347 |
335 Tags are used to name particular revisions of the repository and are | 348 Tags are used to name particular revisions of the repository and are |
336 very useful to compare different revision, to go back to significant | 349 very useful to compare different revision, to go back to significant |
395 | 408 |
396 This will perform an extensive check of the repository's | 409 This will perform an extensive check of the repository's |
397 integrity, validating the hashes and checksums of each entry in | 410 integrity, validating the hashes and checksums of each entry in |
398 the changelog, manifest, and tracked files, as well as the | 411 the changelog, manifest, and tracked files, as well as the |
399 integrity of their crosslinks and indices. | 412 integrity of their crosslinks and indices. |
413 | |
414 FILE NAME PATTERNS | |
415 ------------------ | |
416 | |
417 Mercurial accepts several notations for identifying one or more | |
418 file at a time. | |
419 | |
420 By default, Mercurial treats file names as shell-style extended | |
421 glob patterns. | |
422 | |
423 Alternate pattern notations must be specified explicitly. | |
424 | |
425 To use a plain path name without any pattern matching, start a | |
426 name with "path:". These path names must match completely, from | |
427 the root of the current repository. | |
428 | |
429 To use an extended glob, start a name with "glob:". Globs are | |
430 rooted at the current directory; a glob such as "*.c" will match | |
431 files ending in ".c" in the current directory only. | |
432 | |
433 The supported glob syntax extensions are "**" to match any string | |
434 across path separators, and "{a,b}" to mean "a or b". | |
435 | |
436 To use a Perl/Python regular expression, start a name with "re:". | |
437 Regexp pattern matching is anchored at the root of the repository. | |
438 | |
439 Plain examples: | |
440 | |
441 path:foo/bar a name bar in a directory named foo in the root of | |
442 the repository | |
443 path:path:name a file or directory named "path:name" | |
444 | |
445 Glob examples: | |
446 | |
447 glob:*.c any name ending in ".c" in the current directory | |
448 *.c any name ending in ".c" in the current directory | |
449 **.c any name ending in ".c" in the current directory, or | |
450 any subdirectory | |
451 foo/*.c any name ending in ".c" in the directory foo | |
452 foo/**.c any name ending in ".c" in the directory foo, or any | |
453 subdirectory | |
454 | |
455 Regexp examples: | |
456 | |
457 re:.*\.c$ any name ending in ".c", anywhere in the repsitory | |
458 | |
400 | 459 |
401 SPECIFYING SINGLE REVISIONS | 460 SPECIFYING SINGLE REVISIONS |
402 --------------------------- | 461 --------------------------- |
403 | 462 |
404 Mercurial accepts several notations for identifying individual | 463 Mercurial accepts several notations for identifying individual |