Mercurial > hg
changeset 43299:83bb1e89ab9b
copies: compute the exact set of revision to walk
This change make the code clearer by removing the revision queue. It comes
without very noticeable performance impact. However the simpler code will be
easier to update in later changesets.
revision: large amount; added files: large amount; rename small amount; c3b14617fbd7 9ba6ab77fd29
before: ! wall 1.430082 comb 1.430000 user 1.390000 sys 0.040000 (median of 10)
after: ! wall 1.405192 comb 1.410000 user 1.390000 sys 0.020000 (median of 10)
revision: large amount; added files: small amount; rename small amount; c3b14617fbd7 f650a9b140d2
before: ! wall 1.971366 comb 1.970000 user 1.950000 sys 0.020000 (median of 10)
after: ! wall 1.892541 comb 1.890000 user 1.870000 sys 0.020000 (median of 10)
revision: large amount; added files: large amount; rename large amount; 08ea3258278e d9fa043f30c0
before: ! wall 0.252594 comb 0.250000 user 0.240000 sys 0.010000 (median of 38)
after: ! wall 0.240075 comb 0.240000 user 0.240000 sys 0.000000 (median of 40)
revision: small amount; added files: large amount; rename large amount; df6f7a526b60 a83dc6a2d56f
before: ! wall 0.013100 comb 0.010000 user 0.010000 sys 0.000000 (median of 226)
after: ! wall 0.013247 comb 0.010000 user 0.010000 sys 0.000000 (median of 223)
revision: small amount; added files: large amount; rename small amount; 4aa4e1f8e19a 169138063d63
before: ! wall 0.001633 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000)
after: ! wall 0.001670 comb 0.000000 user 0.000000 sys 0.000000 (median of 1000)
revision: small amount; added files: small amount; rename small amount; 4bc173b045a6 964879152e2e
before: ! wall 0.000078 comb 0.000000 user 0.000000 sys 0.000000 (median of 11984)
after: ! wall 0.000119 comb 0.000000 user 0.000000 sys 0.000000 (median of 7982)
revision: medium amount; added files: large amount; rename medium amount; c95f1ced15f2 2c68e87c3efe
before: ! wall 0.207093 comb 0.210000 user 0.210000 sys 0.000000 (median of 47)
after: ! wall 0.201551 comb 0.200000 user 0.200000 sys 0.000000 (median of 48)
revision: medium amount; added files: medium amount; rename small amount; d343da0c55a8 d7746d32bf9d
before: ! wall 0.038462 comb 0.040000 user 0.040000 sys 0.000000 (median of 100)
after: ! wall 0.036578 comb 0.030000 user 0.030000 sys 0.000000 (median of 100)
Differential Revision: https://phab.mercurial-scm.org/D7076
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 12 Oct 2019 18:35:14 +0200 |
| parents | dda9482f60d2 |
| children | ffd04bc9f57d |
| files | mercurial/copies.py |
| diffstat | 1 files changed, 18 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/copies.py Sat Oct 12 17:53:29 2019 +0200 +++ b/mercurial/copies.py Sat Oct 12 18:35:14 2019 +0200 @@ -8,7 +8,6 @@ from __future__ import absolute_import import collections -import heapq import os from .i18n import _ @@ -229,6 +228,8 @@ cl = repo.changelog missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()]) + mrset = set(missingrevs) + roots = set() for r in missingrevs: for p in cl.parentrevs(r): if p == node.nullrev: @@ -237,17 +238,25 @@ children[p] = [r] else: children[p].append(r) + if p not in mrset: + roots.add(p) + if not roots: + # no common revision to track copies from + return {} + min_root = min(roots) - roots = set(children) - set(missingrevs) - work = list(roots) + from_head = set( + cl.reachableroots(min_root, [b.rev()], list(roots), includepath=True) + ) + + iterrevs = set(from_head) + iterrevs &= mrset + iterrevs.update(roots) + iterrevs.remove(b.rev()) all_copies = {r: {} for r in roots} - heapq.heapify(work) alwaysmatch = match.always() - while work: - r = heapq.heappop(work) + for r in sorted(iterrevs): copies = all_copies.pop(r) - if r == b.rev(): - return copies for i, c in enumerate(children[r]): p1, p2, p1copies, p2copies, removed = revinfo(c) if r == p1: @@ -273,7 +282,6 @@ del newcopies[f] othercopies = all_copies.get(c) if othercopies is None: - heapq.heappush(work, c) all_copies[c] = newcopies else: # we are the second parent to work on c, we need to merge our @@ -293,7 +301,7 @@ else: newcopies.update(othercopies) all_copies[c] = newcopies - assert False + return all_copies[b.rev()] def _forwardcopies(a, b, base=None, match=None):