evolve: add comptability to read old evolvestate files When a user runs `hg evolve` with old evolve where we used to write evolvestate the old ways i.e. without using cbor, and faces conflicts, the evolve is interrupted. If the user updates evolve before completing the evolve, that can result in traceback as the new evolve cannot read the old evolvestate file. The previous patch added function to read old evolvestate file and this patch uses that when we encounter the above mentioned case.

     1

#require test-repo

     2

     3

  $ checkflake8() {

     4

  >   if ! (which flake8 > /dev/null); then

     5

  >     echo skipped: missing tool: flake8;

     6

  >     exit 80;

     7

  >   fi;

     8

  > };

     9

  $ checkflake8

    10

    11

Copied from Mercurial core (60ee2593a270)

    12

    13

  $ cd "`dirname "$TESTDIR"`"

    14

    15

run flake8 if it exists; if it doesn't, then just skip

    16

    17

  $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \

    18

  > -X hgext3rd/evolve/thirdparty \

    19

  > 2>/dev/null \

    20

  > | xargs -0 flake8