Mercurial > evolve
changeset 6382:3d0b5b4b262a
topic: make _nbheads() skip branchmap entries that aren't just a branch
This code should've been updated when branchmap started containing items in the
new FQBN format, but it's better late than never.
This fixes failure in test-single-head-obsolescence-topic-B3.t on hg <= 6.0.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Wed, 01 Feb 2023 18:18:35 +0400 |
| parents | 60daa7887c49 |
| children | c6e3d2dbbeb0 |
| files | hgext3rd/topic/discovery.py |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/topic/discovery.py Tue Jan 31 13:33:28 2023 +0400 +++ b/hgext3rd/topic/discovery.py Wed Feb 01 18:18:35 2023 +0400 @@ -248,7 +248,8 @@ filterfn = lambda repo, heads: heads data = {} for b in repo.branchmap().iterbranches(): - if b':' in b[0]: + namedbranch, tns, topic = common.parsefqbn(b[0]) + if tns != b'default' or topic: continue oldheads = [repo[n].rev() for n in b[1]] newheads = filterfn(repo, oldheads)