Mercurial > hg
comparison tests/test-help.out @ 9051:f8e25885d975
commands: wrapped docstrings at 78 characters
We have always had a left margin of 4 characters -- probably just
because that's how docstrings for top-level functions turn out by
default, but it also looks nice in the built-in help.
The docstrings were wrapped at 70 characters, which is the default for
Emacs. However, this gives a right margin of 10 characters in a
standard 80 character terminal.
I've now wrapped the relevant docstrings at 78 characters, effectively
killing the right margin. The asymmetric margins looked a bit odd and
some of the text looked cramped with a right margin, so Dirkjan and I
felt that it was best to remove it entirely. The two character gap was
kept to have some space between the border of the terminal -- it will
also make diffs involving the docstrings fit in a 80 character line.
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 07 Jul 2009 23:54:30 +0200 |
parents | b9a8b616521d |
children | 9261667e9b82 |
comparison
equal
deleted
inserted
replaced
9050:77324df822e2 | 9051:f8e25885d975 |
---|---|
168 extensions Using additional features | 168 extensions Using additional features |
169 hg add [OPTION]... [FILE]... | 169 hg add [OPTION]... [FILE]... |
170 | 170 |
171 add the specified files on the next commit | 171 add the specified files on the next commit |
172 | 172 |
173 Schedule files to be version controlled and added to the | 173 Schedule files to be version controlled and added to the repository. |
174 repository. | 174 |
175 | 175 The files will be added to the repository at the next commit. To undo an |
176 The files will be added to the repository at the next commit. To | 176 add before that, see hg forget. |
177 undo an add before that, see hg forget. | |
178 | 177 |
179 If no names are given, add all files to the repository. | 178 If no names are given, add all files to the repository. |
180 | 179 |
181 options: | 180 options: |
182 | 181 |
188 hg add: option --skjdfks not recognized | 187 hg add: option --skjdfks not recognized |
189 hg add [OPTION]... [FILE]... | 188 hg add [OPTION]... [FILE]... |
190 | 189 |
191 add the specified files on the next commit | 190 add the specified files on the next commit |
192 | 191 |
193 Schedule files to be version controlled and added to the | 192 Schedule files to be version controlled and added to the repository. |
194 repository. | 193 |
195 | 194 The files will be added to the repository at the next commit. To undo an |
196 The files will be added to the repository at the next commit. To | 195 add before that, see hg forget. |
197 undo an add before that, see hg forget. | |
198 | 196 |
199 If no names are given, add all files to the repository. | 197 If no names are given, add all files to the repository. |
200 | 198 |
201 options: | 199 options: |
202 | 200 |
211 | 209 |
212 Show differences between revisions for the specified files. | 210 Show differences between revisions for the specified files. |
213 | 211 |
214 Differences between files are shown using the unified diff format. | 212 Differences between files are shown using the unified diff format. |
215 | 213 |
216 NOTE: diff may generate unexpected results for merges, as it will | 214 NOTE: diff may generate unexpected results for merges, as it will default |
217 default to comparing against the working directory's first parent | 215 to comparing against the working directory's first parent changeset if no |
218 changeset if no revisions are specified. | 216 revisions are specified. |
219 | 217 |
220 When two revision arguments are given, then changes are shown | 218 When two revision arguments are given, then changes are shown between |
221 between those revisions. If only one revision is specified then | 219 those revisions. If only one revision is specified then that revision is |
222 that revision is compared to the working directory, and, when no | 220 compared to the working directory, and, when no revisions are specified, |
223 revisions are specified, the working directory files are compared | 221 the working directory files are compared to its parent. |
224 to its parent. | 222 |
225 | 223 Without the -a/--text option, diff will avoid generating diffs of files it |
226 Without the -a/--text option, diff will avoid generating diffs of | 224 detects as binary. With -a, diff will generate a diff anyway, probably |
227 files it detects as binary. With -a, diff will generate a diff | 225 with undesirable results. |
228 anyway, probably with undesirable results. | 226 |
229 | 227 Use the -g/--git option to generate diffs in the git extended diff format. |
230 Use the -g/--git option to generate diffs in the git extended diff | 228 For more information, read 'hg help diffs'. |
231 format. For more information, read 'hg help diffs'. | |
232 | 229 |
233 options: | 230 options: |
234 | 231 |
235 -r --rev revision | 232 -r --rev revision |
236 -c --change change made by revision | 233 -c --change change made by revision |
250 | 247 |
251 aliases: st | 248 aliases: st |
252 | 249 |
253 show changed files in the working directory | 250 show changed files in the working directory |
254 | 251 |
255 Show status of files in the repository. If names are given, only | 252 Show status of files in the repository. If names are given, only files |
256 files that match are shown. Files that are clean or ignored or | 253 that match are shown. Files that are clean or ignored or the source of a |
257 the source of a copy/move operation, are not listed unless | 254 copy/move operation, are not listed unless -c/--clean, -i/--ignored, |
258 -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. | 255 -C/--copies or -A/--all are given. Unless options described with "show |
259 Unless options described with "show only ..." are given, the | 256 only ..." are given, the options -mardu are used. |
260 options -mardu are used. | 257 |
261 | 258 Option -q/--quiet hides untracked (unknown and ignored) files unless |
262 Option -q/--quiet hides untracked (unknown and ignored) files | 259 explicitly requested with -u/--unknown or -i/--ignored. |
263 unless explicitly requested with -u/--unknown or -i/--ignored. | 260 |
264 | 261 NOTE: status may appear to disagree with diff if permissions have changed |
265 NOTE: status may appear to disagree with diff if permissions have | 262 or a merge has occurred. The standard diff format does not report |
266 changed or a merge has occurred. The standard diff format does not | 263 permission changes and diff only reports changes relative to one merge |
267 report permission changes and diff only reports changes relative | 264 parent. |
268 to one merge parent. | 265 |
269 | 266 If one revision is given, it is used as the base revision. If two |
270 If one revision is given, it is used as the base revision. | 267 revisions are given, the differences between them are shown. |
271 If two revisions are given, the differences between them are | |
272 shown. | |
273 | 268 |
274 The codes used to show the status of files are: | 269 The codes used to show the status of files are: |
275 M = modified | 270 M = modified |
276 A = added | 271 A = added |
277 R = removed | 272 R = removed |