This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7076

copies: compute the exact set of revision to walk
ClosedPublic

Authored by marmoute on Oct 12 2019, 12:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG83bb1e89ab9b: copies: compute the exact set of revision to walk
Summary

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)

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

marmoute created this revision.Oct 12 2019, 12:47 PM
marmoute edited the summary of this revision. (Show Details)Oct 16 2019, 6:56 PM
marmoute updated this revision to Diff 17278.
marmoute updated this revision to Diff 17279.Oct 16 2019, 7:12 PM
martinvonz added a subscriber: martinvonz.Oct 17 2019, 3:19 PM
martinvonz added inline comments.
mercurial/copies.py
248

line too long (also make black unhappy)

marmoute updated this revision to Diff 17330.Oct 17 2019, 7:46 PM
marmoute added a commit: rHG83bb1e89ab9b: copies: compute the exact set of revision to walk.Oct 19 2019, 1:38 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG83bb1e89ab9b: copies: compute the exact set of revision to walk (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (26 lines)

Diff 17279

mercurial/copies.py

# copies.py - copy detection for Mercurial # copies.py - copy detection for Mercurial
# #
# Copyright 2008 Matt Mackall <mpm@selenic.com> # Copyright 2008 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import collections import collections
import heapq
import os import os
from .i18n import _ from .i18n import _
from .revlogutils.flagutil import REVIDX_SIDEDATA from .revlogutils.flagutil import REVIDX_SIDEDATA
from . import ( from . import (
return {} return {}
repo = a.repo().unfiltered() repo = a.repo().unfiltered()
children = {} children = {}
revinfo = _revinfogetter(repo) revinfo = _revinfogetter(repo)
cl = repo.changelog cl = repo.changelog
missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()]) missingrevs = cl.findmissingrevs(common=[a.rev()], heads=[b.rev()])
mrset = set(missingrevs)
roots = set()
for r in missingrevs: for r in missingrevs:
for p in cl.parentrevs(r): for p in cl.parentrevs(r):
if p == node.nullrev: if p == node.nullrev:
continue continue
if p not in children: if p not in children:
children[p] = [r] children[p] = [r]
else: else:
children[p].append(r) 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)
from_head = set(cl.reachableroots(min_root, [b.rev()], list(roots), includepath=True))
martinvonzUnsubmitted
Not Done

line too long (also make black unhappy)

martinvonz: line too long (also make black unhappy)
roots = set(children) - set(missingrevs) iterrevs = set(from_head)
work = list(roots) iterrevs &= mrset
iterrevs.update(roots)
iterrevs.remove(b.rev())
all_copies = {r: {} for r in roots} all_copies = {r: {} for r in roots}
heapq.heapify(work)
alwaysmatch = match.always() alwaysmatch = match.always()
while work: for r in sorted(iterrevs):
r = heapq.heappop(work)
copies = all_copies.pop(r) copies = all_copies.pop(r)
if r == b.rev():
return copies
for i, c in enumerate(children[r]): for i, c in enumerate(children[r]):
p1, p2, p1copies, p2copies, removed = revinfo(c) p1, p2, p1copies, p2copies, removed = revinfo(c)
if r == p1: if r == p1:
parent = 1 parent = 1
childcopies = p1copies childcopies = p1copies
else: else:
assert r == p2 assert r == p2
parent = 2 parent = 2
newcopies = copies newcopies = copies
if childcopies: if childcopies:
newcopies = _chain(newcopies, childcopies) newcopies = _chain(newcopies, childcopies)
for f in removed: for f in removed:
if f in newcopies: if f in newcopies:
del newcopies[f] del newcopies[f]
othercopies = all_copies.get(c) othercopies = all_copies.get(c)
if othercopies is None: if othercopies is None:
heapq.heappush(work, c)
all_copies[c] = newcopies all_copies[c] = newcopies
else: else:
# we are the second parent to work on c, we need to merge our # we are the second parent to work on c, we need to merge our
# work with the other. # work with the other.
# #
# Unlike when copies are stored in the filelog, we consider # Unlike when copies are stored in the filelog, we consider
# it a copy even if the destination already existed on the # it a copy even if the destination already existed on the
# other branch. It's simply too expensive to check if the # other branch. It's simply too expensive to check if the
# file existed in the manifest. # file existed in the manifest.
# #
# In case of conflict, parent 1 take precedence over parent 2. # In case of conflict, parent 1 take precedence over parent 2.
# This is an arbitrary choice made anew when implementing # This is an arbitrary choice made anew when implementing
# changeset based copies. It was made without regards with # changeset based copies. It was made without regards with
# potential filelog related behavior. # potential filelog related behavior.
if parent == 1: if parent == 1:
othercopies.update(newcopies) othercopies.update(newcopies)
else: else:
newcopies.update(othercopies) newcopies.update(othercopies)
all_copies[c] = newcopies all_copies[c] = newcopies
assert False return all_copies[b.rev()]
def _forwardcopies(a, b, base=None, match=None): def _forwardcopies(a, b, base=None, match=None):
"""find {dst@b: src@a} copy mapping where a is an ancestor of b""" """find {dst@b: src@a} copy mapping where a is an ancestor of b"""
if base is None: if base is None:
base = a base = a
match = a.repo().narrowmatch(match) match = a.repo().narrowmatch(match)