Show More
@@ -1,7 +1,7 b'' | |||||
1 | HG(1) |
|
1 | HG(1) | |
2 | ===== |
|
2 | ===== | |
3 | Matt Mackall <mpm@selenic.com> |
|
3 | Matt Mackall <mpm@selenic.com> | |
4 |
v0.6, 2 |
|
4 | v0.6, 24 Jun 2005 | |
5 |
|
5 | |||
6 | NAME |
|
6 | NAME | |
7 | ---- |
|
7 | ---- | |
@@ -39,14 +39,14 b' files ...::' | |||||
39 | path:: |
|
39 | path:: | |
40 | indicates a path on the local machine |
|
40 | indicates a path on the local machine | |
41 |
|
41 | |||
42 |
revision:: |
|
42 | revision:: | |
43 | indicates a changeset which can be specified as a changeset revision |
|
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 |
|
44 | number, a tag, or a unique substring of the changeset hash value | |
45 |
|
45 | |||
46 | repository path:: |
|
46 | repository path:: | |
47 | is either the pathname of a local repository of the URI of a remote |
|
47 | is either the pathname of a local repository of the URI of a remote | |
48 | repository. There are two available URI protocols, http:// which is |
|
48 | repository. There are two available URI protocols, http:// which is | |
49 |
fast and the old-http:// protocol which is much slower but does not |
|
49 | fast and the old-http:// protocol which is much slower but does not | |
50 | require a special server on the web host. |
|
50 | require a special server on the web host. | |
51 |
|
51 | |||
52 | COMMANDS |
|
52 | COMMANDS | |
@@ -61,8 +61,8 b' addremove::' | |||||
61 | files are ignored if they match any of the patterns in .hgignore |
|
61 | files are ignored if they match any of the patterns in .hgignore | |
62 |
|
62 | |||
63 | annotate [-r <rev> -u -n -c] [files ...]:: |
|
63 | annotate [-r <rev> -u -n -c] [files ...]:: | |
64 |
List the files with each line showing the revision id responsible |
|
64 | List the files with each line showing the revision id responsible | |
65 |
for that line. |
|
65 | for that line. | |
66 |
|
66 | |||
67 | options: |
|
67 | options: | |
68 | -r, --revision <rev> annotate the specified revision |
|
68 | -r, --revision <rev> annotate the specified revision | |
@@ -74,12 +74,12 b' cat <file> [revision]::' | |||||
74 | Output the given revision or tip of the specified file to stdout. |
|
74 | Output the given revision or tip of the specified file to stdout. | |
75 |
|
75 | |||
76 | commit [-A -t -l <file> -t <text> -u <user> -d <datecode>] [files...]:: |
|
76 | commit [-A -t -l <file> -t <text> -u <user> -d <datecode>] [files...]:: | |
77 |
|
|
77 | Commit all changed files in the working dir to the repository. This uses | |
78 | the EDITOR environment variable to bring up an editor to add a commit |
|
78 | the EDITOR environment variable to bring up an editor to add a commit | |
79 | comment. |
|
79 | comment. | |
80 |
|
80 | |||
81 | Options: |
|
81 | Options: | |
82 |
|
82 | |||
83 | -A, --addremove run addremove during commit |
|
83 | -A, --addremove run addremove during commit | |
84 | -t, --text <text> use <text> as commit message |
|
84 | -t, --text <text> use <text> as commit message | |
85 | -l, --logfile <file> read the commit message from the specified |
|
85 | -l, --logfile <file> read the commit message from the specified | |
@@ -93,10 +93,10 b' copy <source> <dest>::' | |||||
93 | Mark a file as copied or renamed for the next commit. |
|
93 | Mark a file as copied or renamed for the next commit. | |
94 |
|
94 | |||
95 | diff [-r revision] [-r revision] [files ...]:: |
|
95 | diff [-r revision] [-r revision] [files ...]:: | |
96 |
Generate a unified diff of the indicated files. If there are no |
|
96 | Generate a unified diff of the indicated files. If there are no | |
97 |
revisions specified, the working directory file is compared to |
|
97 | revisions specified, the working directory file is compared to | |
98 |
the tip, one revision specified indicates a comparison between the |
|
98 | the tip, one revision specified indicates a comparison between the | |
99 |
working directory file and the specified revision, and two revisions |
|
99 | working directory file and the specified revision, and two revisions | |
100 | compares the two versions specified. |
|
100 | compares the two versions specified. | |
101 |
|
101 | |||
102 | export [revision]:: |
|
102 | export [revision]:: | |
@@ -118,7 +118,7 b' identify::' | |||||
118 | Print a short identifier of the current state of the repo. This |
|
118 | Print a short identifier of the current state of the repo. This | |
119 | includes one or two parent hash identifiers, followed by |
|
119 | includes one or two parent hash identifiers, followed by | |
120 | a "+" if there are uncommitted changes in the working directory, |
|
120 | a "+" if there are uncommitted changes in the working directory, | |
121 | followed by a list of tags for this revision |
|
121 | followed by a list of tags for this revision. | |
122 |
|
122 | |||
123 | aliases: id |
|
123 | aliases: id | |
124 |
|
124 | |||
@@ -150,13 +150,13 b' log <file>::' | |||||
150 |
|
150 | |||
151 | manifest [revision]:: |
|
151 | manifest [revision]:: | |
152 | Print the indicated revision of the manifest (list of version controlled |
|
152 | Print the indicated revision of the manifest (list of version controlled | |
153 | files) |
|
153 | files). | |
154 |
|
154 | |||
155 | parents:: |
|
155 | parents:: | |
156 | Print the working directory's parent revisions. |
|
156 | Print the working directory's parent revisions. | |
157 |
|
157 | |||
158 | pull <repository path>:: |
|
158 | pull <repository path>:: | |
159 |
|
|
159 | Pull any changes from the specified repository to the repository in the | |
160 | current directory. |
|
160 | current directory. | |
161 |
|
161 | |||
162 | options: |
|
162 | options: | |
@@ -175,18 +175,21 b' push <destination>::' | |||||
175 | ssh://[user@]host[:port]/path |
|
175 | ssh://[user@]host[:port]/path | |
176 |
|
176 | |||
177 | rawcommit [-p -d -u -F -t -l]:: |
|
177 | rawcommit [-p -d -u -F -t -l]:: | |
178 |
Primarily useful for importing from other SCMs. |
|
178 | Primarily useful for importing from other SCMs. | |
179 |
|
179 | |||
180 | recover:: |
|
180 | recover:: | |
181 | Recover from an interrupted commit or pull. This should only be |
|
181 | Recover from an interrupted commit or pull. This should only be | |
182 | necessary when Mercurial suggests it. |
|
182 | necessary when Mercurial suggests it. | |
183 |
|
183 | |||
184 | remove [files ...]:: |
|
184 | remove [files ...]:: | |
185 |
|
|
185 | Schedule the indicated files for removal from the repository at the next | |
186 | commit |
|
186 | commit. | |
187 |
|
187 | |||
188 | aliases: rm |
|
188 | aliases: rm | |
189 |
|
189 | |||
|
190 | root:: | |||
|
191 | Print the root directory of the current repository. | |||
|
192 | ||||
190 | serve [-a addr -n name -p port -t templatedir]:: |
|
193 | serve [-a addr -n name -p port -t templatedir]:: | |
191 | Start a local HTTP repository browser and pull server. |
|
194 | Start a local HTTP repository browser and pull server. | |
192 |
|
195 | |||
@@ -213,10 +216,10 b' tag [-t <text> -d <datecode> -u <user>] ' | |||||
213 | -u, --user <user> user for commit |
|
216 | -u, --user <user> user for commit | |
214 |
|
217 | |||
215 | tags:: |
|
218 | tags:: | |
216 |
List the |
|
219 | List the repository tags. | |
217 |
|
220 | |||
218 | tip:: |
|
221 | tip:: | |
219 | Show the tip revision |
|
222 | Show the tip revision. | |
220 |
|
223 | |||
221 | undo:: |
|
224 | undo:: | |
222 | Undo the last commit or pull transaction. |
|
225 | Undo the last commit or pull transaction. | |
@@ -256,6 +259,10 b' verify::' | |||||
256 | ENVIRONMENT VARIABLES |
|
259 | ENVIRONMENT VARIABLES | |
257 | --------------------- |
|
260 | --------------------- | |
258 |
|
261 | |||
|
262 | HGEDITOR:: | |||
|
263 | This is the name of the editor to use when committing. Defaults to the | |||
|
264 | value of EDITOR. | |||
|
265 | ||||
259 | HGMERGE:: |
|
266 | HGMERGE:: | |
260 | An executable to use for resolving merge conflicts. The program , |
|
267 | An executable to use for resolving merge conflicts. The program , | |
261 | will be executed with three arguments: local file, remote file, |
|
268 | will be executed with three arguments: local file, remote file, | |
@@ -271,11 +278,12 b' EMAIL::' | |||||
271 | If HGUSER is not set, this will be used as the author for a commit. |
|
278 | If HGUSER is not set, this will be used as the author for a commit. | |
272 |
|
279 | |||
273 | LOGNAME:: |
|
280 | LOGNAME:: | |
274 |
|
|
281 | If neither HGUSER nor EMAIL is set, LOGNAME will be used (with | |
275 | '@hostname' appended) as the author value for a commit. |
|
282 | '@hostname' appended) as the author value for a commit. | |
276 |
|
283 | |||
277 | EDITOR:: |
|
284 | EDITOR:: | |
278 | This is the name of the editor to use when committing. Defaults to 'vi'. |
|
285 | This is the name of the editor used in the hgmerge script. It will be | |
|
286 | used for commit messages, too, if HGEDITOR isn't set. Defaults to 'vi'. | |||
279 |
|
287 | |||
280 | PYTHONPATH:: |
|
288 | PYTHONPATH:: | |
281 | This is used by Python to find imported modules and may need to be set |
|
289 | This is used by Python to find imported modules and may need to be set | |
@@ -285,7 +293,7 b' FILES' | |||||
285 | ----- |
|
293 | ----- | |
286 | .hgignore:: |
|
294 | .hgignore:: | |
287 | This file contains regular expressions (one per line) that describe file |
|
295 | This file contains regular expressions (one per line) that describe file | |
288 | names that should be ignored by hg |
|
296 | names that should be ignored by hg. | |
289 |
|
297 | |||
290 | .hgtags:: |
|
298 | .hgtags:: | |
291 | This file contains changeset hash values and text tag names (one of each |
|
299 | This file contains changeset hash values and text tag names (one of each | |
@@ -306,6 +314,7 b' NAMED REPOSITORIES' | |||||
306 |
|
314 | |||
307 | [paths] |
|
315 | [paths] | |
308 | hg = http://selenic.com/hg |
|
316 | hg = http://selenic.com/hg | |
|
317 | tah = http://hg.intevation.org/mercurial-tah/ | |||
309 |
|
318 | |||
310 | NON_TRANSPARENT PROXY SUPPORT |
|
319 | NON_TRANSPARENT PROXY SUPPORT | |
311 | ----------------------------- |
|
320 | ----------------------------- |
General Comments 0
You need to be logged in to leave comments.
Login now