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

#!/bin/sh

     2

. $TESTDIR/testlib/pythonpath.sh

     3

     4

# This file holds logic that is used in many tests.

     5

# It can be called in a test like this:

     6

#  $ . "$TESTDIR/testlib/topic_setup.sh"

     7

     8

# Enable obsolete markers and enable extensions

     9

cat >> $HGRCPATH << EOF

    10

[experimental]

    11

evolution=createmarkers,exchange

    12

    13

[extensions]

    14

rebase=

    15

topic=

    16

EOF