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

  $ hg init

     2

     3

  $ echo a > a

     4

  $ hg ci -Ama

     5

  adding a

     6

     7

  $ hg an a

     8

  0: a

     9

    10

  $ hg --config ui.strict=False an a

    11

  0: a

    12

    13

  $ echo "[ui]" >> $HGRCPATH

    14

  $ echo "strict=True" >> $HGRCPATH

    15

    16

  $ hg an a

    17

  hg: unknown command 'an'

    18

  Mercurial Distributed SCM

    19

    20

  basic commands:

    21

    22

   add           add the specified files on the next commit

    23

   annotate      show changeset information by line for each file

    24

   clone         make a copy of an existing repository

    25

   commit        commit the specified files or all outstanding changes

    26

   diff          diff repository (or selected files)

    27

   export        dump the header and diffs for one or more changesets

    28

   forget        forget the specified files on the next commit

    29

   init          create a new repository in the given directory

    30

   log           show revision history of entire repository or files

    31

   merge         merge working directory with another revision

    32

   phase         set or show the current phase name

    33

   pull          pull changes from the specified source

    34

   push          push changes to the specified destination

    35

   remove        remove the specified files on the next commit

    36

   serve         start stand-alone webserver

    37

   status        show changed files in the working directory

    38

   summary       summarize working directory state

    39

   update        update working directory (or switch revisions)

    40

    41

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

    42

  [255]

    43

  $ hg annotate a

    44

  0: a

    45

    46

should succeed - up is an alias, not an abbreviation

    47

    48

  $ hg up

    49

  0 files updated, 0 files merged, 0 files removed, 0 files unresolved