evolve: use stack template in --continue case also We use stack indexes (s#) in evolve msging when revs being evolved are in active topic. Before this patch we are not covering the --continue case. So this patch cover the same and use the stack indexes s# even when we continue an interrupted evolve. In this patch I used the same concept (to check if we should use s#) as we are using in cases other than `--continue`. Thanks to PYD for refactoring those lines. Changes in tests also reflects the expected behaviour.

     1

#!/bin/bash

     2

set -euox pipefail

     3

     4

unset GREP_OPTIONS

     5

NOTOPIC="--config experimental.topic-mode=ignore"

     6

     7

compatbranches=`hg branches --quiet | grep 'mercurial-' | grep -v ':' | sort -n --reverse`

     8

prev='stable'

     9

for branch in $compatbranches; do

    10

    hg up $branch

    11

    hg merge $prev

    12

    hg commit -m "test-compat: merge $prev into $branch"

    13

    prev=$branch

    14

done

    15