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.

     1

     2

testing hellomessage:

     3

     4

o, 'capabilities: getencoding runcommand\nencoding: ***'

     5

 runcommand id

     6

000000000000 tip

     7

     8

testing unknowncommand:

     9

    10

abort: unknown command unknowncommand

    11

    12

testing checkruncommand:

    13

    14

 runcommand 

    15

Mercurial Distributed SCM

    16

    17

basic commands:

    18

    19

 add           add the specified files on the next commit

    20

 annotate      show changeset information by line for each file

    21

 clone         make a copy of an existing repository

    22

 commit        commit the specified files or all outstanding changes

    23

 diff          diff repository (or selected files)

    24

 export        dump the header and diffs for one or more changesets

    25

 forget        forget the specified files on the next commit

    26

 init          create a new repository in the given directory

    27

 log           show revision history of entire repository or files

    28

 merge         merge working directory with another revision

    29

 phase         set or show the current phase name

    30

 pull          pull changes from the specified source

    31

 push          push changes to the specified destination

    32

 remove        remove the specified files on the next commit

    33

 serve         start stand-alone webserver

    34

 status        show changed files in the working directory

    35

 summary       summarize working directory state

    36

 update        update working directory (or switch revisions)

    37

    38

use "hg help" for the full list of commands or "hg -v" for details

    39

 runcommand id --quiet

    40

000000000000

    41

 runcommand id

    42

000000000000 tip

    43

 runcommand id --config ui.quiet=True

    44

000000000000

    45

 runcommand id

    46

000000000000 tip

    47

    48

testing inputeof:

    49

    50

server exit code = 1

    51

    52

testing serverinput:

    53

    54

 runcommand import -

    55

applying patch from stdin

    56

 runcommand log

    57

changeset:   0:eff892de26ec

    58

tag:         tip

    59

user:        test

    60

date:        Thu Jan 01 00:00:00 1970 +0000

    61

summary:     1

    62

    63

    64

testing cwd:

    65

    66

 runcommand --cwd foo st bar

    67

? bar

    68

 runcommand st foo/bar

    69

? foo/bar

    70

    71

testing localhgrc:

    72

    73

 runcommand showconfig

    74

bundle.mainreporoot=$TESTTMP

    75

defaults.backout=-d "0 0"

    76

defaults.commit=-d "0 0"

    77

defaults.tag=-d "0 0"

    78

ui.slash=True

    79

ui.foo=bar

    80

 runcommand init foo

    81

 runcommand -R foo showconfig ui defaults

    82

defaults.backout=-d "0 0"

    83

defaults.commit=-d "0 0"

    84

defaults.tag=-d "0 0"

    85

ui.slash=True

    86

    87

testing hookoutput:

    88

    89

 runcommand --config hooks.pre-identify=python:test-commandserver.hook id

    90

hook talking

    91

now try to read something: 'some input'

    92

eff892de26ec tip

    93

    94

testing outsidechanges:

    95

    96

 runcommand status

    97

M a

    98

 runcommand tip

    99

changeset:   1:d3a0a68be6de

   100

tag:         tip

   101

user:        test

   102

date:        Thu Jan 01 00:00:00 1970 +0000

   103

summary:     2

   104

   105

 runcommand status

   106

   107

testing bookmarks:

   108

   109

 runcommand bookmarks

   110

no bookmarks set

   111

 runcommand bookmarks

   112

   bm1                       1:d3a0a68be6de

   113

   bm2                       1:d3a0a68be6de

   114

 runcommand bookmarks

   115

 * bm1                       1:d3a0a68be6de

   116

   bm2                       1:d3a0a68be6de

   117

 runcommand bookmarks bm3

   118

 runcommand commit -Amm

   119

 runcommand bookmarks

   120

   bm1                       1:d3a0a68be6de

   121

   bm2                       1:d3a0a68be6de

   122

 * bm3                       2:aef17e88f5f0

   123

   124

testing tagscache:

   125

   126

 runcommand id -t -r 0

   127

   128

 runcommand id -t -r 0

   129

foo

   130

   131

testing setphase:

   132

   133

 runcommand phase -r .

   134

3: draft

   135

 runcommand phase -r .

   136

3: public

   137

   138

testing rollback:

   139

   140

 runcommand phase -r . -p

   141

no phases changed

   142

 runcommand commit -Am.

   143

 runcommand rollback

   144

repository tip rolled back to revision 3 (undo commit)

   145

working directory now based on revision 3

   146

 runcommand phase -r .

   147

3: public

   148

   149

testing branch:

   150

   151

 runcommand branch

   152

default

   153

marked working directory as branch foo

   154

(branches are permanent and global, did you want a bookmark?)

   155

 runcommand branch

   156

foo

   157

marked working directory as branch default

   158

(branches are permanent and global, did you want a bookmark?)

   159

   160

testing hgignore:

   161

   162

 runcommand commit -Am.

   163

adding .hgignore

   164

 runcommand status -i -u

   165

I ignored-file