diff tests/test-topic.t @ 4704:5f90eb8fd63c

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.

--- a/tests/test-topic.t	Sun Apr 14 12:55:46 2019 +0530
+++ b/tests/test-topic.t	Tue Jun 25 21:54:22 2019 +0530
@@ -1084,11 +1084,9 @@
   changed topic on 1 changesets to "foo"
 
 Try to put a tag on current rev which also has an active topic:
-XXX: it shouldn't have aborted here
   $ hg tag 1.0
-  abort: working directory is not at a branch head (use -f to force)
-  [255]
   $ hg tags
-  tip                                2:3bbb3fdb2546
+  tip                                3:9efc5c3ac635
+  1.0                                2:3bbb3fdb2546
 
   $ cd ..