Mercurial > hg-stable
annotate tests/test-strict.t @ 16853:7863ff383894
help: format command and option list help using RST
This patch changes the function which generates help text about commands and
options to use RST formatting. Tables describing options have been formatted
using RST table markup for some time already, so their appearance does not
change. Command lists, however, change appearance.
To format non-verbose command lists, RST field list markup was chosen, because
it resembles the old format:
<http://docutils.sourceforge.net/docs/user/rst/quickref.html#field-lists>
In the old (hand-coded) format of non-verbose command lists, the left column is
12 characters wide. Our minirst implementation formats field lists with a left
column 14 characters wide, so this patch changes the appearance of help output
correspondingly:
<http://markmail.org/message/krl4cxopsnii7s6z?q=mercurial+reinert+from:%22Olav+Reinert%22&page=2>
The minirst markup most closely resembling the old verbose command lists is
definition lists. But using it would cause a blank line to be inserted between
each command definition, making the output excessively long, and no more
useful than before. To avoid this, I chose to use field lists also for verbose
command help, resulting in output like this example:
add add the specified files on the next commit
annotate, blame
show changeset information by line for each file
clone make a copy of an existing repository
commit, ci commit the specified files or all outstanding changes
diff diff repository (or selected files)
export dump the header and diffs for one or more changesets
forget forget the specified files on the next commit
init create a new repository in the given directory
log, history show revision history of entire repository or files
merge merge working directory with another revision
phase set or show the current phase name
pull pull changes from the specified source
push push changes to the specified destination
qdiff diff of the current patch and subsequent modifications
qinit init a new queue repository (DEPRECATED)
qnew create a new patch
qpop pop the current patch off the stack
qpush push the next patch onto the stack
qrefresh update the current patch
remove, rm remove the specified files on the next commit
serve start stand-alone webserver
status, st show changed files in the working directory
summary, sum summarize working directory state
update, up, checkout, co
update working directory (or switch revisions)
This change is a move towards generating all help text as a list of strings
marked up with RST.
author | Olav Reinert <seroton10@gmail.com> |
---|---|
date | Sat, 02 Jun 2012 11:25:40 +0200 |
parents | 46e9ed223d2c |
children | e689b0d91546 |
rev | line source |
---|---|
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
1 $ hg init |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
2 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
3 $ echo a > a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
4 $ hg ci -Ama |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
5 adding a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
6 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
7 $ hg an a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
8 0: a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
9 |
16591
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
10 $ hg --config ui.strict=False an a |
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
11 0: a |
46e9ed223d2c
commands: parse ui.strict config item as bool
Yuya Nishihara <yuya@tcha.org>
parents:
15862
diff
changeset
|
12 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
13 $ echo "[ui]" >> $HGRCPATH |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
14 $ echo "strict=True" >> $HGRCPATH |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
15 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
16 $ hg an a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
17 hg: unknown command 'an' |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
18 Mercurial Distributed SCM |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
19 |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
20 basic commands: |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
21 |
16853
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
22 add add the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
23 annotate show changeset information by line for each file |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
24 clone make a copy of an existing repository |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
25 commit commit the specified files or all outstanding changes |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
26 diff diff repository (or selected files) |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
27 export dump the header and diffs for one or more changesets |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
28 forget forget the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
29 init create a new repository in the given directory |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
30 log show revision history of entire repository or files |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
31 merge merge working directory with another revision |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
32 phase set or show the current phase name |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
33 pull pull changes from the specified source |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
34 push push changes to the specified destination |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
35 remove remove the specified files on the next commit |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
36 serve start stand-alone webserver |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
37 status show changed files in the working directory |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
38 summary summarize working directory state |
7863ff383894
help: format command and option list help using RST
Olav Reinert <seroton10@gmail.com>
parents:
16591
diff
changeset
|
39 update update working directory (or switch revisions) |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
40 |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
41 use "hg help" for the full list of commands or "hg -v" for details |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12097
diff
changeset
|
42 [255] |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
43 $ hg annotate a |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
44 0: a |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
45 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
46 should succeed - up is an alias, not an abbreviation |
2988
63c3a1921a67
Add ui.strict config item.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff
changeset
|
47 |
12097
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
48 $ hg up |
389c215885c5
tests: unify test-strict
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8167
diff
changeset
|
49 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |