Show More
@@ -1168,9 +1168,18 b' def heads(repo, subset, x, order):' | |||||
1168 | # argument set should never define order |
|
1168 | # argument set should never define order | |
1169 | if order == defineorder: |
|
1169 | if order == defineorder: | |
1170 | order = followorder |
|
1170 | order = followorder | |
1171 |
s = getset(repo, |
|
1171 | inputset = getset(repo, fullreposet(repo), x, order=order) | |
1172 | ps = parents(repo, subset, x) |
|
1172 | ps = set() | |
1173 | return s - ps |
|
1173 | cl = repo.changelog | |
|
1174 | up = ps.update | |||
|
1175 | parentrevs = cl.parentrevs | |||
|
1176 | for r in inputset: | |||
|
1177 | try: | |||
|
1178 | up(parentrevs(r)) | |||
|
1179 | except error.WdirUnsupported: | |||
|
1180 | up(p.rev() for p in repo[r].parents()) | |||
|
1181 | ps.discard(node.nullrev) | |||
|
1182 | return subset & (inputset - ps) | |||
1174 |
|
1183 | |||
1175 | @predicate('hidden()', safe=True) |
|
1184 | @predicate('hidden()', safe=True) | |
1176 | def hidden(repo, subset, x): |
|
1185 | def hidden(repo, subset, x): |
@@ -1427,12 +1427,10 b' Test heads' | |||||
1427 | $ hg debugrevspec -s '9: & heads(all())' |
|
1427 | $ hg debugrevspec -s '9: & heads(all())' | |
1428 | * set: |
|
1428 | * set: | |
1429 | <filteredset |
|
1429 | <filteredset | |
|
1430 | <baseset [9]>, | |||
1430 | <filteredset |
|
1431 | <filteredset | |
1431 |
< |
|
1432 | <spanset+ 0:10>, | |
1432 | <spanset+ 0:10>>, |
|
1433 | <not set([0, 1, 2, 3, 4, 5, 6, 8])>>> | |
1433 | <not |
|
|||
1434 | <filteredset |
|
|||
1435 | <baseset [9]>, set([0, 1, 2, 3, 4, 5, 6, 8])>>> |
|
|||
1436 | 9 |
|
1434 | 9 | |
1437 |
|
1435 | |||
1438 | but should follow the order of the subset |
|
1436 | but should follow the order of the subset |
General Comments 0
You need to be logged in to leave comments.
Login now