Mercurial > hg > pyhgsh
annotate doc/hg.1.txt @ 746:9095e3456ea7
Change C to M in status
| author | mpm@selenic.com |
|---|---|
| date | Thu, 21 Jul 2005 12:24:42 -0500 |
| parents | 9246ae925d57 |
| children | c3ce3976ae75 |
| 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 |
| 177 | 63 addremove:: |
| 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. | |
| 74 | |
| 438 | 75 options: |
|
734
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
76 -I, --include <pat> include directories matching the given patterns |
|
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
77 -X, --exclude <pat> exclude directories matching the given patterns |
| 438 | 78 -r, --revision <rev> annotate the specified revision |
| 79 -u, --user list the author | |
| 80 -c, --changeset list the changeset | |
| 81 -n, --number list the revision number (default) | |
| 177 | 82 |
| 438 | 83 cat <file> [revision]:: |
| 497 | 84 Output to stdout the given revision for the specified file. |
| 85 | |
| 498 | 86 If no revision is given then the tip is used. |
| 177 | 87 |
| 485 | 88 clone [-U] <source> [dest]:: |
| 497 | 89 Create a copy of an existing repository in a new directory. |
| 90 | |
|
523
003df62ae39f
[PATCH] Force "hg clone" to always create a new directory
mpm@selenic.com
parents:
509
diff
changeset
|
91 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
|
92 basename of the source. |
| 497 | 93 |
| 498 | 94 The source is added to the new repository's .hg/hgrc file to be used in |
| 497 | 95 future pulls. |
| 96 | |
| 498 | 97 For efficiency, hardlinks are used for cloning whenever the |
| 98 source and destination are on the same filesystem. | |
| 497 | 99 |
| 100 options: | |
| 505 | 101 -U, --noupdate do not update the new working directory |
| 497 | 102 |
| 745 | 103 commit [-A -t -l <file> -m <text> -u <user> -d <datecode>] [files...]:: |
| 498 | 104 Commit changes to the given files into the repository. |
| 497 | 105 |
| 498 | 106 If a list of files is omitted, all changes reported by "hg status" |
| 107 will be commited. | |
| 497 | 108 |
| 498 | 109 The HGEDITOR or EDITOR environment variables are used to start an |
| 110 editor to add a commit comment. | |
| 497 | 111 |
| 112 Options: | |
| 113 | |
| 114 -A, --addremove run addremove during commit | |
| 745 | 115 -m, --text <text> use <text> as commit message |
| 497 | 116 -l, --logfile <file> show the commit message for the given file |
| 117 -d, --date <datecode> record datecode as commit date | |
| 118 -u, --user <user> record user as commiter | |
| 119 | |
| 120 aliases: ci | |
| 121 | |
| 122 copy <source> <dest>:: | |
| 123 Mark <dest> file as a copy or rename of a <source> one | |
| 124 | |
| 125 This command takes effect for the next commit. | |
| 126 | |
| 127 diff [-r revision] [-r revision] [files ...]:: | |
| 128 Show differences between revisions for the specified files. | |
| 129 | |
| 130 Differences between files are shown using the unified diff format. | |
| 131 | |
| 498 | 132 When two revision arguments are given, then changes are shown |
| 133 between those revisions. If only one revision is specified then | |
| 134 that revision is compared to the working directory, and, when no | |
| 135 revisions are specified, the working directory files are compared | |
| 136 to its parent. | |
| 497 | 137 |
|
734
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
138 options: |
|
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
139 -I, --include <pat> include directories matching the given patterns |
|
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
140 -X, --exclude <pat> exclude directories matching the given patterns |
|
d4e161d60f61
Update docs for annotate and diff.
Bryan O'Sullivan <bos@serpentine.com>
parents:
731
diff
changeset
|
141 |
| 580 | 142 export [-o filespec] [revision] ...:: |
| 143 Print the changeset header and diffs for one or more revisions. | |
| 144 | |
| 145 The information shown in the changeset header is: author, | |
| 146 changeset hash, parent and commit comment. | |
| 147 | |
| 148 Output may be to a file, in which case the name of the file is | |
| 149 given using a format string. The formatting rules are as follows: | |
| 497 | 150 |
| 580 | 151 %% literal "%" character |
| 152 %H changeset hash (40 bytes of hexadecimal) | |
| 153 %N number of patches being generated | |
| 154 %R changeset revision number | |
| 155 %b basename of the exporting repository | |
| 156 %h short-form changeset hash (12 bytes of hexadecimal) | |
| 157 %n zero-padded sequence number, starting at 1 | |
| 158 %r zero-padded changeset revision number | |
| 159 | |
| 160 Options: | |
| 161 | |
| 162 -o, --output <filespec> print output to file with formatted named | |
| 497 | 163 |
| 164 forget [files]:: | |
| 165 Undo an 'hg add' scheduled for the next commit. | |
| 166 | |
| 167 heads:: | |
| 168 Show all repository head changesets. | |
| 169 | |
| 498 | 170 Repository "heads" are changesets that don't have children |
| 171 changesets. They are where development generally takes place and | |
| 172 are the usual targets for update and merge operations. | |
| 497 | 173 |
| 174 identify:: | |
| 175 Print a short summary of the current state of the repo. | |
| 176 | |
| 177 This summary identifies the repository state using one or two parent | |
| 178 hash identifiers, followed by a "+" if there are uncommitted changes | |
| 179 in the working directory, followed by a list of tags for this revision. | |
| 180 | |
| 181 aliases: id | |
| 182 | |
| 183 import [-p <n> -b <base> -q] <patches>:: | |
| 184 Import a list of patches and commit them individually. | |
| 185 | |
| 186 options: | |
| 187 -p, --strip <n> directory strip option for patch. This has the same | |
| 188 meaning as the correnponding patch option | |
| 189 -b <path> base directory to read patches from | |
| 190 | |
| 191 aliases: patch | |
| 192 | |
| 496 | 193 init:: |
| 194 Initialize a new repository in the current directory. | |
| 177 | 195 |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
196 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
|
197 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
|
198 given patterns. |
| 627 | 199 |
| 200 This command searches the current directory and its | |
| 201 subdirectories. To search an entire repository, move to the root | |
| 202 of the repository. | |
| 203 | |
| 204 If no patterns are given to match, this command prints all file | |
| 205 names. | |
| 206 | |
| 207 If you want to feed the output of this command into the "xargs" | |
| 208 command, use the "-0" option to both this command and "xargs". | |
| 209 This will avoid the problem of "xargs" treating single filenames | |
| 210 that contain white space as multiple file names. | |
| 211 | |
| 212 options: | |
| 213 | |
| 214 -0, --print0 end filenames with NUL, for use with xargs | |
| 215 -f, --fullpath print complete paths from the filesystem root | |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
216 -I, --include <pat> include directories matching the given patterns |
| 627 | 217 -r, --rev <rev> search the repository as it stood at rev |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
218 -X, --exclude <pat> exclude directories matching the given patterns |
| 627 | 219 |
|
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
220 log [-r revision ...] [-p] [file]:: |
| 509 | 221 Print the revision history of the specified file or the entire project. |
| 177 | 222 |
| 509 | 223 By default this command outputs: changeset id and hash, tags, |
| 224 parents, user, date and time, and a summary for each commit. The | |
| 225 -v switch adds some more detail, such as changed files, manifest | |
| 226 hashes or message signatures. | |
| 227 | |
|
612
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
228 options: |
|
9cd745437269
On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote:
Alecs King <alecsk@gmail.com>
parents:
608
diff
changeset
|
229 -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
|
230 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
|
231 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
|
232 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
|
233 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
|
234 -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
|
235 |
| 509 | 236 aliases: history |
| 497 | 237 |
| 438 | 238 manifest [revision]:: |
| 497 | 239 Print a list of version controlled files for the given revision. |
| 240 | |
| 241 The manifest is the list of files being version controlled. If no revision | |
| 242 is given then the tip is used. | |
| 438 | 243 |
| 244 parents:: | |
| 245 Print the working directory's parent revisions. | |
| 246 | |
| 247 pull <repository path>:: | |
| 498 | 248 Pull changes from a remote repository to a local one. |
| 497 | 249 |
| 498 | 250 This finds all changes from the repository at the specified path |
| 251 or URL and adds them to the local repository. By default, this | |
| 252 does not update the copy of the project in the working directory. | |
| 438 | 253 |
| 254 options: | |
| 255 -u, --update update the working directory to tip after pull | |
| 256 | |
| 257 push <destination>:: | |
| 497 | 258 Push changes from the local repository to the given destination. |
| 259 | |
| 498 | 260 This is the symmetrical operation for pull. It helps to move |
| 261 changes from the current repository to a different one. If the | |
| 262 destination is local this is identical to a pull in that directory | |
| 263 from the current one. | |
| 438 | 264 |
| 265 The other currently available push method is SSH. This requires an | |
| 266 accessible shell account on the destination machine and a copy of | |
| 267 hg in the remote path. Destinations are specified in the following | |
| 268 form: | |
| 269 | |
| 270 ssh://[user@]host[:port]/path | |
| 271 | |
| 272 rawcommit [-p -d -u -F -t -l]:: | |
| 497 | 273 Lowlevel commit, for use in helper scripts. |
| 274 | |
| 275 This command is not intended to be used by normal users, as it is | |
| 276 primarily useful for importing from other SCMs. | |
| 177 | 277 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
278 recover:: |
| 497 | 279 Recover from an interrupted commit or pull. |
| 280 | |
| 281 This command tries to fix the repository status after an interrupted | |
| 282 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
|
283 |
| 177 | 284 remove [files ...]:: |
| 497 | 285 Schedule the indicated files for removal from the repository. |
| 286 | |
| 498 | 287 This command shedules the files to be removed at the next commit. |
| 288 This only removes files from the current branch, not from the | |
| 289 entire project history. | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
290 |
| 438 | 291 aliases: rm |
| 177 | 292 |
| 588 | 293 revert [names ...]:: |
| 294 Revert any uncommitted modifications made to the named files or | |
| 295 directories. This restores the contents of the affected files to | |
| 296 an unmodified state. | |
| 297 | |
| 298 If a file has been deleted, it is recreated. If the executable | |
| 299 mode of a file was changed, it is reset. | |
| 300 | |
| 301 If a directory is given, all files in that directory and its | |
| 302 subdirectories are reverted. | |
| 303 | |
| 304 If no arguments are given, all files in the current directory and | |
| 305 its subdirectories are reverted. | |
| 306 | |
| 307 options: | |
| 308 -r, --rev <rev> revision to revert to | |
| 309 -n, --nonrecursive do not recurse into subdirectories | |
| 310 | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
311 root:: |
|
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
312 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
|
313 |
|
606
ea4526f9b1a5
[PATCH] Fix thinko in "serve" man page entry.
mpm@selenic.com
parents:
605
diff
changeset
|
314 serve [options]:: |
| 438 | 315 Start a local HTTP repository browser and pull server. |
| 316 | |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
317 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
|
318 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
|
319 |
| 438 | 320 options: |
|
605
8e82fd763be2
[PATCH] Get "hg serve" to optionally log accesses and errors to files
mpm@selenic.com
parents:
595
diff
changeset
|
321 -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
|
322 -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
|
323 -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
|
324 -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
|
325 -n, --name <name> name to show in web pages (default: working dir) |
| 438 | 326 -t, --templatedir <path> web templates to use |
| 177 | 327 |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
328 status [options] [files]:: |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
329 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
|
330 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
|
331 given names are shown. |
| 438 | 332 |
| 497 | 333 The codes used to show the status of files are: |
| 334 | |
| 746 | 335 M = changed |
| 438 | 336 A = added |
| 337 R = removed | |
| 338 ? = not tracked | |
| 339 | |
|
731
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
340 options: |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
341 |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
342 -I, --include <pat> include directories matching the given patterns |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
343 -X, --exclude <pat> exclude directories matching the given patterns |
|
91ca3afab8e8
Add name matching to status command.
Bryan O'Sullivan <bos@serpentine.com>
parents:
728
diff
changeset
|
344 |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
345 tag [-l -t <text> -d <datecode> -u <user>] <name> [revision]:: |
| 497 | 346 Name a particular revision using <name>. |
| 347 | |
| 348 Tags are used to name particular revisions of the repository and are | |
| 349 very useful to compare different revision, to go back to significant | |
| 498 | 350 earlier versions or to mark branch points as releases, etc. |
| 497 | 351 |
| 498 | 352 If no revision is given, the tip is used. |
| 438 | 353 |
| 498 | 354 To facilitate version control, distribution, and merging of tags, |
| 355 they are stored as a file named ".hgtags" which is managed | |
| 356 similarly to other project files and can be hand-edited if | |
| 357 necessary. | |
| 358 | |
| 438 | 359 options: |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
360 -l, --local make the tag local |
| 438 | 361 -t, --text <text> message for tag commit log entry |
| 362 -d, --date <datecode> datecode for commit | |
| 363 -u, --user <user> user for commit | |
| 177 | 364 |
|
631
a287f6cd9c6b
Update documentation of hg tag
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
parents:
629
diff
changeset
|
365 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
|
366 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
|
367 a public tag with the same name, local tag is used. |
| 498 | 368 |
| 177 | 369 tags:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
370 List the repository tags. |
| 438 | 371 |
| 498 | 372 This lists both regular and local tags. |
| 497 | 373 |
| 438 | 374 tip:: |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
375 Show the tip revision. |
| 177 | 376 |
|
196
48827121af7e
add export, recover, and undo to the man page
jake@edge2.net
parents:
182
diff
changeset
|
377 undo:: |
| 438 | 378 Undo the last commit or pull transaction. |
| 379 | |
| 595 | 380 Roll back the last pull or commit transaction on the |
| 381 repository, restoring the project to its earlier state. | |
| 382 | |
| 383 This command should be used with care. There is only one level of | |
| 384 undo and there is no redo. | |
| 385 | |
| 386 This command is not intended for use on public repositories. Once | |
| 387 a change is visible for pull by other users, undoing it locally is | |
| 388 ineffective. | |
| 389 | |
| 438 | 390 update [-m -C] [revision]:: |
| 498 | 391 Update the working directory to the specified revision. |
| 438 | 392 |
| 498 | 393 By default, update will refuse to run if doing so would require |
| 394 merging or discarding local changes. | |
| 395 | |
| 396 With the -m option, a merge will be performed. | |
| 397 | |
| 398 With the -C option, local changes will be lost. | |
| 497 | 399 |
| 438 | 400 options: |
| 401 -m, --merge allow merging of branches | |
| 402 -C, --clean overwrite locally modified files | |
| 403 | |
| 404 aliases: up checkout co | |
| 405 | |
| 406 verify:: | |
| 407 Verify the integrity of the current repository. | |
| 408 | |
| 409 This will perform an extensive check of the repository's | |
| 410 integrity, validating the hashes and checksums of each entry in | |
| 411 the changelog, manifest, and tracked files, as well as the | |
| 412 integrity of their crosslinks and indices. | |
| 413 | |
|
724
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
414 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
|
415 ------------------ |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
416 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
417 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
|
418 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
|
419 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
420 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
|
421 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
|
422 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
423 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
|
424 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
425 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
|
426 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
|
427 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
|
428 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
429 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
|
430 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
|
431 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
|
432 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
433 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
|
434 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
|
435 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
436 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
|
437 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
|
438 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
439 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
|
440 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
441 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
|
442 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
|
443 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
|
444 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
445 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
|
446 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
447 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
|
448 *.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
|
449 **.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
|
450 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
|
451 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
|
452 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
|
453 subdirectory |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
454 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
455 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
|
456 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
457 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
|
458 |
|
1c0c413cccdd
Get add and locate to use new repo and dirstate walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
671
diff
changeset
|
459 |
| 580 | 460 SPECIFYING SINGLE REVISIONS |
| 461 --------------------------- | |
| 462 | |
| 463 Mercurial accepts several notations for identifying individual | |
| 464 revisions. | |
| 465 | |
| 466 A plain integer is treated as a revision number. Negative | |
| 467 integers are treated as offsets from the tip, with -1 denoting the | |
| 468 tip. | |
| 469 | |
| 470 A 40-digit hexadecimal string is treated as a unique revision | |
| 471 identifier. | |
| 472 | |
| 473 A hexadecimal string less than 40 characters long is treated as a | |
| 474 unique revision identifier, and referred to as a short-form | |
| 475 identifier. A short-form identifier is only valid if it is the | |
| 476 prefix of one full-length identifier. | |
| 477 | |
| 478 Any other string is treated as a tag name, which is a symbolic | |
| 479 name associated with a revision identifier. Tag names may not | |
| 480 contain the ":" character. | |
| 481 | |
| 482 The reserved name "tip" is a special tag that always identifies | |
| 483 the most recent revision. | |
| 484 | |
| 485 SPECIFYING MULTIPLE REVISIONS | |
| 486 ----------------------------- | |
| 487 | |
| 488 When Mercurial accepts more than one revision, they may be | |
| 489 specified individually, or provided as a continuous range, | |
| 490 separated by the ":" character. | |
| 491 | |
| 492 The syntax of range notation is [BEGIN]:[END], where BEGIN and END | |
| 493 are revision identifiers. Both BEGIN and END are optional. If | |
| 494 BEGIN is not specified, it defaults to revision number 0. If END | |
| 495 is not specified, it defaults to the tip. The range ":" thus | |
| 496 means "all revisions". | |
| 497 | |
| 498 If BEGIN is greater than END, revisions are treated in reverse | |
| 499 order. | |
| 500 | |
| 501 A range acts as an open interval. This means that a range of 3:5 | |
| 502 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
|
503 |
| 177 | 504 ENVIRONMENT VARIABLES |
| 505 --------------------- | |
| 438 | 506 |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
507 HGEDITOR:: |
|
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
508 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
|
509 value of EDITOR. |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
510 |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
511 (deprecated, use .hgrc) |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
512 |
| 177 | 513 HGMERGE:: |
| 498 | 514 An executable to use for resolving merge conflicts. The program |
| 438 | 515 will be executed with three arguments: local file, remote file, |
| 516 ancestor file. | |
| 517 | |
| 518 The default program is "hgmerge", which is a shell script provided | |
| 519 by Mercurial with some sensible defaults. | |
| 177 | 520 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
521 (deprecated, use .hgrc) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
522 |
| 177 | 523 HGUSER:: |
| 438 | 524 This is the string used for the author of a commit. |
| 177 | 525 |
|
608
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
526 (deprecated, use .hgrc) |
|
d2994b5298fb
Add username/merge/editor to .hgrc
Matt Mackall <mpm@selenic.com>
parents:
606
diff
changeset
|
527 |
| 177 | 528 EMAIL:: |
| 438 | 529 If HGUSER is not set, this will be used as the author for a commit. |
| 177 | 530 |
| 531 LOGNAME:: | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
532 If neither HGUSER nor EMAIL is set, LOGNAME will be used (with |
| 438 | 533 '@hostname' appended) as the author value for a commit. |
| 177 | 534 |
| 535 EDITOR:: | |
|
478
f1804f2e7f35
Update of doc/hg.1.txt
Thomas Arendsen Hein <thomas@intevation.de>
parents:
438
diff
changeset
|
536 This is the name of the editor used in the hgmerge script. It will be |
| 498 | 537 used for commit messages if HGEDITOR isn't set. Defaults to 'vi'. |
| 438 | 538 |
| 539 PYTHONPATH:: | |
| 540 This is used by Python to find imported modules and may need to be set | |
| 541 appropriately if Mercurial is not installed system-wide. | |
| 177 | 542 |
| 543 FILES | |
| 544 ----- | |
| 545 .hgignore:: | |
| 438 | 546 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
|
547 names that should be ignored by hg. |
| 177 | 548 |
| 549 .hgtags:: | |
| 438 | 550 This file contains changeset hash values and text tag names (one of each |
| 177 | 551 seperated by spaces) that correspond to tagged versions of the repository |
| 552 contents. | |
| 553 | |
| 438 | 554 $HOME/.hgrc, .hg/hgrc:: |
| 555 This file contains defaults and configuration. Values in .hg/hgrc | |
|
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
556 override those in .hgrc. See hgrc(5) for details of the contents |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
557 and format of these files. |
| 321 | 558 |
| 177 | 559 BUGS |
| 560 ---- | |
| 561 Probably lots, please post them to the mailing list (See Resources below) | |
| 562 when you find them. | |
| 563 | |
|
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
564 SEE ALSO |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
565 -------- |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
566 hgrc(5) |
|
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
567 |
| 177 | 568 AUTHOR |
| 569 ------ | |
| 570 Written by Matt Mackall <mpm@selenic.com> | |
| 571 | |
| 572 RESOURCES | |
| 573 --------- | |
| 574 http://selenic.com/mercurial[Main Web Site] | |
| 575 | |
|
671
efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
631
diff
changeset
|
576 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
|
577 |
| 177 | 578 http://selenic.com/hg[Source code repository] |
| 579 | |
| 580 http://selenic.com/mailman/listinfo/mercurial[Mailing list] | |
| 581 | |
| 582 COPYING | |
| 583 ------- | |
| 584 Copyright (C) 2005 Matt Mackall. | |
| 585 Free use of this software is granted under the terms of the GNU General | |
| 586 Public License (GPL). |