Show More
@@ -0,0 +1,25 | |||||
|
1 | Files in this directory: | |||
|
2 | ||||
|
3 | README - this file | |||
|
4 | hg.1.txt - asciidoc source for the files | |||
|
5 | hg.1 - groff man page for hg | |||
|
6 | hg.1.html - man page in html format | |||
|
7 | ||||
|
8 | How to generate the man page and html files | |||
|
9 | ||||
|
10 | For now we use asciidoc which is available at: | |||
|
11 | ||||
|
12 | http://www.methods.co.nz/asciidoc/ | |||
|
13 | ||||
|
14 | the file hg.1.txt is the input file, to generate the man page: | |||
|
15 | ||||
|
16 | asciidoc.py -d manpage -b docbook hg.1.txt | |||
|
17 | xmlto man hg.1.xml | |||
|
18 | ||||
|
19 | to display: | |||
|
20 | ||||
|
21 | groff -mandoc -Tascii hg.1 | more | |||
|
22 | ||||
|
23 | to create the html page (without stylesheets): | |||
|
24 | ||||
|
25 | asciidoc.py -b html hg.1.txt |
@@ -0,0 +1,209 | |||||
|
1 | .\"Generated by db2man.xsl. Don't modify this, modify the source. | |||
|
2 | .de Sh \" Subsection | |||
|
3 | .br | |||
|
4 | .if t .Sp | |||
|
5 | .ne 5 | |||
|
6 | .PP | |||
|
7 | \fB\\$1\fR | |||
|
8 | .PP | |||
|
9 | .. | |||
|
10 | .de Sp \" Vertical space (when we can't use .PP) | |||
|
11 | .if t .sp .5v | |||
|
12 | .if n .sp | |||
|
13 | .. | |||
|
14 | .de Ip \" List item | |||
|
15 | .br | |||
|
16 | .ie \\n(.$>=3 .ne \\$3 | |||
|
17 | .el .ne 3 | |||
|
18 | .IP "\\$1" \\$2 | |||
|
19 | .. | |||
|
20 | .TH "HG" 1 "" "" "" | |||
|
21 | .SH NAME | |||
|
22 | hg \- command line interface to the Mercurial source code management system | |||
|
23 | .SH "SYNOPSIS" | |||
|
24 | ||||
|
25 | ||||
|
26 | hg [\-v \-d \-q \-y] <command> [command options] [files] | |||
|
27 | ||||
|
28 | .SH "DESCRIPTION" | |||
|
29 | ||||
|
30 | ||||
|
31 | The hg(1) command provides a command line interface to the Mercurial system\&. | |||
|
32 | ||||
|
33 | .SH "NOTE" | |||
|
34 | ||||
|
35 | ||||
|
36 | Many of the hg commands are not yet subdirectory and/or working directory aware\&. This means that some commands will only work in the top level repository directory or will only accept paths and filenames relative to the top level\&. Merges and commits, in particular, should be done in the top\-level directory\&. | |||
|
37 | ||||
|
38 | .SH "OPTIONS" | |||
|
39 | ||||
|
40 | .TP | |||
|
41 | --debug, \-d | |||
|
42 | enable debugging output | |||
|
43 | ||||
|
44 | .TP | |||
|
45 | --quiet, \-q | |||
|
46 | suppress output | |||
|
47 | ||||
|
48 | .TP | |||
|
49 | --verbose, \-v | |||
|
50 | enable additional output | |||
|
51 | ||||
|
52 | .TP | |||
|
53 | --noninteractive, \-y | |||
|
54 | do not prompt, assume yes for any required answers | |||
|
55 | ||||
|
56 | .SH "COMMAND ELEMENTS" | |||
|
57 | ||||
|
58 | .TP | |||
|
59 | files ... | |||
|
60 | indicates one or more filename or relative path filenames | |||
|
61 | ||||
|
62 | .TP | |||
|
63 | path | |||
|
64 | indicates a path on the local machine | |||
|
65 | ||||
|
66 | .TP | |||
|
67 | revision | |||
|
68 | indicates a changeset which can be specified as a changeset id (int), a tag, or a unique substring of the changeset hash value | |||
|
69 | ||||
|
70 | .TP | |||
|
71 | repository path | |||
|
72 | is either the pathname of a local repository of the URI of a remote repository\&. There are two available URI protocols, hg:// which is fast and the http:// protocol which is much slower but does not require python on the web host\&. | |||
|
73 | ||||
|
74 | .SH "COMMANDS" | |||
|
75 | ||||
|
76 | .TP | |||
|
77 | add [files ...] | |||
|
78 | add the given files to the repository\&. Note that this just schedules the files for addition at the next hg commit time\&. | |||
|
79 | ||||
|
80 | .TP | |||
|
81 | addremove | |||
|
82 | add all new files and remove all missing files from the repository\&. new files are ignored if they match any of the patterns in \&.hgignore | |||
|
83 | ||||
|
84 | .TP | |||
|
85 | annotate [\-r revision \-u \-n \-c] [files ...] | |||
|
86 | list the files with each line showing the revision id responsible for that line\&. \-u will add the author to the revision id, \-c will print the changeset hash, and \-n will ... | |||
|
87 | ||||
|
88 | .TP | |||
|
89 | branch <path> | |||
|
90 | create a new branch of the repository indicated by path in the current directory\&. Note that there should not be a repository already initialized in the current directory | |||
|
91 | ||||
|
92 | .TP | |||
|
93 | checkout [revision] | |||
|
94 | check out the indicated version of the repository into the working directory\&. Note that currently no merge occurs with changed files in the working dir\&. | |||
|
95 | ||||
|
96 | .TP | |||
|
97 | commit | |||
|
98 | commit all changed files in the working dir to the repository\&. This uses the EDITOR environment variable to bring up an editor to add a commit comment\&. | |||
|
99 | ||||
|
100 | .TP | |||
|
101 | diff [\-r revision] [\-r revision] [files ...] | |||
|
102 | generate a unified diff of the indicated files\&. If there are no revisions specified, the working directory file is compared to the tip, one revision specified indicates a comparison between the working directory file and the specified revision, two revisions compares the two versions specified\&. | |||
|
103 | ||||
|
104 | .TP | |||
|
105 | dump <file> [revision] | |||
|
106 | print the indicated revision of the file | |||
|
107 | ||||
|
108 | .TP | |||
|
109 | dumpmanifest [revision] | |||
|
110 | print the indicated revision of the manifest (list of version controlled files) | |||
|
111 | ||||
|
112 | .TP | |||
|
113 | history | |||
|
114 | print the revision history of the repository | |||
|
115 | ||||
|
116 | .TP | |||
|
117 | init | |||
|
118 | initialize a repository in the current directory | |||
|
119 | ||||
|
120 | .TP | |||
|
121 | log <file> | |||
|
122 | print the revision history of the specified file | |||
|
123 | ||||
|
124 | .TP | |||
|
125 | merge <repository path> | |||
|
126 | pull any changes from the specified repository to the repository in the current directory\&. Use the value of the HGMERGE environment variable as a program to resolve any merge conflicts between the two repositories\&. An implicit commit is done at the end of this process if there were any merge conflicts\&. Note that merge does not yet merge with changed files in the working dir\&. | |||
|
127 | ||||
|
128 | .TP | |||
|
129 | remove [files ...] | |||
|
130 | schedule the indicated files for removal from the repository at the next commit | |||
|
131 | ||||
|
132 | .TP | |||
|
133 | serve [\-a addr \-n name \-p port \-t templatedir] | |||
|
134 | this will start an http server, by default on port 8000, that will allow browsing the repository using the hgweb interface and will allow merging from the repository\&. \-a sets the interface address, \-p the port to listen on, \-n the name of the repository and \-t sets the location of the template directory\&. | |||
|
135 | ||||
|
136 | .TP | |||
|
137 | status | |||
|
138 | list new, changed, and missing files in the working directory | |||
|
139 | ||||
|
140 | .TP | |||
|
141 | tags | |||
|
142 | list the current tags | |||
|
143 | ||||
|
144 | .SH "ENVIRONMENT VARIABLES" | |||
|
145 | ||||
|
146 | .TP | |||
|
147 | HGMERGE | |||
|
148 | points to an executable to use for resolving merge conflicts, the program will be executed with four arguments: local file, remote file, ancestor file, and original filename\&. | |||
|
149 | ||||
|
150 | .TP | |||
|
151 | HGUSER | |||
|
152 | this is the string used for the author value of a commit | |||
|
153 | ||||
|
154 | .TP | |||
|
155 | HG_OPTS | |||
|
156 | this string is used for default arguments to hg | |||
|
157 | ||||
|
158 | .TP | |||
|
159 | PYTHONPATH | |||
|
160 | this is used by Python to find imported modules and needs to be set appropriately based on where mercurial is installed | |||
|
161 | ||||
|
162 | .TP | |||
|
163 | ||||
|
164 | if HGUSER is not set, this will be used next as the author value for a commit | |||
|
165 | ||||
|
166 | .TP | |||
|
167 | LOGNAME | |||
|
168 | if neither HGUSER nor EMAIL is set, LOGNAME will be used (with @hostname appended) as the author value for a commit | |||
|
169 | ||||
|
170 | .TP | |||
|
171 | EDITOR | |||
|
172 | this is the name of the editor to use when committing | |||
|
173 | ||||
|
174 | .SH "FILES" | |||
|
175 | ||||
|
176 | .TP | |||
|
177 | \&.hgignore | |||
|
178 | this file contains regular expressions (one per line) that describe file names that should be ignored by hg | |||
|
179 | ||||
|
180 | .TP | |||
|
181 | \&.hgtags | |||
|
182 | this file contains changeset hash values and text tag names (one of each seperated by spaces) that correspond to tagged versions of the repository contents\&. | |||
|
183 | ||||
|
184 | .SH "BUGS" | |||
|
185 | ||||
|
186 | ||||
|
187 | Probably lots, please post them to the mailing list (See Resources below) when you find them\&. | |||
|
188 | ||||
|
189 | .SH "AUTHOR" | |||
|
190 | ||||
|
191 | ||||
|
192 | Written by Matt Mackall <mpm@selenic\&.com> | |||
|
193 | ||||
|
194 | .SH "RESOURCES" | |||
|
195 | ||||
|
196 | ||||
|
197 | Main Web Site: \fIhttp://selenic.com/mercurial\fR | |||
|
198 | ||||
|
199 | ||||
|
200 | Source code repository: \fIhttp://selenic.com/hg\fR | |||
|
201 | ||||
|
202 | ||||
|
203 | Mailing list: \fIhttp://selenic.com/mailman/listinfo/mercurial\fR | |||
|
204 | ||||
|
205 | .SH "COPYING" | |||
|
206 | ||||
|
207 | ||||
|
208 | Copyright (C) 2005 Matt Mackall\&. Free use of this software is granted under the terms of the GNU General Public License (GPL)\&. | |||
|
209 |
@@ -0,0 +1,407 | |||||
|
1 | <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> | |||
|
2 | <html> | |||
|
3 | <head> | |||
|
4 | <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> | |||
|
5 | <meta name="generator" content="AsciiDoc 6.0.3"> | |||
|
6 | <meta name="author" content="Matt Mackall"> | |||
|
7 | <meta name="author-email" content="mpm@selenic.com"> | |||
|
8 | <title>HG(1)</title> | |||
|
9 | </head> | |||
|
10 | <body> | |||
|
11 | <h1>HG(1)</h1> | |||
|
12 | <p> | |||
|
13 | <strong>by Matt Mackall</strong><br /> | |||
|
14 | <tt><<a href="mailto:mpm@selenic.com">mpm@selenic.com</a>></tt><br /> | |||
|
15 | v0.5, | |||
|
16 | 27 May 2005 | |||
|
17 | </p> | |||
|
18 | <hr /> | |||
|
19 | <h2>NAME</h2> | |||
|
20 | <p> | |||
|
21 | hg - command line interface to the Mercurial source code management system | |||
|
22 | </p> | |||
|
23 | <hr /> | |||
|
24 | <h2>SYNOPSIS</h2> | |||
|
25 | <p> | |||
|
26 | <em>hg</em> [-v -d -q -y] <command> [command options] [files] | |||
|
27 | </p> | |||
|
28 | <hr /> | |||
|
29 | <h2>DESCRIPTION</h2> | |||
|
30 | <p> | |||
|
31 | The hg(1) command provides a command line interface to the Mercurial system. | |||
|
32 | </p> | |||
|
33 | <hr /> | |||
|
34 | <h2>NOTE</h2> | |||
|
35 | <p> | |||
|
36 | Many of the hg commands are not yet subdirectory and/or working directory | |||
|
37 | aware. This means that some commands will only work in the top level | |||
|
38 | repository directory or will only accept paths and filenames relative to the | |||
|
39 | top level. Merges and commits, in particular, should be done in the | |||
|
40 | top-level directory. | |||
|
41 | </p> | |||
|
42 | <hr /> | |||
|
43 | <h2>OPTIONS</h2> | |||
|
44 | <dl> | |||
|
45 | <dt> | |||
|
46 | —debug, -d | |||
|
47 | </dt> | |||
|
48 | <dd> | |||
|
49 | ||||
|
50 | enable debugging output | |||
|
51 | ||||
|
52 | </dd> | |||
|
53 | <dt> | |||
|
54 | —quiet, -q | |||
|
55 | </dt> | |||
|
56 | <dd> | |||
|
57 | ||||
|
58 | suppress output | |||
|
59 | ||||
|
60 | </dd> | |||
|
61 | <dt> | |||
|
62 | —verbose, -v | |||
|
63 | </dt> | |||
|
64 | <dd> | |||
|
65 | ||||
|
66 | enable additional output | |||
|
67 | ||||
|
68 | </dd> | |||
|
69 | <dt> | |||
|
70 | —noninteractive, -y | |||
|
71 | </dt> | |||
|
72 | <dd> | |||
|
73 | ||||
|
74 | do not prompt, assume <em>yes</em> for any required answers | |||
|
75 | ||||
|
76 | </dd> | |||
|
77 | </dl> | |||
|
78 | <hr /> | |||
|
79 | <h2>COMMAND ELEMENTS</h2> | |||
|
80 | <dl> | |||
|
81 | <dt> | |||
|
82 | files … | |||
|
83 | </dt> | |||
|
84 | <dd> | |||
|
85 | ||||
|
86 | indicates one or more filename or relative path filenames | |||
|
87 | ||||
|
88 | </dd> | |||
|
89 | <dt> | |||
|
90 | path | |||
|
91 | </dt> | |||
|
92 | <dd> | |||
|
93 | ||||
|
94 | indicates a path on the local machine | |||
|
95 | ||||
|
96 | </dd> | |||
|
97 | <dt> | |||
|
98 | revision | |||
|
99 | </dt> | |||
|
100 | <dd> | |||
|
101 | ||||
|
102 | indicates a changeset which can be specified as a changeset id (int), | |||
|
103 | a tag, or a unique substring of the changeset hash value | |||
|
104 | ||||
|
105 | </dd> | |||
|
106 | <dt> | |||
|
107 | repository path | |||
|
108 | </dt> | |||
|
109 | <dd> | |||
|
110 | ||||
|
111 | is either the pathname of a local repository of the URI of a remote | |||
|
112 | repository. There are two available URI protocols, hg:// which is | |||
|
113 | fast and the http:// protocol which is much slower but does not require | |||
|
114 | python on the web host. | |||
|
115 | ||||
|
116 | </dd> | |||
|
117 | </dl> | |||
|
118 | <hr /> | |||
|
119 | <h2>COMMANDS</h2> | |||
|
120 | <dl> | |||
|
121 | <dt> | |||
|
122 | add [files …] | |||
|
123 | </dt> | |||
|
124 | <dd> | |||
|
125 | ||||
|
126 | add the given files to the repository. Note that this just schedules the | |||
|
127 | files for addition at the next hg commit time. | |||
|
128 | ||||
|
129 | </dd> | |||
|
130 | <dt> | |||
|
131 | addremove | |||
|
132 | </dt> | |||
|
133 | <dd> | |||
|
134 | ||||
|
135 | add all new files and remove all missing files from the repository. new | |||
|
136 | files are ignored if they match any of the patterns in .hgignore | |||
|
137 | ||||
|
138 | </dd> | |||
|
139 | <dt> | |||
|
140 | annotate [-r revision -u -n -c] [files …] | |||
|
141 | </dt> | |||
|
142 | <dd> | |||
|
143 | ||||
|
144 | list the files with each line showing the revision id responsible | |||
|
145 | for that line. -u will add the author to the revision id, -c will | |||
|
146 | print the changeset hash, and -n will … | |||
|
147 | ||||
|
148 | </dd> | |||
|
149 | <dt> | |||
|
150 | branch <path> | |||
|
151 | </dt> | |||
|
152 | <dd> | |||
|
153 | ||||
|
154 | create a new branch of the repository indicated by path in the current | |||
|
155 | directory. Note that there should not be a repository already initialized | |||
|
156 | in the current directory | |||
|
157 | ||||
|
158 | </dd> | |||
|
159 | <dt> | |||
|
160 | checkout [revision] | |||
|
161 | </dt> | |||
|
162 | <dd> | |||
|
163 | ||||
|
164 | check out the indicated version of the repository into the working | |||
|
165 | directory. Note that currently no merge occurs with changed files | |||
|
166 | in the working dir. | |||
|
167 | ||||
|
168 | </dd> | |||
|
169 | <dt> | |||
|
170 | commit | |||
|
171 | </dt> | |||
|
172 | <dd> | |||
|
173 | ||||
|
174 | commit all changed files in the working dir to the repository. This uses | |||
|
175 | the EDITOR environment variable to bring up an editor to add a commit | |||
|
176 | comment. | |||
|
177 | ||||
|
178 | </dd> | |||
|
179 | <dt> | |||
|
180 | diff [-r revision] [-r revision] [files …] | |||
|
181 | </dt> | |||
|
182 | <dd> | |||
|
183 | ||||
|
184 | generate a unified diff of the indicated files. If there are no | |||
|
185 | revisions specified, the working directory file is compared to | |||
|
186 | the tip, one revision specified indicates a comparison between the | |||
|
187 | working directory file and the specified revision, two revisions | |||
|
188 | compares the two versions specified. | |||
|
189 | ||||
|
190 | </dd> | |||
|
191 | <dt> | |||
|
192 | dump <file> [revision] | |||
|
193 | </dt> | |||
|
194 | <dd> | |||
|
195 | ||||
|
196 | print the indicated revision of the file | |||
|
197 | ||||
|
198 | </dd> | |||
|
199 | <dt> | |||
|
200 | dumpmanifest [revision] | |||
|
201 | </dt> | |||
|
202 | <dd> | |||
|
203 | ||||
|
204 | print the indicated revision of the manifest (list of version controlled | |||
|
205 | files) | |||
|
206 | ||||
|
207 | </dd> | |||
|
208 | <dt> | |||
|
209 | history | |||
|
210 | </dt> | |||
|
211 | <dd> | |||
|
212 | ||||
|
213 | print the revision history of the repository | |||
|
214 | ||||
|
215 | </dd> | |||
|
216 | <dt> | |||
|
217 | init | |||
|
218 | </dt> | |||
|
219 | <dd> | |||
|
220 | ||||
|
221 | initialize a repository in the current directory | |||
|
222 | ||||
|
223 | </dd> | |||
|
224 | <dt> | |||
|
225 | log <file> | |||
|
226 | </dt> | |||
|
227 | <dd> | |||
|
228 | ||||
|
229 | print the revision history of the specified file | |||
|
230 | ||||
|
231 | </dd> | |||
|
232 | <dt> | |||
|
233 | merge <repository path> | |||
|
234 | </dt> | |||
|
235 | <dd> | |||
|
236 | ||||
|
237 | pull any changes from the specified repository to the repository in the | |||
|
238 | current directory. Use the value of the HGMERGE environment variable | |||
|
239 | as a program to resolve any merge conflicts between the two repositories. | |||
|
240 | An implicit commit is done at the end of this process if there were any | |||
|
241 | merge conflicts. Note that merge does not yet merge with changed files | |||
|
242 | in the working dir. | |||
|
243 | ||||
|
244 | </dd> | |||
|
245 | <dt> | |||
|
246 | remove [files …] | |||
|
247 | </dt> | |||
|
248 | <dd> | |||
|
249 | ||||
|
250 | schedule the indicated files for removal from the repository at the next | |||
|
251 | commit | |||
|
252 | ||||
|
253 | </dd> | |||
|
254 | <dt> | |||
|
255 | serve [-a addr -n name -p port -t templatedir] | |||
|
256 | </dt> | |||
|
257 | <dd> | |||
|
258 | ||||
|
259 | this will start an http server, by default on port 8000, that will | |||
|
260 | allow browsing the repository using the hgweb interface and will allow | |||
|
261 | merging from the repository. -a sets the interface address, -p the | |||
|
262 | port to listen on, -n the name of the repository and -t sets the | |||
|
263 | location of the template directory. | |||
|
264 | ||||
|
265 | </dd> | |||
|
266 | <dt> | |||
|
267 | status | |||
|
268 | </dt> | |||
|
269 | <dd> | |||
|
270 | ||||
|
271 | list new, changed, and missing files in the working directory | |||
|
272 | ||||
|
273 | </dd> | |||
|
274 | <dt> | |||
|
275 | tags | |||
|
276 | </dt> | |||
|
277 | <dd> | |||
|
278 | ||||
|
279 | list the current tags | |||
|
280 | ||||
|
281 | </dd> | |||
|
282 | </dl> | |||
|
283 | <hr /> | |||
|
284 | <h2>ENVIRONMENT VARIABLES</h2> | |||
|
285 | <dl> | |||
|
286 | <dt> | |||
|
287 | HGMERGE | |||
|
288 | </dt> | |||
|
289 | <dd> | |||
|
290 | ||||
|
291 | points to an executable to use for resolving merge conflicts, the | |||
|
292 | program will be executed with four arguments: local file, remote | |||
|
293 | file, ancestor file, and original filename. | |||
|
294 | ||||
|
295 | </dd> | |||
|
296 | <dt> | |||
|
297 | HGUSER | |||
|
298 | </dt> | |||
|
299 | <dd> | |||
|
300 | ||||
|
301 | this is the string used for the author value of a commit | |||
|
302 | ||||
|
303 | </dd> | |||
|
304 | <dt> | |||
|
305 | HG_OPTS | |||
|
306 | </dt> | |||
|
307 | <dd> | |||
|
308 | ||||
|
309 | this string is used for default arguments to hg | |||
|
310 | ||||
|
311 | </dd> | |||
|
312 | <dt> | |||
|
313 | PYTHONPATH | |||
|
314 | </dt> | |||
|
315 | <dd> | |||
|
316 | ||||
|
317 | this is used by Python to find imported modules and needs to be set | |||
|
318 | appropriately based on where mercurial is installed | |||
|
319 | ||||
|
320 | </dd> | |||
|
321 | <dt> | |||
|
322 | ||||
|
323 | </dt> | |||
|
324 | <dd> | |||
|
325 | ||||
|
326 | if HGUSER is not set, this will be used next as the author value for | |||
|
327 | a commit | |||
|
328 | ||||
|
329 | </dd> | |||
|
330 | <dt> | |||
|
331 | LOGNAME | |||
|
332 | </dt> | |||
|
333 | <dd> | |||
|
334 | ||||
|
335 | if neither HGUSER nor EMAIL is set, LOGNAME will be used (with | |||
|
336 | <em>@hostname</em> appended) as the author value for a commit | |||
|
337 | ||||
|
338 | </dd> | |||
|
339 | <dt> | |||
|
340 | EDITOR | |||
|
341 | </dt> | |||
|
342 | <dd> | |||
|
343 | ||||
|
344 | this is the name of the editor to use when committing | |||
|
345 | ||||
|
346 | </dd> | |||
|
347 | </dl> | |||
|
348 | <hr /> | |||
|
349 | <h2>FILES</h2> | |||
|
350 | <dl> | |||
|
351 | <dt> | |||
|
352 | .hgignore | |||
|
353 | </dt> | |||
|
354 | <dd> | |||
|
355 | ||||
|
356 | this file contains regular expressions (one per line) that describe file | |||
|
357 | names that should be ignored by hg | |||
|
358 | ||||
|
359 | </dd> | |||
|
360 | <dt> | |||
|
361 | .hgtags | |||
|
362 | </dt> | |||
|
363 | <dd> | |||
|
364 | ||||
|
365 | this file contains changeset hash values and text tag names (one of each | |||
|
366 | seperated by spaces) that correspond to tagged versions of the repository | |||
|
367 | contents. | |||
|
368 | ||||
|
369 | </dd> | |||
|
370 | </dl> | |||
|
371 | <hr /> | |||
|
372 | <h2>BUGS</h2> | |||
|
373 | <p> | |||
|
374 | Probably lots, please post them to the mailing list (See Resources below) | |||
|
375 | when you find them. | |||
|
376 | </p> | |||
|
377 | <hr /> | |||
|
378 | <h2>AUTHOR</h2> | |||
|
379 | <p> | |||
|
380 | Written by Matt Mackall <mpm@selenic.com> | |||
|
381 | </p> | |||
|
382 | <hr /> | |||
|
383 | <h2>RESOURCES</h2> | |||
|
384 | <p> | |||
|
385 | <a href="http://selenic.com/mercurial">Main Web Site</a> | |||
|
386 | </p> | |||
|
387 | <p> | |||
|
388 | <a href="http://selenic.com/hg">Source code repository</a> | |||
|
389 | </p> | |||
|
390 | <p> | |||
|
391 | <a href="http://selenic.com/mailman/listinfo/mercurial">Mailing list</a> | |||
|
392 | </p> | |||
|
393 | <hr /> | |||
|
394 | <h2>COPYING</h2> | |||
|
395 | <p> | |||
|
396 | Copyright © 2005 Matt Mackall. | |||
|
397 | Free use of this software is granted under the terms of the GNU General | |||
|
398 | Public License (GPL). | |||
|
399 | </p> | |||
|
400 | <p></p> | |||
|
401 | <p></p> | |||
|
402 | <hr /><p><small> | |||
|
403 | Version 0.5<br /> | |||
|
404 | Last updated 27-May-2005 08:14:25 MDT | |||
|
405 | </small></p> | |||
|
406 | </body> | |||
|
407 | </html> |
@@ -0,0 +1,197 | |||||
|
1 | HG(1) | |||
|
2 | ===== | |||
|
3 | Matt Mackall <mpm@selenic.com> | |||
|
4 | v0.5, 27 May 2005 | |||
|
5 | ||||
|
6 | NAME | |||
|
7 | ---- | |||
|
8 | hg - command line interface to the Mercurial source code management system | |||
|
9 | ||||
|
10 | SYNOPSIS | |||
|
11 | -------- | |||
|
12 | 'hg' [-v -d -q -y] <command> [command options] [files] | |||
|
13 | ||||
|
14 | DESCRIPTION | |||
|
15 | ----------- | |||
|
16 | The hg(1) command provides a command line interface to the Mercurial system. | |||
|
17 | ||||
|
18 | NOTE | |||
|
19 | ---- | |||
|
20 | Many of the hg commands are not yet subdirectory and/or working directory | |||
|
21 | aware. This means that some commands will only work in the top level | |||
|
22 | repository directory or will only accept paths and filenames relative to the | |||
|
23 | top level. Merges and commits, in particular, should be done in the | |||
|
24 | top-level directory. | |||
|
25 | ||||
|
26 | OPTIONS | |||
|
27 | ------- | |||
|
28 | --debug, -d:: | |||
|
29 | enable debugging output | |||
|
30 | ||||
|
31 | --quiet, -q:: | |||
|
32 | suppress output | |||
|
33 | ||||
|
34 | --verbose, -v:: | |||
|
35 | enable additional output | |||
|
36 | ||||
|
37 | --noninteractive, -y:: | |||
|
38 | do not prompt, assume 'yes' for any required answers | |||
|
39 | ||||
|
40 | COMMAND ELEMENTS | |||
|
41 | ---------------- | |||
|
42 | ||||
|
43 | files ...:: | |||
|
44 | indicates one or more filename or relative path filenames | |||
|
45 | ||||
|
46 | path:: | |||
|
47 | indicates a path on the local machine | |||
|
48 | ||||
|
49 | revision:: | |||
|
50 | indicates a changeset which can be specified as a changeset id (int), | |||
|
51 | a tag, or a unique substring of the changeset hash value | |||
|
52 | ||||
|
53 | repository path:: | |||
|
54 | is either the pathname of a local repository of the URI of a remote | |||
|
55 | repository. There are two available URI protocols, hg:// which is | |||
|
56 | fast and the http:// protocol which is much slower but does not require | |||
|
57 | python on the web host. | |||
|
58 | ||||
|
59 | COMMANDS | |||
|
60 | -------- | |||
|
61 | add [files ...]:: | |||
|
62 | add the given files to the repository. Note that this just schedules the | |||
|
63 | files for addition at the next hg commit time. | |||
|
64 | ||||
|
65 | addremove:: | |||
|
66 | add all new files and remove all missing files from the repository. new | |||
|
67 | files are ignored if they match any of the patterns in .hgignore | |||
|
68 | ||||
|
69 | annotate [-r revision -u -n -c] [files ...]:: | |||
|
70 | list the files with each line showing the revision id responsible | |||
|
71 | for that line. -u will add the author to the revision id, -c will | |||
|
72 | print the changeset hash, and -n will ... | |||
|
73 | ||||
|
74 | branch <path>:: | |||
|
75 | create a new branch of the repository indicated by path in the current | |||
|
76 | directory. Note that there should not be a repository already initialized | |||
|
77 | in the current directory | |||
|
78 | ||||
|
79 | checkout [revision]:: | |||
|
80 | check out the indicated version of the repository into the working | |||
|
81 | directory. Note that currently no merge occurs with changed files | |||
|
82 | in the working dir. | |||
|
83 | ||||
|
84 | commit:: | |||
|
85 | commit all changed files in the working dir to the repository. This uses | |||
|
86 | the EDITOR environment variable to bring up an editor to add a commit | |||
|
87 | comment. | |||
|
88 | ||||
|
89 | diff [-r revision] [-r revision] [files ...]:: | |||
|
90 | generate a unified diff of the indicated files. If there are no | |||
|
91 | revisions specified, the working directory file is compared to | |||
|
92 | the tip, one revision specified indicates a comparison between the | |||
|
93 | working directory file and the specified revision, two revisions | |||
|
94 | compares the two versions specified. | |||
|
95 | ||||
|
96 | dump <file> [revision]:: | |||
|
97 | print the indicated revision of the file | |||
|
98 | ||||
|
99 | dumpmanifest [revision]:: | |||
|
100 | print the indicated revision of the manifest (list of version controlled | |||
|
101 | files) | |||
|
102 | ||||
|
103 | history:: | |||
|
104 | print the revision history of the repository | |||
|
105 | ||||
|
106 | init:: | |||
|
107 | initialize a repository in the current directory | |||
|
108 | ||||
|
109 | log <file>:: | |||
|
110 | print the revision history of the specified file | |||
|
111 | ||||
|
112 | merge <repository path>:: | |||
|
113 | pull any changes from the specified repository to the repository in the | |||
|
114 | current directory. Use the value of the HGMERGE environment variable | |||
|
115 | as a program to resolve any merge conflicts between the two repositories. | |||
|
116 | An implicit commit is done at the end of this process if there were any | |||
|
117 | merge conflicts. Note that merge does not yet merge with changed files | |||
|
118 | in the working dir. | |||
|
119 | ||||
|
120 | remove [files ...]:: | |||
|
121 | schedule the indicated files for removal from the repository at the next | |||
|
122 | commit | |||
|
123 | ||||
|
124 | serve [-a addr -n name -p port -t templatedir]:: | |||
|
125 | this will start an http server, by default on port 8000, that will | |||
|
126 | allow browsing the repository using the hgweb interface and will allow | |||
|
127 | merging from the repository. -a sets the interface address, -p the | |||
|
128 | port to listen on, -n the name of the repository and -t sets the | |||
|
129 | location of the template directory. | |||
|
130 | ||||
|
131 | status:: | |||
|
132 | list new, changed, and missing files in the working directory | |||
|
133 | ||||
|
134 | tags:: | |||
|
135 | list the current tags | |||
|
136 | ||||
|
137 | ENVIRONMENT VARIABLES | |||
|
138 | --------------------- | |||
|
139 | HGMERGE:: | |||
|
140 | points to an executable to use for resolving merge conflicts, the | |||
|
141 | program will be executed with four arguments: local file, remote | |||
|
142 | file, ancestor file, and original filename. | |||
|
143 | ||||
|
144 | HGUSER:: | |||
|
145 | this is the string used for the author value of a commit | |||
|
146 | ||||
|
147 | HG_OPTS:: | |||
|
148 | this string is used for default arguments to hg | |||
|
149 | ||||
|
150 | PYTHONPATH:: | |||
|
151 | this is used by Python to find imported modules and needs to be set | |||
|
152 | appropriately based on where mercurial is installed | |||
|
153 | ||||
|
154 | EMAIL:: | |||
|
155 | if HGUSER is not set, this will be used next as the author value for | |||
|
156 | a commit | |||
|
157 | ||||
|
158 | LOGNAME:: | |||
|
159 | if neither HGUSER nor EMAIL is set, LOGNAME will be used (with | |||
|
160 | '@hostname' appended) as the author value for a commit | |||
|
161 | ||||
|
162 | EDITOR:: | |||
|
163 | this is the name of the editor to use when committing | |||
|
164 | ||||
|
165 | FILES | |||
|
166 | ----- | |||
|
167 | .hgignore:: | |||
|
168 | this file contains regular expressions (one per line) that describe file | |||
|
169 | names that should be ignored by hg | |||
|
170 | ||||
|
171 | .hgtags:: | |||
|
172 | this file contains changeset hash values and text tag names (one of each | |||
|
173 | seperated by spaces) that correspond to tagged versions of the repository | |||
|
174 | contents. | |||
|
175 | ||||
|
176 | BUGS | |||
|
177 | ---- | |||
|
178 | Probably lots, please post them to the mailing list (See Resources below) | |||
|
179 | when you find them. | |||
|
180 | ||||
|
181 | AUTHOR | |||
|
182 | ------ | |||
|
183 | Written by Matt Mackall <mpm@selenic.com> | |||
|
184 | ||||
|
185 | RESOURCES | |||
|
186 | --------- | |||
|
187 | http://selenic.com/mercurial[Main Web Site] | |||
|
188 | ||||
|
189 | http://selenic.com/hg[Source code repository] | |||
|
190 | ||||
|
191 | http://selenic.com/mailman/listinfo/mercurial[Mailing list] | |||
|
192 | ||||
|
193 | COPYING | |||
|
194 | ------- | |||
|
195 | Copyright (C) 2005 Matt Mackall. | |||
|
196 | Free use of this software is granted under the terms of the GNU General | |||
|
197 | Public License (GPL). |
General Comments 0
You need to be logged in to leave comments.
Login now