equal
deleted
inserted
replaced
287 mid_revs = repo.revs('only(%d, %d)', ps[1], ps[0]) |
287 mid_revs = repo.revs('only(%d, %d)', ps[1], ps[0]) |
288 if mid_revs: |
288 if mid_revs: |
289 mid = stablesort_mergepoint_bounded(repo, ps[1], mid_revs) |
289 mid = stablesort_mergepoint_bounded(repo, ps[1], mid_revs) |
290 |
290 |
291 # And follow up with part othe parent we can inherit from |
291 # And follow up with part othe parent we can inherit from |
292 bottom_revs = cl.ancestors([ps[0]], inclusive=True) |
292 bottom = stablesort_mergepoint_head(repo, ps[0]) |
293 bottom = stablesort_mergepoint_bounded(repo, ps[0], bottom_revs) |
|
294 |
293 |
295 return bottom + mid + top |
294 return bottom + mid + top |
296 |
295 |
297 def stablesort_mergepoint_head_cached(repo, revs, limit=None): |
296 def stablesort_mergepoint_head_cached(repo, revs, limit=None): |
298 heads = repo.revs('heads(%ld)', revs) |
297 heads = repo.revs('heads(%ld)', revs) |