Show More
@@ -346,11 +346,18 b' def rangeset(repo, subset, x, y):' | |||||
346 | r = spanset(repo, m, n + 1) |
|
346 | r = spanset(repo, m, n + 1) | |
347 | else: |
|
347 | else: | |
348 | r = spanset(repo, m, n - 1) |
|
348 | r = spanset(repo, m, n - 1) | |
|
349 | # XXX We should combine with subset first: 'subset & baseset(...)'. This is | |||
|
350 | # necessary to ensure we preserve the order in subset. | |||
|
351 | # | |||
|
352 | # This has performance implication, carrying the sorting over when possible | |||
|
353 | # would be more efficient. | |||
349 | return r & subset |
|
354 | return r & subset | |
350 |
|
355 | |||
351 | def dagrange(repo, subset, x, y): |
|
356 | def dagrange(repo, subset, x, y): | |
352 | r = fullreposet(repo) |
|
357 | r = fullreposet(repo) | |
353 | xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) |
|
358 | xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) | |
|
359 | # XXX We should combine with subset first: 'subset & baseset(...)'. This is | |||
|
360 | # necessary to ensure we preserve the order in subset. | |||
354 | return xs & subset |
|
361 | return xs & subset | |
355 |
|
362 | |||
356 | def andset(repo, subset, x, y): |
|
363 | def andset(repo, subset, x, y): | |
@@ -1092,6 +1099,8 b' def head(repo, subset, x):' | |||||
1092 | hs = set() |
|
1099 | hs = set() | |
1093 | for b, ls in repo.branchmap().iteritems(): |
|
1100 | for b, ls in repo.branchmap().iteritems(): | |
1094 | hs.update(repo[h].rev() for h in ls) |
|
1101 | hs.update(repo[h].rev() for h in ls) | |
|
1102 | # XXX We should combine with subset first: 'subset & baseset(...)'. This is | |||
|
1103 | # necessary to ensure we preserve the order in subset. | |||
1095 | return baseset(hs).filter(subset.__contains__) |
|
1104 | return baseset(hs).filter(subset.__contains__) | |
1096 |
|
1105 | |||
1097 | def heads(repo, subset, x): |
|
1106 | def heads(repo, subset, x): |
General Comments 0
You need to be logged in to leave comments.
Login now