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