help: do not show full help text for command on option errors Example $ hg clone --jump foo bar hg clone: option --jump not recognized hg clone [OPTION]... SOURCE [DEST] make a copy of an existing repository options: -U --noupdate the clone will include an empty working copy (only a repository) -u --updaterev REV revision, tag or branch to check out -r --rev REV [+] include the specified changeset -b --branch BRANCH [+] clone only the specified branch --pull use pull protocol to copy metadata --uncompressed use uncompressed transfer (fast over LAN) -e --ssh CMD specify ssh command to use --remotecmd CMD specify hg command to run on the remote side --insecure do not verify server certificate (ignoring web.cacerts config) [+] marked option can be specified multiple times use "hg help clone" to show the full help text Motivation for this change If the user already has specified the command, he probably already knows the command to some extent. Apparently, he has a problem with the options, so we show him just the synopsis with the short help and the details about the options, with a hint on the last line how to get the full help text. Why is Mercurial better with this change? Experts who just forgot about the details of an option don't get that much text thrown at them, while the newbies still get a hint on the last line how to get the full help text.

     1

This tests if CGI files from after d0db3462d568 but

     2

before d74fc8dec2b4 still work.

     3

     4

  $ hg init test

     5

  $ cat >hgweb.cgi <<HGWEB

     6

  > #!/usr/bin/env python

     7

  > #

     8

  > # An example CGI script to use hgweb, edit as necessary

     9

  > 

    10

  > import cgitb

    11

  > cgitb.enable()

    12

  > 

    13

  > from mercurial import demandimport; demandimport.enable()

    14

  > from mercurial.hgweb import hgweb

    15

  > from mercurial.hgweb import wsgicgi

    16

  > from mercurial.hgweb.request import wsgiapplication

    17

  > 

    18

  > def make_web_app():

    19

  >     return hgweb("test", "Empty test repository")

    20

  > 

    21

  > wsgicgi.launch(wsgiapplication(make_web_app))

    22

  > HGWEB

    23

    24

  $ chmod 755 hgweb.cgi

    25

    26

  $ cat >hgweb.config <<HGWEBDIRCONF

    27

  > [paths]

    28

  > test = test

    29

  > HGWEBDIRCONF

    30

    31

  $ cat >hgwebdir.cgi <<HGWEBDIR

    32

  > #!/usr/bin/env python

    33

  > #

    34

  > # An example CGI script to export multiple hgweb repos, edit as necessary

    35

  > 

    36

  > import cgitb

    37

  > cgitb.enable()

    38

  > 

    39

  > from mercurial import demandimport; demandimport.enable()

    40

  > from mercurial.hgweb import hgwebdir

    41

  > from mercurial.hgweb import wsgicgi

    42

  > from mercurial.hgweb.request import wsgiapplication

    43

  > 

    44

  > def make_web_app():

    45

  >     return hgwebdir("hgweb.config")

    46

  > 

    47

  > wsgicgi.launch(wsgiapplication(make_web_app))

    48

  > HGWEBDIR

    49

    50

  $ chmod 755 hgwebdir.cgi

    51

    52

  $ . "$TESTDIR/cgienv"

    53

  $ python hgweb.cgi > page1

    54

  $ python hgwebdir.cgi > page2

    55

    56

  $ PATH_INFO="/test/"

    57

  $ PATH_TRANSLATED="/var/something/test.cgi"

    58

  $ REQUEST_URI="/test/test/"

    59

  $ SCRIPT_URI="http://hg.omnifarious.org/test/test/"

    60

  $ SCRIPT_URL="/test/test/"

    61

  $ python hgwebdir.cgi > page3

    62

    63

  $ grep -i error page1 page2 page3

    64

  [1]