Mercurial > hg
changeset 50525:1a4f54574e3d
stabletailgraph: clarify naiveness of current implementation
Both the naive and the actual versions of the algorithms are going to co-exist
for the tests. This makes is clearer that this one is naive.
| author | pacien <pacien.trangirard@pacien.net> |
|---|---|
| date | Fri, 21 Apr 2023 14:32:58 +0200 |
| parents | 58adcabc295f |
| children | 4fd2f7ab4177 |
| files | mercurial/debugcommands.py mercurial/stabletailgraph/stabletailsort.py |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/debugcommands.py Fri May 19 14:49:50 2023 +0200 +++ b/mercurial/debugcommands.py Fri Apr 21 14:32:58 2023 +0200 @@ -3671,7 +3671,7 @@ cl = repo.changelog displayer = logcmdutil.maketemplater(ui, repo, template) - sorted_revs = stabletailsort._stable_tail_sort(cl, rev) + sorted_revs = stabletailsort._stable_tail_sort_naive(cl, rev) for ancestor_rev in sorted_revs: displayer.show(repo[ancestor_rev])
--- a/mercurial/stabletailgraph/stabletailsort.py Fri May 19 14:49:50 2023 +0200 +++ b/mercurial/stabletailgraph/stabletailsort.py Fri Apr 21 14:32:58 2023 +0200 @@ -74,7 +74,7 @@ return p1, p2 -def _stable_tail_sort(cl, head_rev): +def _stable_tail_sort_naive(cl, head_rev): """ Naive topological iterator of the ancestors given by the stable-tail sort. @@ -103,7 +103,9 @@ cl.parentrevs, (pt,), inclusive=True ) exclusive_ancestors = ( - a for a in _stable_tail_sort(cl, px) if a not in tail_ancestors + a + for a in _stable_tail_sort_naive(cl, px) + if a not in tail_ancestors ) excl_part_size = cl.fast_rank(cursor_rev) - cl.fast_rank(pt) - 1