evolve: fix confusion in branch heads checking logic when topic in play To provide some context, when topics are in play the branchmap cache we store contains the branch info of a rev as "branch:topic" format IIUC. Assuming that is right, now in present code we don't actually cover this part that "when looking for branch heads where we also have active topic we should look for branch='branch_name:topic' instead". And we get wrong branch heads as a result. This patch make sure that we pass right candidate to find branch heads using branchmap.branchheads() by overriding the localrepo.branchheads() Changes in test file reflect the fixed behavior.

     1

-------------------------

     2

Evolve Commands Reference

     3

-------------------------

     4

     5

.. highlight:: none

     6

     7

amend

     8

-----

     9

    10

.. hghelp:: amend

    11

    12

evolve

    13

------

    14

    15

.. hghelp:: evolve

    16

    17

fold

    18

----

    19

    20

.. hghelp:: fold

    21

    22

metaedit

    23

--------

    24

    25

.. hghelp:: metaedit

    26

    27

next

    28

----

    29

    30

.. hghelp:: next

    31

    32

obslog

    33

------

    34

    35

.. hghelp:: obslog

    36

    37

pdiff

    38

-----

    39

    40

.. hghelp:: pdiff

    41

    42

previous

    43

--------

    44

    45

.. hghelp:: previous

    46

    47

prune

    48

-----

    49

    50

.. hghelp:: prune

    51

    52

pstatus

    53

-------

    54

    55

.. hghelp:: pstatus

    56

    57

split

    58

-----

    59

    60

.. hghelp:: split

    61

    62

touch

    63

-----

    64

    65

.. hghelp:: touch

    66

    67

uncommit

    68

--------

    69

    70

.. hghelp:: uncommit