##// END OF EJS Templates
pathcopies: give up any optimization based on `introrev`...
pathcopies: give up any optimization based on `introrev` Between 8a0136f69027 and d98fb3f42f33, we sped up the search for the introduction revision during path copies. However, further checking show that finding the introduction revision is still expensive and that we are better off without it. So we simply drop it and only rely on the linkrev optimisation. I ran `perfpathcopies` on 6989 pair of revision in the pypy repository (`hg perfhelper-pathcopies`. The result is massively in favor of dropping this condition. The result of the copy tracing are unchanged. Attempt to use a smaller changes preserving linkrev usage were unsuccessful, it can return wrong result. The following changesets broke test-mv-cp-st-diff.t - if not f.isintroducedafter(limit): + if limit >= 0 and f.linkrev() < limit: return None Here are various numbers (before this changeset/after this changesets) source destination before after saved-time ratio worth cases e66f24650daf 695dfb0f493b 1.062843 1.246369 -0.183526 1.172675 c979853a3b6a 8d60fe293e79 1.036985 1.196414 -0.159429 1.153743 22349fa2fc33 fbb1c9fd86c0 0.879926 1.038682 -0.158756 1.180420 682b98f3e672 a4878080a536 0.909952 1.063801 -0.153849 1.169074 5adabc9b9848 920958a93997 0.993622 1.147452 -0.153830 1.154817 worse 1% dbfbfcf077e9 aea8f2fd3593 1.016595 1.082999 -0.066404 1.065320 worse 5% c95f1ced15f2 7d29d5e39734 0.453694 0.471156 -0.017462 1.038488 worse 10% 3e144ed1d5b7 2aef0e942480 0.035140 0.037535 -0.002395 1.068156 worse 25% 321fc60db035 801748ba582a 0.009267 0.009325 -0.000058 1.006259 median 2088ce763fc2 e6991321d78b 0.000665 0.000651 0.000014 0.978947 best 25% 915631a97de6 385b31354be6 0.040743 0.040363 0.000380 0.990673 best 10% ad495c36a765 19c10384d3e7 0.431658 0.411490 0.020168 0.953278 best 5% d13ae7d283ae 813c99f810ac 1.141404 1.075346 0.066058 0.942126 best 1% 81593cb4a496 99ae11866969 1.833297 0.063823 1.769474 0.034813 best cases c3b14617fbd7 743a0fcaa4eb 1101.811740 2.735970 1099.075770 0.002483 c3b14617fbd7 9ba6ab77fd29 1116.753953 2.800729 1113.953224 0.002508 058b99d6e81f 57e249b7a3ea 1246.128485 3.042762 1243.085723 0.002442 9a8c361aab49 0354a250d371 1253.111894 3.085796 1250.026098 0.002463 442dbbc53c68 3ec1002a818c 1261.786294 3.138607 1258.647687 0.002487 As one can see, the average case is not really impacted. However, the worth case we get after this changeset are much better than the one we had before it. We have 30 pairs where improvements are above 10 minutes. This reflect in the combined time for all pairs before: 26256s after: 1300s (-95%) If we remove these pathological 30 cases, we still see a significant improvements: before: 1631s after: 1245s (-24%)

File last commit:

r43375:649d3ac3 default
r43469:c16fe77e default
Show More
remotenames.py
440 lines | 13.8 KiB | text/x-python | PythonLexer
# remotenames.py - extension to display remotenames
#
# Copyright 2017 Augie Fackler <raf@durin42.com>
# Copyright 2017 Sean Farley <sean@farley.io>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
""" showing remotebookmarks and remotebranches in UI (EXPERIMENTAL)
By default both remotebookmarks and remotebranches are turned on. Config knob to
control the individually are as follows.
Config options to tweak the default behaviour:
remotenames.bookmarks
Boolean value to enable or disable showing of remotebookmarks (default: True)
remotenames.branches
Boolean value to enable or disable showing of remotebranches (default: True)
remotenames.hoistedpeer
Name of the peer whose remotebookmarks should be hoisted into the top-level
namespace (default: 'default')
"""
from __future__ import absolute_import
from mercurial.i18n import _
from mercurial.node import bin
from mercurial import (
bookmarks,
error,
extensions,
logexchange,
namespaces,
pycompat,
registrar,
revsetlang,
smartset,
templateutil,
util,
)
from mercurial.utils import stringutil
if pycompat.ispy3:
import collections.abc
mutablemapping = collections.abc.MutableMapping
else:
import collections
mutablemapping = collections.MutableMapping
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified.
testedwith = b'ships-with-hg-core'
configtable = {}
configitem = registrar.configitem(configtable)
templatekeyword = registrar.templatekeyword()
revsetpredicate = registrar.revsetpredicate()
configitem(
b'remotenames', b'bookmarks', default=True,
)
configitem(
b'remotenames', b'branches', default=True,
)
configitem(
b'remotenames', b'hoistedpeer', default=b'default',
)
class lazyremotenamedict(mutablemapping):
"""
Read-only dict-like Class to lazily resolve remotename entries
We are doing that because remotenames startup was slow.
We lazily read the remotenames file once to figure out the potential entries
and store them in self.potentialentries. Then when asked to resolve an
entry, if it is not in self.potentialentries, then it isn't there, if it
is in self.potentialentries we resolve it and store the result in
self.cache. We cannot be lazy is when asked all the entries (keys).
"""
def __init__(self, kind, repo):
self.cache = {}
self.potentialentries = {}
self._kind = kind # bookmarks or branches
self._repo = repo
self.loaded = False
def _load(self):
""" Read the remotenames file, store entries matching selected kind """
self.loaded = True
repo = self._repo
for node, rpath, rname in logexchange.readremotenamefile(
repo, self._kind
):
name = rpath + b'/' + rname
self.potentialentries[name] = (node, rpath, name)
def _resolvedata(self, potentialentry):
""" Check that the node for potentialentry exists and return it """
if not potentialentry in self.potentialentries:
return None
node, remote, name = self.potentialentries[potentialentry]
repo = self._repo
binnode = bin(node)
# if the node doesn't exist, skip it
try:
repo.changelog.rev(binnode)
except LookupError:
return None
# Skip closed branches
if self._kind == b'branches' and repo[binnode].closesbranch():
return None
return [binnode]
def __getitem__(self, key):
if not self.loaded:
self._load()
val = self._fetchandcache(key)
if val is not None:
return val
else:
raise KeyError()
def __iter__(self):
return iter(self.potentialentries)
def __len__(self):
return len(self.potentialentries)
def __setitem__(self):
raise NotImplementedError
def __delitem__(self):
raise NotImplementedError
def _fetchandcache(self, key):
if key in self.cache:
return self.cache[key]
val = self._resolvedata(key)
if val is not None:
self.cache[key] = val
return val
else:
return None
def keys(self):
""" Get a list of bookmark or branch names """
if not self.loaded:
self._load()
return self.potentialentries.keys()
def iteritems(self):
""" Iterate over (name, node) tuples """
if not self.loaded:
self._load()
for k, vtup in pycompat.iteritems(self.potentialentries):
yield (k, [bin(vtup[0])])
items = iteritems
class remotenames(object):
"""
This class encapsulates all the remotenames state. It also contains
methods to access that state in convenient ways. Remotenames are lazy
loaded. Whenever client code needs to ensure the freshest copy of
remotenames, use the `clearnames` method to force an eventual load.
"""
def __init__(self, repo, *args):
self._repo = repo
self.clearnames()
def clearnames(self):
""" Clear all remote names state """
self.bookmarks = lazyremotenamedict(b"bookmarks", self._repo)
self.branches = lazyremotenamedict(b"branches", self._repo)
self._invalidatecache()
def _invalidatecache(self):
self._nodetobmarks = None
self._nodetobranch = None
self._hoisttonodes = None
self._nodetohoists = None
def bmarktonodes(self):
return self.bookmarks
def nodetobmarks(self):
if not self._nodetobmarks:
bmarktonodes = self.bmarktonodes()
self._nodetobmarks = {}
for name, node in pycompat.iteritems(bmarktonodes):
self._nodetobmarks.setdefault(node[0], []).append(name)
return self._nodetobmarks
def branchtonodes(self):
return self.branches
def nodetobranch(self):
if not self._nodetobranch:
branchtonodes = self.branchtonodes()
self._nodetobranch = {}
for name, nodes in pycompat.iteritems(branchtonodes):
for node in nodes:
self._nodetobranch.setdefault(node, []).append(name)
return self._nodetobranch
def hoisttonodes(self, hoist):
if not self._hoisttonodes:
marktonodes = self.bmarktonodes()
self._hoisttonodes = {}
hoist += b'/'
for name, node in pycompat.iteritems(marktonodes):
if name.startswith(hoist):
name = name[len(hoist) :]
self._hoisttonodes[name] = node
return self._hoisttonodes
def nodetohoists(self, hoist):
if not self._nodetohoists:
marktonodes = self.bmarktonodes()
self._nodetohoists = {}
hoist += b'/'
for name, node in pycompat.iteritems(marktonodes):
if name.startswith(hoist):
name = name[len(hoist) :]
self._nodetohoists.setdefault(node[0], []).append(name)
return self._nodetohoists
def wrapprintbookmarks(orig, ui, repo, fm, bmarks):
if b'remotebookmarks' not in repo.names:
return
ns = repo.names[b'remotebookmarks']
for name in ns.listnames(repo):
nodes = ns.nodes(repo, name)
if not nodes:
continue
node = nodes[0]
bmarks[name] = (node, b' ', b'')
return orig(ui, repo, fm, bmarks)
def extsetup(ui):
extensions.wrapfunction(bookmarks, b'_printbookmarks', wrapprintbookmarks)
def reposetup(ui, repo):
# set the config option to store remotenames
repo.ui.setconfig(b'experimental', b'remotenames', True, b'remotenames-ext')
if not repo.local():
return
repo._remotenames = remotenames(repo)
ns = namespaces.namespace
if ui.configbool(b'remotenames', b'bookmarks'):
remotebookmarkns = ns(
b'remotebookmarks',
templatename=b'remotebookmarks',
colorname=b'remotebookmark',
logfmt=b'remote bookmark: %s\n',
listnames=lambda repo: repo._remotenames.bmarktonodes().keys(),
namemap=lambda repo, name: repo._remotenames.bmarktonodes().get(
name, []
),
nodemap=lambda repo, node: repo._remotenames.nodetobmarks().get(
node, []
),
)
repo.names.addnamespace(remotebookmarkns)
# hoisting only works if there are remote bookmarks
hoist = ui.config(b'remotenames', b'hoistedpeer')
if hoist:
hoistednamens = ns(
b'hoistednames',
templatename=b'hoistednames',
colorname=b'hoistedname',
logfmt=b'hoisted name: %s\n',
listnames=lambda repo: repo._remotenames.hoisttonodes(
hoist
).keys(),
namemap=lambda repo, name: repo._remotenames.hoisttonodes(
hoist
).get(name, []),
nodemap=lambda repo, node: repo._remotenames.nodetohoists(
hoist
).get(node, []),
)
repo.names.addnamespace(hoistednamens)
if ui.configbool(b'remotenames', b'branches'):
remotebranchns = ns(
b'remotebranches',
templatename=b'remotebranches',
colorname=b'remotebranch',
logfmt=b'remote branch: %s\n',
listnames=lambda repo: repo._remotenames.branchtonodes().keys(),
namemap=lambda repo, name: repo._remotenames.branchtonodes().get(
name, []
),
nodemap=lambda repo, node: repo._remotenames.nodetobranch().get(
node, []
),
)
repo.names.addnamespace(remotebranchns)
@templatekeyword(b'remotenames', requires={b'repo', b'ctx'})
def remotenameskw(context, mapping):
"""List of strings. Remote names associated with the changeset."""
repo = context.resource(mapping, b'repo')
ctx = context.resource(mapping, b'ctx')
remotenames = []
if b'remotebookmarks' in repo.names:
remotenames = repo.names[b'remotebookmarks'].names(repo, ctx.node())
if b'remotebranches' in repo.names:
remotenames += repo.names[b'remotebranches'].names(repo, ctx.node())
return templateutil.compatlist(
context, mapping, b'remotename', remotenames, plural=b'remotenames'
)
@templatekeyword(b'remotebookmarks', requires={b'repo', b'ctx'})
def remotebookmarkskw(context, mapping):
"""List of strings. Remote bookmarks associated with the changeset."""
repo = context.resource(mapping, b'repo')
ctx = context.resource(mapping, b'ctx')
remotebmarks = []
if b'remotebookmarks' in repo.names:
remotebmarks = repo.names[b'remotebookmarks'].names(repo, ctx.node())
return templateutil.compatlist(
context,
mapping,
b'remotebookmark',
remotebmarks,
plural=b'remotebookmarks',
)
@templatekeyword(b'remotebranches', requires={b'repo', b'ctx'})
def remotebrancheskw(context, mapping):
"""List of strings. Remote branches associated with the changeset."""
repo = context.resource(mapping, b'repo')
ctx = context.resource(mapping, b'ctx')
remotebranches = []
if b'remotebranches' in repo.names:
remotebranches = repo.names[b'remotebranches'].names(repo, ctx.node())
return templateutil.compatlist(
context,
mapping,
b'remotebranch',
remotebranches,
plural=b'remotebranches',
)
def _revsetutil(repo, subset, x, rtypes):
"""utility function to return a set of revs based on the rtypes"""
args = revsetlang.getargs(x, 0, 1, _(b'only one argument accepted'))
if args:
kind, pattern, matcher = stringutil.stringmatcher(
revsetlang.getstring(args[0], _(b'argument must be a string'))
)
else:
kind = pattern = None
matcher = util.always
nodes = set()
cl = repo.changelog
for rtype in rtypes:
if rtype in repo.names:
ns = repo.names[rtype]
for name in ns.listnames(repo):
if not matcher(name):
continue
nodes.update(ns.nodes(repo, name))
if kind == b'literal' and not nodes:
raise error.RepoLookupError(
_(b"remote name '%s' does not exist") % pattern
)
revs = (cl.rev(n) for n in nodes if cl.hasnode(n))
return subset & smartset.baseset(revs)
@revsetpredicate(b'remotenames([name])')
def remotenamesrevset(repo, subset, x):
"""All changesets which have a remotename on them. If `name` is
specified, only remotenames of matching remote paths are considered.
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
return _revsetutil(repo, subset, x, (b'remotebookmarks', b'remotebranches'))
@revsetpredicate(b'remotebranches([name])')
def remotebranchesrevset(repo, subset, x):
"""All changesets which are branch heads on remotes. If `name` is
specified, only remotenames of matching remote paths are considered.
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
return _revsetutil(repo, subset, x, (b'remotebranches',))
@revsetpredicate(b'remotebookmarks([name])')
def remotebmarksrevset(repo, subset, x):
"""All changesets which have bookmarks on remotes. If `name` is
specified, only remotenames of matching remote paths are considered.
Pattern matching is supported for `name`. See :hg:`help revisions.patterns`.
"""
return _revsetutil(repo, subset, x, (b'remotebookmarks',))