evolve: improve error messages when conflicts occur This patch improves the error messages when conflicts occur. First, we drop the line 'evolution failed', that is not the best line we can show and evolution didn't failed, it's just interrupted by the conflicts and when user will run `hg evolve --continue`, things will be fine. I still remember when I first saw 'evolution failed', I got a bit scare as am I in a recoverable position or not. So let's drop this scary line. Second, we replace the error messages to say `resolve conflicts and see help-topic`. The help topic was added recently and documents all the three flags very well. Addition of tests also showed that all the three flags works fine with all the three instability type. So we should advertise them more. Third, we now raise the error with our error message rather than raising MergeFailure and having evolution related text in hint or stderr above. This increase the focus on the error message we want to show. After this patch, I think error messages by evolve in case of conflicts will be same in every case.

     1

[flake8]

     2

ignore =

     3

         #closing bracket does not match indentation of opening bracket's line

     4

         E123,

     5

         # closing bracket does not match visual indentation

     6

         E124,

     7

         # visually indented line with same indent as next logical line

     8

         E129,

     9

         # at least two spaces before inline comment

    10

         E261,

    11

         # too many leading '#' for block comment

    12

         E266,

    13

         # expected 2 blank lines, found 0

    14

         E302,

    15

         # expected 2 blank lines after end of function or class

    16

         E305,

    17

         # module level import not at top of file

    18

         E402,

    19

         # line too long (82 > 79 characters)

    20

         E501,

    21

         # do not assign a lambda expression, use a def

    22

         E731,

    23

         # class names should use CapWords convention

    24

         N801,

    25

         # line break occurred before a binary operator

    26

         W503

    27

builtins=xrange, execfile

    28