| pulkit |
| hg-reviewers |
Previously we were sorting them by whatever implicit sort order we got
between changectx instances. Sorting by rev at least makes some sense,
so I chose that.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/rebase.py (4 lines) |
| # Only check the first batch of revisions to rebase not depending on other | # Only check the first batch of revisions to rebase not depending on other | ||||
| # rebaseset. This means "source is ancestor of destination" for the second | # rebaseset. This means "source is ancestor of destination" for the second | ||||
| # (and following) batches of revisions are not checked here. We rely on | # (and following) batches of revisions are not checked here. We rely on | ||||
| # "defineparents" to do that check. | # "defineparents" to do that check. | ||||
| roots = list(repo.set('roots(%ld)', sortedsrc[0])) | roots = list(repo.set('roots(%ld)', sortedsrc[0])) | ||||
| if not roots: | if not roots: | ||||
| raise error.Abort(_('no matching revisions')) | raise error.Abort(_('no matching revisions')) | ||||
| roots.sort() | def revof(r): | ||||
| return r.rev() | |||||
| roots = sorted(roots, key=revof) | |||||
| state = dict.fromkeys(rebaseset, revtodo) | state = dict.fromkeys(rebaseset, revtodo) | ||||
| emptyrebase = (len(sortedsrc) == 1) | emptyrebase = (len(sortedsrc) == 1) | ||||
| for root in roots: | for root in roots: | ||||
| dest = repo[destmap[root.rev()]] | dest = repo[destmap[root.rev()]] | ||||
| commonbase = root.ancestor(dest) | commonbase = root.ancestor(dest) | ||||
| if commonbase == root: | if commonbase == root: | ||||
| raise error.Abort(_('source is ancestor of destination')) | raise error.Abort(_('source is ancestor of destination')) | ||||
| if commonbase == dest: | if commonbase == dest: | ||||