Mercurial > public > mercurial-scm > hg
comparison mercurial/phases.py @ 39141:c89e2fb207a1 stable
remotephase: fast path newheads computation in simple case (issue5964)
Changeset 88efb7d6bcb6 fixed the logic of `phases.newheads` but greatly
regressed its performance (up to many order of magnitude). The first step to
fix the regression is to exit early when there is no work to do. If there are
no heads to filter or not roots to filter them, we don't have to do any work.
This fixes the regression when talking to an all public changeset. The
performance is even better than before.
pypy, compared to an all public repo
------------------------------------
8eeed92475d5: 0.005758 seconds
88efb7d6bcb6: 0.602517 seconds (x104)
this code: 0.001508 seconds (-74% from base)
mercurial compared to an all public repo
----------------------------------------
8eeed92475d5: 0.000577 seconds
88efb7d6bcb6: 0.185316 seconds (x321)
this code: 0.000150 seconds (-74% from base)
The performance of newheads, when actual computations are required, is fixed
in the next changeset.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Fri, 17 Aug 2018 16:00:32 -0700 |
| parents | ddd2165438cd |
| children | f736fdbe546a |
comparison
equal
deleted
inserted
replaced
| 39140:1732db2f8210 | 39141:c89e2fb207a1 |
|---|---|
| 662 def newheads(repo, heads, roots): | 662 def newheads(repo, heads, roots): |
| 663 """compute new head of a subset minus another | 663 """compute new head of a subset minus another |
| 664 | 664 |
| 665 * `heads`: define the first subset | 665 * `heads`: define the first subset |
| 666 * `roots`: define the second we subtract from the first""" | 666 * `roots`: define the second we subtract from the first""" |
| 667 if not heads or not roots: | |
| 668 return heads | |
| 667 repo = repo.unfiltered() | 669 repo = repo.unfiltered() |
| 668 revs = repo.revs('heads(::%ln - (%ln::%ln))', heads, roots, heads) | 670 revs = repo.revs('heads(::%ln - (%ln::%ln))', heads, roots, heads) |
| 669 return pycompat.maplist(repo.changelog.node, revs) | 671 return pycompat.maplist(repo.changelog.node, revs) |
| 670 | 672 |
| 671 def newcommitphase(ui): | 673 def newcommitphase(ui): |