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