equal
deleted
inserted
replaced
85 yield i |
85 yield i |
86 break |
86 break |
87 |
87 |
88 return generatorset(iterate(), iterasc=True) |
88 return generatorset(iterate(), iterasc=True) |
89 |
89 |
90 def _revsbetween(repo, roots, heads): |
90 def revsbetween(repo, roots, heads): |
91 """Return all paths between roots and heads, inclusive of both endpoint |
91 """Return all paths between roots and heads, inclusive of both endpoint |
92 sets.""" |
92 sets.""" |
93 if not roots: |
93 if not roots: |
94 return baseset() |
94 return baseset() |
95 parentrevs = repo.changelog.parentrevs |
95 parentrevs = repo.changelog.parentrevs |
404 # would be more efficient. |
404 # would be more efficient. |
405 return r & subset |
405 return r & subset |
406 |
406 |
407 def dagrange(repo, subset, x, y): |
407 def dagrange(repo, subset, x, y): |
408 r = fullreposet(repo) |
408 r = fullreposet(repo) |
409 xs = _revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) |
409 xs = revsbetween(repo, getset(repo, r, x), getset(repo, r, y)) |
410 # XXX We should combine with subset first: 'subset & baseset(...)'. This is |
410 # XXX We should combine with subset first: 'subset & baseset(...)'. This is |
411 # necessary to ensure we preserve the order in subset. |
411 # necessary to ensure we preserve the order in subset. |
412 return xs & subset |
412 return xs & subset |
413 |
413 |
414 def andset(repo, subset, x, y): |
414 def andset(repo, subset, x, y): |