Show More
@@ -1,19 +1,23 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg |
|
3 | hg | |
4 | hg -q |
|
4 | hg -q | |
5 | hg help |
|
5 | hg help | |
6 | hg -q help |
|
6 | hg -q help | |
7 |
|
7 | |||
8 | echo %% test short command list with verbose option |
|
8 | echo %% test short command list with verbose option | |
9 | hg -v help shortlist | sed 's/[(]version [^)]*[)]/(version xxx)/' |
|
9 | hg -v help shortlist | sed 's/[(]version [^)]*[)]/(version xxx)/' | |
10 |
|
10 | |||
11 | hg add -h |
|
11 | hg add -h | |
|
12 | ||||
|
13 | echo %% test help option with version option | |||
|
14 | hg add -h --version | sed 's/[(]version [^)]*[)]/(version xxx)/' | |||
|
15 | ||||
12 | hg add --skjdfks |
|
16 | hg add --skjdfks | |
13 | hg help diff |
|
17 | hg help diff | |
14 | hg help status |
|
18 | hg help status | |
15 | hg -q help status |
|
19 | hg -q help status | |
16 | hg help foo |
|
20 | hg help foo | |
17 | hg skjdfks |
|
21 | hg skjdfks | |
18 |
|
22 | |||
19 | exit 0 |
|
23 | exit 0 |
@@ -1,419 +1,444 b'' | |||||
1 | Mercurial Distributed SCM |
|
1 | Mercurial Distributed SCM | |
2 |
|
2 | |||
3 | basic commands: |
|
3 | basic commands: | |
4 |
|
4 | |||
5 | add add the specified files on the next commit |
|
5 | add add the specified files on the next commit | |
6 | annotate show changeset information by line for each file |
|
6 | annotate show changeset information by line for each file | |
7 | clone make a copy of an existing repository |
|
7 | clone make a copy of an existing repository | |
8 | commit commit the specified files or all outstanding changes |
|
8 | commit commit the specified files or all outstanding changes | |
9 | diff diff repository (or selected files) |
|
9 | diff diff repository (or selected files) | |
10 | export dump the header and diffs for one or more changesets |
|
10 | export dump the header and diffs for one or more changesets | |
11 | forget forget the specified files on the next commit |
|
11 | forget forget the specified files on the next commit | |
12 | init create a new repository in the given directory |
|
12 | init create a new repository in the given directory | |
13 | log show revision history of entire repository or files |
|
13 | log show revision history of entire repository or files | |
14 | merge merge working directory with another revision |
|
14 | merge merge working directory with another revision | |
15 | pull pull changes from the specified source |
|
15 | pull pull changes from the specified source | |
16 | push push changes to the specified destination |
|
16 | push push changes to the specified destination | |
17 | remove remove the specified files on the next commit |
|
17 | remove remove the specified files on the next commit | |
18 | serve export the repository via HTTP |
|
18 | serve export the repository via HTTP | |
19 | status show changed files in the working directory |
|
19 | status show changed files in the working directory | |
20 | summary summarize working directory state |
|
20 | summary summarize working directory state | |
21 | update update working directory |
|
21 | update update working directory | |
22 |
|
22 | |||
23 | use "hg help" for the full list of commands or "hg -v" for details |
|
23 | use "hg help" for the full list of commands or "hg -v" for details | |
24 | add add the specified files on the next commit |
|
24 | add add the specified files on the next commit | |
25 | annotate show changeset information by line for each file |
|
25 | annotate show changeset information by line for each file | |
26 | clone make a copy of an existing repository |
|
26 | clone make a copy of an existing repository | |
27 | commit commit the specified files or all outstanding changes |
|
27 | commit commit the specified files or all outstanding changes | |
28 | diff diff repository (or selected files) |
|
28 | diff diff repository (or selected files) | |
29 | export dump the header and diffs for one or more changesets |
|
29 | export dump the header and diffs for one or more changesets | |
30 | forget forget the specified files on the next commit |
|
30 | forget forget the specified files on the next commit | |
31 | init create a new repository in the given directory |
|
31 | init create a new repository in the given directory | |
32 | log show revision history of entire repository or files |
|
32 | log show revision history of entire repository or files | |
33 | merge merge working directory with another revision |
|
33 | merge merge working directory with another revision | |
34 | pull pull changes from the specified source |
|
34 | pull pull changes from the specified source | |
35 | push push changes to the specified destination |
|
35 | push push changes to the specified destination | |
36 | remove remove the specified files on the next commit |
|
36 | remove remove the specified files on the next commit | |
37 | serve export the repository via HTTP |
|
37 | serve export the repository via HTTP | |
38 | status show changed files in the working directory |
|
38 | status show changed files in the working directory | |
39 | summary summarize working directory state |
|
39 | summary summarize working directory state | |
40 | update update working directory |
|
40 | update update working directory | |
41 | Mercurial Distributed SCM |
|
41 | Mercurial Distributed SCM | |
42 |
|
42 | |||
43 | list of commands: |
|
43 | list of commands: | |
44 |
|
44 | |||
45 | add add the specified files on the next commit |
|
45 | add add the specified files on the next commit | |
46 | addremove add all new files, delete all missing files |
|
46 | addremove add all new files, delete all missing files | |
47 | annotate show changeset information by line for each file |
|
47 | annotate show changeset information by line for each file | |
48 | archive create an unversioned archive of a repository revision |
|
48 | archive create an unversioned archive of a repository revision | |
49 | backout reverse effect of earlier changeset |
|
49 | backout reverse effect of earlier changeset | |
50 | bisect subdivision search of changesets |
|
50 | bisect subdivision search of changesets | |
51 | branch set or show the current branch name |
|
51 | branch set or show the current branch name | |
52 | branches list repository named branches |
|
52 | branches list repository named branches | |
53 | bundle create a changegroup file |
|
53 | bundle create a changegroup file | |
54 | cat output the current or given revision of files |
|
54 | cat output the current or given revision of files | |
55 | clone make a copy of an existing repository |
|
55 | clone make a copy of an existing repository | |
56 | commit commit the specified files or all outstanding changes |
|
56 | commit commit the specified files or all outstanding changes | |
57 | copy mark files as copied for the next commit |
|
57 | copy mark files as copied for the next commit | |
58 | diff diff repository (or selected files) |
|
58 | diff diff repository (or selected files) | |
59 | export dump the header and diffs for one or more changesets |
|
59 | export dump the header and diffs for one or more changesets | |
60 | forget forget the specified files on the next commit |
|
60 | forget forget the specified files on the next commit | |
61 | grep search for a pattern in specified files and revisions |
|
61 | grep search for a pattern in specified files and revisions | |
62 | heads show current repository heads or show branch heads |
|
62 | heads show current repository heads or show branch heads | |
63 | help show help for a given topic or a help overview |
|
63 | help show help for a given topic or a help overview | |
64 | identify identify the working copy or specified revision |
|
64 | identify identify the working copy or specified revision | |
65 | import import an ordered set of patches |
|
65 | import import an ordered set of patches | |
66 | incoming show new changesets found in source |
|
66 | incoming show new changesets found in source | |
67 | init create a new repository in the given directory |
|
67 | init create a new repository in the given directory | |
68 | locate locate files matching specific patterns |
|
68 | locate locate files matching specific patterns | |
69 | log show revision history of entire repository or files |
|
69 | log show revision history of entire repository or files | |
70 | manifest output the current or given revision of the project manifest |
|
70 | manifest output the current or given revision of the project manifest | |
71 | merge merge working directory with another revision |
|
71 | merge merge working directory with another revision | |
72 | outgoing show changesets not found in destination |
|
72 | outgoing show changesets not found in destination | |
73 | parents show the parents of the working directory or revision |
|
73 | parents show the parents of the working directory or revision | |
74 | paths show aliases for remote repositories |
|
74 | paths show aliases for remote repositories | |
75 | pull pull changes from the specified source |
|
75 | pull pull changes from the specified source | |
76 | push push changes to the specified destination |
|
76 | push push changes to the specified destination | |
77 | recover roll back an interrupted transaction |
|
77 | recover roll back an interrupted transaction | |
78 | remove remove the specified files on the next commit |
|
78 | remove remove the specified files on the next commit | |
79 | rename rename files; equivalent of copy + remove |
|
79 | rename rename files; equivalent of copy + remove | |
80 | resolve retry file merges from a merge or update |
|
80 | resolve retry file merges from a merge or update | |
81 | revert restore individual files or directories to an earlier state |
|
81 | revert restore individual files or directories to an earlier state | |
82 | rollback roll back the last transaction |
|
82 | rollback roll back the last transaction | |
83 | root print the root (top) of the current working directory |
|
83 | root print the root (top) of the current working directory | |
84 | serve export the repository via HTTP |
|
84 | serve export the repository via HTTP | |
85 | showconfig show combined config settings from all hgrc files |
|
85 | showconfig show combined config settings from all hgrc files | |
86 | status show changed files in the working directory |
|
86 | status show changed files in the working directory | |
87 | summary summarize working directory state |
|
87 | summary summarize working directory state | |
88 | tag add one or more tags for the current or given revision |
|
88 | tag add one or more tags for the current or given revision | |
89 | tags list repository tags |
|
89 | tags list repository tags | |
90 | tip show the tip revision |
|
90 | tip show the tip revision | |
91 | unbundle apply one or more changegroup files |
|
91 | unbundle apply one or more changegroup files | |
92 | update update working directory |
|
92 | update update working directory | |
93 | verify verify the integrity of the repository |
|
93 | verify verify the integrity of the repository | |
94 | version output version and copyright information |
|
94 | version output version and copyright information | |
95 |
|
95 | |||
96 | additional help topics: |
|
96 | additional help topics: | |
97 |
|
97 | |||
98 | config Configuration Files |
|
98 | config Configuration Files | |
99 | dates Date Formats |
|
99 | dates Date Formats | |
100 | patterns File Name Patterns |
|
100 | patterns File Name Patterns | |
101 | environment Environment Variables |
|
101 | environment Environment Variables | |
102 | revisions Specifying Single Revisions |
|
102 | revisions Specifying Single Revisions | |
103 | multirevs Specifying Multiple Revisions |
|
103 | multirevs Specifying Multiple Revisions | |
104 | diffs Diff Formats |
|
104 | diffs Diff Formats | |
105 | templating Template Usage |
|
105 | templating Template Usage | |
106 | urls URL Paths |
|
106 | urls URL Paths | |
107 | extensions Using additional features |
|
107 | extensions Using additional features | |
108 |
|
108 | |||
109 | use "hg -v help" to show aliases and global options |
|
109 | use "hg -v help" to show aliases and global options | |
110 | add add the specified files on the next commit |
|
110 | add add the specified files on the next commit | |
111 | addremove add all new files, delete all missing files |
|
111 | addremove add all new files, delete all missing files | |
112 | annotate show changeset information by line for each file |
|
112 | annotate show changeset information by line for each file | |
113 | archive create an unversioned archive of a repository revision |
|
113 | archive create an unversioned archive of a repository revision | |
114 | backout reverse effect of earlier changeset |
|
114 | backout reverse effect of earlier changeset | |
115 | bisect subdivision search of changesets |
|
115 | bisect subdivision search of changesets | |
116 | branch set or show the current branch name |
|
116 | branch set or show the current branch name | |
117 | branches list repository named branches |
|
117 | branches list repository named branches | |
118 | bundle create a changegroup file |
|
118 | bundle create a changegroup file | |
119 | cat output the current or given revision of files |
|
119 | cat output the current or given revision of files | |
120 | clone make a copy of an existing repository |
|
120 | clone make a copy of an existing repository | |
121 | commit commit the specified files or all outstanding changes |
|
121 | commit commit the specified files or all outstanding changes | |
122 | copy mark files as copied for the next commit |
|
122 | copy mark files as copied for the next commit | |
123 | diff diff repository (or selected files) |
|
123 | diff diff repository (or selected files) | |
124 | export dump the header and diffs for one or more changesets |
|
124 | export dump the header and diffs for one or more changesets | |
125 | forget forget the specified files on the next commit |
|
125 | forget forget the specified files on the next commit | |
126 | grep search for a pattern in specified files and revisions |
|
126 | grep search for a pattern in specified files and revisions | |
127 | heads show current repository heads or show branch heads |
|
127 | heads show current repository heads or show branch heads | |
128 | help show help for a given topic or a help overview |
|
128 | help show help for a given topic or a help overview | |
129 | identify identify the working copy or specified revision |
|
129 | identify identify the working copy or specified revision | |
130 | import import an ordered set of patches |
|
130 | import import an ordered set of patches | |
131 | incoming show new changesets found in source |
|
131 | incoming show new changesets found in source | |
132 | init create a new repository in the given directory |
|
132 | init create a new repository in the given directory | |
133 | locate locate files matching specific patterns |
|
133 | locate locate files matching specific patterns | |
134 | log show revision history of entire repository or files |
|
134 | log show revision history of entire repository or files | |
135 | manifest output the current or given revision of the project manifest |
|
135 | manifest output the current or given revision of the project manifest | |
136 | merge merge working directory with another revision |
|
136 | merge merge working directory with another revision | |
137 | outgoing show changesets not found in destination |
|
137 | outgoing show changesets not found in destination | |
138 | parents show the parents of the working directory or revision |
|
138 | parents show the parents of the working directory or revision | |
139 | paths show aliases for remote repositories |
|
139 | paths show aliases for remote repositories | |
140 | pull pull changes from the specified source |
|
140 | pull pull changes from the specified source | |
141 | push push changes to the specified destination |
|
141 | push push changes to the specified destination | |
142 | recover roll back an interrupted transaction |
|
142 | recover roll back an interrupted transaction | |
143 | remove remove the specified files on the next commit |
|
143 | remove remove the specified files on the next commit | |
144 | rename rename files; equivalent of copy + remove |
|
144 | rename rename files; equivalent of copy + remove | |
145 | resolve retry file merges from a merge or update |
|
145 | resolve retry file merges from a merge or update | |
146 | revert restore individual files or directories to an earlier state |
|
146 | revert restore individual files or directories to an earlier state | |
147 | rollback roll back the last transaction |
|
147 | rollback roll back the last transaction | |
148 | root print the root (top) of the current working directory |
|
148 | root print the root (top) of the current working directory | |
149 | serve export the repository via HTTP |
|
149 | serve export the repository via HTTP | |
150 | showconfig show combined config settings from all hgrc files |
|
150 | showconfig show combined config settings from all hgrc files | |
151 | status show changed files in the working directory |
|
151 | status show changed files in the working directory | |
152 | summary summarize working directory state |
|
152 | summary summarize working directory state | |
153 | tag add one or more tags for the current or given revision |
|
153 | tag add one or more tags for the current or given revision | |
154 | tags list repository tags |
|
154 | tags list repository tags | |
155 | tip show the tip revision |
|
155 | tip show the tip revision | |
156 | unbundle apply one or more changegroup files |
|
156 | unbundle apply one or more changegroup files | |
157 | update update working directory |
|
157 | update update working directory | |
158 | verify verify the integrity of the repository |
|
158 | verify verify the integrity of the repository | |
159 | version output version and copyright information |
|
159 | version output version and copyright information | |
160 |
|
160 | |||
161 | additional help topics: |
|
161 | additional help topics: | |
162 |
|
162 | |||
163 | config Configuration Files |
|
163 | config Configuration Files | |
164 | dates Date Formats |
|
164 | dates Date Formats | |
165 | patterns File Name Patterns |
|
165 | patterns File Name Patterns | |
166 | environment Environment Variables |
|
166 | environment Environment Variables | |
167 | revisions Specifying Single Revisions |
|
167 | revisions Specifying Single Revisions | |
168 | multirevs Specifying Multiple Revisions |
|
168 | multirevs Specifying Multiple Revisions | |
169 | diffs Diff Formats |
|
169 | diffs Diff Formats | |
170 | templating Template Usage |
|
170 | templating Template Usage | |
171 | urls URL Paths |
|
171 | urls URL Paths | |
172 | extensions Using additional features |
|
172 | extensions Using additional features | |
173 | %% test short command list with verbose option |
|
173 | %% test short command list with verbose option | |
174 | Mercurial Distributed SCM (version xxx) |
|
174 | Mercurial Distributed SCM (version xxx) | |
175 |
|
175 | |||
176 | Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others |
|
176 | Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others | |
177 | This is free software; see the source for copying conditions. There is NO |
|
177 | This is free software; see the source for copying conditions. There is NO | |
178 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
|
178 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |
179 |
|
179 | |||
180 | basic commands: |
|
180 | basic commands: | |
181 |
|
181 | |||
182 | add: |
|
182 | add: | |
183 | add the specified files on the next commit |
|
183 | add the specified files on the next commit | |
184 | annotate, blame: |
|
184 | annotate, blame: | |
185 | show changeset information by line for each file |
|
185 | show changeset information by line for each file | |
186 | clone: |
|
186 | clone: | |
187 | make a copy of an existing repository |
|
187 | make a copy of an existing repository | |
188 | commit, ci: |
|
188 | commit, ci: | |
189 | commit the specified files or all outstanding changes |
|
189 | commit the specified files or all outstanding changes | |
190 | diff: |
|
190 | diff: | |
191 | diff repository (or selected files) |
|
191 | diff repository (or selected files) | |
192 | export: |
|
192 | export: | |
193 | dump the header and diffs for one or more changesets |
|
193 | dump the header and diffs for one or more changesets | |
194 | forget: |
|
194 | forget: | |
195 | forget the specified files on the next commit |
|
195 | forget the specified files on the next commit | |
196 | init: |
|
196 | init: | |
197 | create a new repository in the given directory |
|
197 | create a new repository in the given directory | |
198 | log, history: |
|
198 | log, history: | |
199 | show revision history of entire repository or files |
|
199 | show revision history of entire repository or files | |
200 | merge: |
|
200 | merge: | |
201 | merge working directory with another revision |
|
201 | merge working directory with another revision | |
202 | pull: |
|
202 | pull: | |
203 | pull changes from the specified source |
|
203 | pull changes from the specified source | |
204 | push: |
|
204 | push: | |
205 | push changes to the specified destination |
|
205 | push changes to the specified destination | |
206 | remove, rm: |
|
206 | remove, rm: | |
207 | remove the specified files on the next commit |
|
207 | remove the specified files on the next commit | |
208 | serve: |
|
208 | serve: | |
209 | export the repository via HTTP |
|
209 | export the repository via HTTP | |
210 | status, st: |
|
210 | status, st: | |
211 | show changed files in the working directory |
|
211 | show changed files in the working directory | |
212 | summary, sum: |
|
212 | summary, sum: | |
213 | summarize working directory state |
|
213 | summarize working directory state | |
214 | update, up, checkout, co: |
|
214 | update, up, checkout, co: | |
215 | update working directory |
|
215 | update working directory | |
216 |
|
216 | |||
217 | global options: |
|
217 | global options: | |
218 | -R --repository repository root directory or name of overlay bundle file |
|
218 | -R --repository repository root directory or name of overlay bundle file | |
219 | --cwd change working directory |
|
219 | --cwd change working directory | |
220 | -y --noninteractive do not prompt, assume 'yes' for any required answers |
|
220 | -y --noninteractive do not prompt, assume 'yes' for any required answers | |
221 | -q --quiet suppress output |
|
221 | -q --quiet suppress output | |
222 | -v --verbose enable additional output |
|
222 | -v --verbose enable additional output | |
223 | --config set/override config option |
|
223 | --config set/override config option | |
224 | --debug enable debugging output |
|
224 | --debug enable debugging output | |
225 | --debugger start debugger |
|
225 | --debugger start debugger | |
226 | --encoding set the charset encoding (default: ascii) |
|
226 | --encoding set the charset encoding (default: ascii) | |
227 | --encodingmode set the charset encoding mode (default: strict) |
|
227 | --encodingmode set the charset encoding mode (default: strict) | |
228 | --traceback always print a traceback on exception |
|
228 | --traceback always print a traceback on exception | |
229 | --time time how long the command takes |
|
229 | --time time how long the command takes | |
230 | --profile print command execution profile |
|
230 | --profile print command execution profile | |
231 | --version output version information and exit |
|
231 | --version output version information and exit | |
232 | -h --help display help and exit |
|
232 | -h --help display help and exit | |
233 |
|
233 | |||
234 | use "hg help" for the full list of commands |
|
234 | use "hg help" for the full list of commands | |
235 | hg add [OPTION]... [FILE]... |
|
235 | hg add [OPTION]... [FILE]... | |
236 |
|
236 | |||
237 | add the specified files on the next commit |
|
237 | add the specified files on the next commit | |
238 |
|
238 | |||
239 | Schedule files to be version controlled and added to the repository. |
|
239 | Schedule files to be version controlled and added to the repository. | |
240 |
|
240 | |||
241 | The files will be added to the repository at the next commit. To undo an |
|
241 | The files will be added to the repository at the next commit. To undo an | |
242 | add before that, see hg forget. |
|
242 | add before that, see hg forget. | |
243 |
|
243 | |||
244 | If no names are given, add all files to the repository. |
|
244 | If no names are given, add all files to the repository. | |
245 |
|
245 | |||
246 | options: |
|
246 | options: | |
247 |
|
247 | |||
248 | -I --include include names matching the given patterns |
|
248 | -I --include include names matching the given patterns | |
249 | -X --exclude exclude names matching the given patterns |
|
249 | -X --exclude exclude names matching the given patterns | |
250 | -n --dry-run do not perform actions, just print output |
|
250 | -n --dry-run do not perform actions, just print output | |
251 |
|
251 | |||
252 | use "hg -v help add" to show global options |
|
252 | use "hg -v help add" to show global options | |
|
253 | %% test help option with version option | |||
|
254 | Mercurial Distributed SCM (version xxx) | |||
|
255 | ||||
|
256 | Copyright (C) 2005-2009 Matt Mackall <mpm@selenic.com> and others | |||
|
257 | This is free software; see the source for copying conditions. There is NO | |||
|
258 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |||
|
259 | ||||
|
260 | hg add [OPTION]... [FILE]... | |||
|
261 | ||||
|
262 | add the specified files on the next commit | |||
|
263 | ||||
|
264 | Schedule files to be version controlled and added to the repository. | |||
|
265 | ||||
|
266 | The files will be added to the repository at the next commit. To undo an | |||
|
267 | add before that, see hg forget. | |||
|
268 | ||||
|
269 | If no names are given, add all files to the repository. | |||
|
270 | ||||
|
271 | options: | |||
|
272 | ||||
|
273 | -I --include include names matching the given patterns | |||
|
274 | -X --exclude exclude names matching the given patterns | |||
|
275 | -n --dry-run do not perform actions, just print output | |||
|
276 | ||||
|
277 | use "hg -v help add" to show global options | |||
253 | hg add: option --skjdfks not recognized |
|
278 | hg add: option --skjdfks not recognized | |
254 | hg add [OPTION]... [FILE]... |
|
279 | hg add [OPTION]... [FILE]... | |
255 |
|
280 | |||
256 | add the specified files on the next commit |
|
281 | add the specified files on the next commit | |
257 |
|
282 | |||
258 | Schedule files to be version controlled and added to the repository. |
|
283 | Schedule files to be version controlled and added to the repository. | |
259 |
|
284 | |||
260 | The files will be added to the repository at the next commit. To undo an |
|
285 | The files will be added to the repository at the next commit. To undo an | |
261 | add before that, see hg forget. |
|
286 | add before that, see hg forget. | |
262 |
|
287 | |||
263 | If no names are given, add all files to the repository. |
|
288 | If no names are given, add all files to the repository. | |
264 |
|
289 | |||
265 | options: |
|
290 | options: | |
266 |
|
291 | |||
267 | -I --include include names matching the given patterns |
|
292 | -I --include include names matching the given patterns | |
268 | -X --exclude exclude names matching the given patterns |
|
293 | -X --exclude exclude names matching the given patterns | |
269 | -n --dry-run do not perform actions, just print output |
|
294 | -n --dry-run do not perform actions, just print output | |
270 |
|
295 | |||
271 | use "hg -v help add" to show global options |
|
296 | use "hg -v help add" to show global options | |
272 | hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... |
|
297 | hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]... | |
273 |
|
298 | |||
274 | diff repository (or selected files) |
|
299 | diff repository (or selected files) | |
275 |
|
300 | |||
276 | Show differences between revisions for the specified files. |
|
301 | Show differences between revisions for the specified files. | |
277 |
|
302 | |||
278 | Differences between files are shown using the unified diff format. |
|
303 | Differences between files are shown using the unified diff format. | |
279 |
|
304 | |||
280 | NOTE: diff may generate unexpected results for merges, as it will default |
|
305 | NOTE: diff may generate unexpected results for merges, as it will default | |
281 | to comparing against the working directory's first parent changeset if no |
|
306 | to comparing against the working directory's first parent changeset if no | |
282 | revisions are specified. |
|
307 | revisions are specified. | |
283 |
|
308 | |||
284 | When two revision arguments are given, then changes are shown between |
|
309 | When two revision arguments are given, then changes are shown between | |
285 | those revisions. If only one revision is specified then that revision is |
|
310 | those revisions. If only one revision is specified then that revision is | |
286 | compared to the working directory, and, when no revisions are specified, |
|
311 | compared to the working directory, and, when no revisions are specified, | |
287 | the working directory files are compared to its parent. |
|
312 | the working directory files are compared to its parent. | |
288 |
|
313 | |||
289 | Without the -a/--text option, diff will avoid generating diffs of files it |
|
314 | Without the -a/--text option, diff will avoid generating diffs of files it | |
290 | detects as binary. With -a, diff will generate a diff anyway, probably |
|
315 | detects as binary. With -a, diff will generate a diff anyway, probably | |
291 | with undesirable results. |
|
316 | with undesirable results. | |
292 |
|
317 | |||
293 | Use the -g/--git option to generate diffs in the git extended diff format. |
|
318 | Use the -g/--git option to generate diffs in the git extended diff format. | |
294 | For more information, read 'hg help diffs'. |
|
319 | For more information, read 'hg help diffs'. | |
295 |
|
320 | |||
296 | options: |
|
321 | options: | |
297 |
|
322 | |||
298 | -r --rev revision |
|
323 | -r --rev revision | |
299 | -c --change change made by revision |
|
324 | -c --change change made by revision | |
300 | -a --text treat all files as text |
|
325 | -a --text treat all files as text | |
301 | -g --git use git extended diff format |
|
326 | -g --git use git extended diff format | |
302 | --nodates don't include dates in diff headers |
|
327 | --nodates don't include dates in diff headers | |
303 | -p --show-function show which function each change is in |
|
328 | -p --show-function show which function each change is in | |
304 | --reverse produce a diff that undoes the changes |
|
329 | --reverse produce a diff that undoes the changes | |
305 | -w --ignore-all-space ignore white space when comparing lines |
|
330 | -w --ignore-all-space ignore white space when comparing lines | |
306 | -b --ignore-space-change ignore changes in the amount of white space |
|
331 | -b --ignore-space-change ignore changes in the amount of white space | |
307 | -B --ignore-blank-lines ignore changes whose lines are all blank |
|
332 | -B --ignore-blank-lines ignore changes whose lines are all blank | |
308 | -U --unified number of lines of context to show |
|
333 | -U --unified number of lines of context to show | |
309 | --stat output diffstat-style summary of changes |
|
334 | --stat output diffstat-style summary of changes | |
310 | -I --include include names matching the given patterns |
|
335 | -I --include include names matching the given patterns | |
311 | -X --exclude exclude names matching the given patterns |
|
336 | -X --exclude exclude names matching the given patterns | |
312 |
|
337 | |||
313 | use "hg -v help diff" to show global options |
|
338 | use "hg -v help diff" to show global options | |
314 | hg status [OPTION]... [FILE]... |
|
339 | hg status [OPTION]... [FILE]... | |
315 |
|
340 | |||
316 | aliases: st |
|
341 | aliases: st | |
317 |
|
342 | |||
318 | show changed files in the working directory |
|
343 | show changed files in the working directory | |
319 |
|
344 | |||
320 | Show status of files in the repository. If names are given, only files |
|
345 | Show status of files in the repository. If names are given, only files | |
321 | that match are shown. Files that are clean or ignored or the source of a |
|
346 | that match are shown. Files that are clean or ignored or the source of a | |
322 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, |
|
347 | copy/move operation, are not listed unless -c/--clean, -i/--ignored, | |
323 | -C/--copies or -A/--all are given. Unless options described with "show |
|
348 | -C/--copies or -A/--all are given. Unless options described with "show | |
324 | only ..." are given, the options -mardu are used. |
|
349 | only ..." are given, the options -mardu are used. | |
325 |
|
350 | |||
326 | Option -q/--quiet hides untracked (unknown and ignored) files unless |
|
351 | Option -q/--quiet hides untracked (unknown and ignored) files unless | |
327 | explicitly requested with -u/--unknown or -i/--ignored. |
|
352 | explicitly requested with -u/--unknown or -i/--ignored. | |
328 |
|
353 | |||
329 | NOTE: status may appear to disagree with diff if permissions have changed |
|
354 | NOTE: status may appear to disagree with diff if permissions have changed | |
330 | or a merge has occurred. The standard diff format does not report |
|
355 | or a merge has occurred. The standard diff format does not report | |
331 | permission changes and diff only reports changes relative to one merge |
|
356 | permission changes and diff only reports changes relative to one merge | |
332 | parent. |
|
357 | parent. | |
333 |
|
358 | |||
334 | If one revision is given, it is used as the base revision. If two |
|
359 | If one revision is given, it is used as the base revision. If two | |
335 | revisions are given, the differences between them are shown. The --change |
|
360 | revisions are given, the differences between them are shown. The --change | |
336 | option can also be used as a shortcut to list the changed files of a |
|
361 | option can also be used as a shortcut to list the changed files of a | |
337 | revision from its first parent. |
|
362 | revision from its first parent. | |
338 |
|
363 | |||
339 | The codes used to show the status of files are: |
|
364 | The codes used to show the status of files are: | |
340 |
|
365 | |||
341 | M = modified |
|
366 | M = modified | |
342 | A = added |
|
367 | A = added | |
343 | R = removed |
|
368 | R = removed | |
344 | C = clean |
|
369 | C = clean | |
345 | ! = missing (deleted by non-hg command, but still tracked) |
|
370 | ! = missing (deleted by non-hg command, but still tracked) | |
346 | ? = not tracked |
|
371 | ? = not tracked | |
347 | I = ignored |
|
372 | I = ignored | |
348 | = origin of the previous file listed as A (added) |
|
373 | = origin of the previous file listed as A (added) | |
349 |
|
374 | |||
350 | options: |
|
375 | options: | |
351 |
|
376 | |||
352 | -A --all show status of all files |
|
377 | -A --all show status of all files | |
353 | -m --modified show only modified files |
|
378 | -m --modified show only modified files | |
354 | -a --added show only added files |
|
379 | -a --added show only added files | |
355 | -r --removed show only removed files |
|
380 | -r --removed show only removed files | |
356 | -d --deleted show only deleted (but tracked) files |
|
381 | -d --deleted show only deleted (but tracked) files | |
357 | -c --clean show only files without changes |
|
382 | -c --clean show only files without changes | |
358 | -u --unknown show only unknown (not tracked) files |
|
383 | -u --unknown show only unknown (not tracked) files | |
359 | -i --ignored show only ignored files |
|
384 | -i --ignored show only ignored files | |
360 | -n --no-status hide status prefix |
|
385 | -n --no-status hide status prefix | |
361 | -C --copies show source of copied files |
|
386 | -C --copies show source of copied files | |
362 | -0 --print0 end filenames with NUL, for use with xargs |
|
387 | -0 --print0 end filenames with NUL, for use with xargs | |
363 | --rev show difference from revision |
|
388 | --rev show difference from revision | |
364 | --change list the changed files of a revision |
|
389 | --change list the changed files of a revision | |
365 | -I --include include names matching the given patterns |
|
390 | -I --include include names matching the given patterns | |
366 | -X --exclude exclude names matching the given patterns |
|
391 | -X --exclude exclude names matching the given patterns | |
367 |
|
392 | |||
368 | use "hg -v help status" to show global options |
|
393 | use "hg -v help status" to show global options | |
369 | hg status [OPTION]... [FILE]... |
|
394 | hg status [OPTION]... [FILE]... | |
370 |
|
395 | |||
371 | show changed files in the working directory |
|
396 | show changed files in the working directory | |
372 | hg: unknown command 'foo' |
|
397 | hg: unknown command 'foo' | |
373 | Mercurial Distributed SCM |
|
398 | Mercurial Distributed SCM | |
374 |
|
399 | |||
375 | basic commands: |
|
400 | basic commands: | |
376 |
|
401 | |||
377 | add add the specified files on the next commit |
|
402 | add add the specified files on the next commit | |
378 | annotate show changeset information by line for each file |
|
403 | annotate show changeset information by line for each file | |
379 | clone make a copy of an existing repository |
|
404 | clone make a copy of an existing repository | |
380 | commit commit the specified files or all outstanding changes |
|
405 | commit commit the specified files or all outstanding changes | |
381 | diff diff repository (or selected files) |
|
406 | diff diff repository (or selected files) | |
382 | export dump the header and diffs for one or more changesets |
|
407 | export dump the header and diffs for one or more changesets | |
383 | forget forget the specified files on the next commit |
|
408 | forget forget the specified files on the next commit | |
384 | init create a new repository in the given directory |
|
409 | init create a new repository in the given directory | |
385 | log show revision history of entire repository or files |
|
410 | log show revision history of entire repository or files | |
386 | merge merge working directory with another revision |
|
411 | merge merge working directory with another revision | |
387 | pull pull changes from the specified source |
|
412 | pull pull changes from the specified source | |
388 | push push changes to the specified destination |
|
413 | push push changes to the specified destination | |
389 | remove remove the specified files on the next commit |
|
414 | remove remove the specified files on the next commit | |
390 | serve export the repository via HTTP |
|
415 | serve export the repository via HTTP | |
391 | status show changed files in the working directory |
|
416 | status show changed files in the working directory | |
392 | summary summarize working directory state |
|
417 | summary summarize working directory state | |
393 | update update working directory |
|
418 | update update working directory | |
394 |
|
419 | |||
395 | use "hg help" for the full list of commands or "hg -v" for details |
|
420 | use "hg help" for the full list of commands or "hg -v" for details | |
396 | hg: unknown command 'skjdfks' |
|
421 | hg: unknown command 'skjdfks' | |
397 | Mercurial Distributed SCM |
|
422 | Mercurial Distributed SCM | |
398 |
|
423 | |||
399 | basic commands: |
|
424 | basic commands: | |
400 |
|
425 | |||
401 | add add the specified files on the next commit |
|
426 | add add the specified files on the next commit | |
402 | annotate show changeset information by line for each file |
|
427 | annotate show changeset information by line for each file | |
403 | clone make a copy of an existing repository |
|
428 | clone make a copy of an existing repository | |
404 | commit commit the specified files or all outstanding changes |
|
429 | commit commit the specified files or all outstanding changes | |
405 | diff diff repository (or selected files) |
|
430 | diff diff repository (or selected files) | |
406 | export dump the header and diffs for one or more changesets |
|
431 | export dump the header and diffs for one or more changesets | |
407 | forget forget the specified files on the next commit |
|
432 | forget forget the specified files on the next commit | |
408 | init create a new repository in the given directory |
|
433 | init create a new repository in the given directory | |
409 | log show revision history of entire repository or files |
|
434 | log show revision history of entire repository or files | |
410 | merge merge working directory with another revision |
|
435 | merge merge working directory with another revision | |
411 | pull pull changes from the specified source |
|
436 | pull pull changes from the specified source | |
412 | push push changes to the specified destination |
|
437 | push push changes to the specified destination | |
413 | remove remove the specified files on the next commit |
|
438 | remove remove the specified files on the next commit | |
414 | serve export the repository via HTTP |
|
439 | serve export the repository via HTTP | |
415 | status show changed files in the working directory |
|
440 | status show changed files in the working directory | |
416 | summary summarize working directory state |
|
441 | summary summarize working directory state | |
417 | update update working directory |
|
442 | update update working directory | |
418 |
|
443 | |||
419 | use "hg help" for the full list of commands or "hg -v" for details |
|
444 | use "hg help" for the full list of commands or "hg -v" for details |
General Comments 0
You need to be logged in to leave comments.
Login now