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

Failed qimport of patches from files should cleanup by recording successfully

     2

imported patches in series file.

     3

     4

  $ echo "[extensions]" >> $HGRCPATH

     5

  $ echo "mq=" >> $HGRCPATH

     6

  $ hg init repo

     7

  $ cd repo

     8

  $ echo a > a

     9

  $ hg ci -Am'add a'

    10

  adding a

    11

  $ cat >b.patch<<EOF

    12

  > diff --git a/a b/a

    13

  > --- a/a

    14

  > +++ b/a

    15

  > @@ -1,1 +1,2 @@

    16

  >  a

    17

  > +b

    18

  > EOF

    19

  $ echo

    20

    21

    22

empty series

    23

    24

  $ hg qseries

    25

  $ echo

    26

    27

    28

qimport valid patch followed by invalid patch

    29

    30

  $ hg qimport b.patch fakepatch

    31

  adding b.patch to series file

    32

  abort: unable to read file fakepatch

    33

  [255]

    34

  $ echo

    35

    36

    37

valid patches before fail added to series

    38

    39

  $ hg qseries

    40

  b.patch