##// END OF EJS Templates
rust: peek_mut optim for lazy ancestors...
rust: peek_mut optim for lazy ancestors This is one of the two optimizations that are also present in the Python code: replacing pairs of pop/push on the BinaryHeap by single updates, hence having it under the hood maintain its consistency (sift) only once. On Mozilla central, the measured gain (see details below) is around 7%. Creating the PeekMut object by calling peek_mut() right away instead of peek() first is less efficient (gain is only 4%, stats not included). Our interpretation is that its creation has a cost which is vasted in the cases where it ends by droping the value (Peekmut::pop() just does self.heap.pop() anyway). On the other hand, the immutable peek() is very fast: it's just taking a reference in the underlying vector. The Python version still has another optimization: if parent(current) == current-1, then the heap doesn't need to maintain its consistency, since we already know that it's bigger than all the others in the heap. Rust's BinaryHeap doesn't allow us to mutate its biggest element with no housekeeping, but we tried it anyway, with a copy of the BinaryHeap implementation with a dedicaded added method: it's not worth the technical debt in our opinion (we measured only a further 1.6% improvement). One possible explanation would be that the sift is really fast anyway in that case, whereas it's not in the case of Python, because it's at least partly done in slow Python code. Still it's possible that replacing BinaryHeap by something more dedicated to discrete ordered types could be faster. Measurements on mozilla-central: Three runs of 'hg perfancestors' on the parent changeset: Moyenne des médianes: 0.100587 ! wall 0.100062 comb 0.100000 user 0.100000 sys 0.000000 (best of 98) ! wall 0.135804 comb 0.130000 user 0.130000 sys 0.000000 (max of 98) ! wall 0.102864 comb 0.102755 user 0.099286 sys 0.003469 (avg of 98) ! wall 0.101486 comb 0.110000 user 0.110000 sys 0.000000 (median of 98) ! wall 0.096804 comb 0.090000 user 0.090000 sys 0.000000 (best of 100) ! wall 0.132235 comb 0.130000 user 0.120000 sys 0.010000 (max of 100) ! wall 0.100258 comb 0.100300 user 0.096000 sys 0.004300 (avg of 100) ! wall 0.098384 comb 0.100000 user 0.100000 sys 0.000000 (median of 100) ! wall 0.099925 comb 0.100000 user 0.100000 sys 0.000000 (best of 98) ! wall 0.133518 comb 0.140000 user 0.130000 sys 0.010000 (max of 98) ! wall 0.102381 comb 0.102449 user 0.098265 sys 0.004184 (avg of 98) ! wall 0.101891 comb 0.090000 user 0.090000 sys 0.000000 (median of 98) Mean of the medians: 0.100587 On the present changeset: ! wall 0.091344 comb 0.090000 user 0.090000 sys 0.000000 (best of 100) ! wall 0.122728 comb 0.120000 user 0.110000 sys 0.010000 (max of 100) ! wall 0.093268 comb 0.093300 user 0.089300 sys 0.004000 (avg of 100) ! wall 0.092567 comb 0.100000 user 0.090000 sys 0.010000 (median of 100) ! wall 0.093294 comb 0.080000 user 0.080000 sys 0.000000 (best of 100) ! wall 0.144887 comb 0.150000 user 0.140000 sys 0.010000 (max of 100) ! wall 0.097708 comb 0.097700 user 0.093400 sys 0.004300 (avg of 100) ! wall 0.094980 comb 0.100000 user 0.090000 sys 0.010000 (median of 100) ! wall 0.091262 comb 0.090000 user 0.080000 sys 0.010000 (best of 100) ! wall 0.123772 comb 0.130000 user 0.120000 sys 0.010000 (max of 100) ! wall 0.093188 comb 0.093200 user 0.089300 sys 0.003900 (avg of 100) ! wall 0.092364 comb 0.100000 user 0.090000 sys 0.010000 (median of 100) Mean of the medians is 0.0933 Differential Revision: https://phab.mercurial-scm.org/D5358

File last commit:

r39585:089fc0db default
r40847:e13ab4ac default
Show More
schemes.py
135 lines | 4.2 KiB | text/x-python | PythonLexer
Alexander Solovyov
schemes extension
r9964 # Copyright 2009, Alexander Solovyov <piranha@piranha.org.ua>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
Alexander Solovyov
schemes extension
r9964
"""extend schemes with shortcuts to repository swarms
This extension allows you to specify shortcuts for parent URLs with a
lot of repositories to act like a scheme, for example::
[schemes]
py = http://code.python.org/hg/
After that you can use it like::
hg clone py://trunk/
Additionally there is support for some more complex schemas, for
example used by Google Code::
[schemes]
gcode = http://{1}.googlecode.com/hg/
The syntax is taken from Mercurial templates, and you have unlimited
number of variables, starting with ``{1}`` and continuing with
``{2}``, ``{3}`` and so on. This variables will receive parts of URL
supplied, split by ``/``. Anything not specified as ``{part}`` will be
just appended to an URL.
For convenience, the extension adds these schemes by default::
[schemes]
py = http://hg.python.org/
bb = https://bitbucket.org/
bb+ssh = ssh://hg@bitbucket.org/
gcode = https://{1}.googlecode.com/hg/
Benjamin Pollack
schemes: add Kiln On Demand to default schemes
r10777 kiln = https://{1}.kilnhg.com/Repo/
Alexander Solovyov
schemes extension
r9964
Martin Geisler
schemes: fixed typos in module docstring
r9965 You can override a predefined scheme by defining a new scheme with the
same name.
Alexander Solovyov
schemes extension
r9964 """
timeless
schemas: use absolute_import
r28379 from __future__ import absolute_import
Alexander Solovyov
schemes extension
r9964
timeless
schemas: use absolute_import
r28379 import os
import re
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205
from mercurial.i18n import _
timeless
schemas: use absolute_import
r28379 from mercurial import (
error,
extensions,
hg,
Pulkit Goyal
py3: replace os.name with pycompat.osname (part 2 of 2)
r30640 pycompat,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
timeless
schemas: use absolute_import
r28379 templater,
util,
)
Alexander Solovyov
schemes extension
r9964
Jason R. Coombs
schemes: add debugexpandscheme command, resolving a scheme to canonical form
r27982 cmdtable = {}
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 command = registrar.command(cmdtable)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Augie Fackler
extensions: document that `testedwith = 'internal'` is special...
r25186 # 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.
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 testedwith = 'ships-with-hg-core'
Augie Fackler
hgext: mark all first-party extensions as such
r16743
Yuya Nishihara
schemes: use br'' literal to define bytes regexp
r31288 _partre = re.compile(br'\{(\d+)\}')
Alexander Solovyov
schemes extension
r9964
class ShortRepository(object):
def __init__(self, url, scheme, templater):
self.scheme = scheme
self.templater = templater
self.url = url
try:
Augie Fackler
schemes: move re construction to module-level and python3-ify...
r31181 self.parts = max(map(int, _partre.findall(self.url)))
Alexander Solovyov
schemes extension
r9964 except ValueError:
self.parts = 0
def __repr__(self):
return '<ShortRepository: %s>' % self.scheme
Gregory Szorc
hg: allow extra arguments to be passed to repo creation (API)...
r39585 def instance(self, ui, url, create, intents=None, createopts=None):
Jason R. Coombs
schemes: extract scheme expansion as its own method on ShortRepository
r27981 url = self.resolve(url)
Gregory Szorc
hg: allow extra arguments to be passed to repo creation (API)...
r39585 return hg._peerlookup(url).instance(ui, url, create, intents=intents,
createopts=createopts)
Jason R. Coombs
schemes: extract scheme expansion as its own method on ShortRepository
r27981
def resolve(self, url):
Mads Kiilerich
fix wording and not-completely-trivial spelling errors and bad docstrings
r17425 # Should this use the util.url class, or is manual parsing better?
Mads Kiilerich
scheme: don't crash on invalid URLs
r18910 try:
url = url.split('://', 1)[1]
except IndexError:
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("no '://' in scheme url '%s'") % url)
Alexander Solovyov
schemes extension
r9964 parts = url.split('/', self.parts)
if len(parts) > self.parts:
tail = parts[-1]
parts = parts[:-1]
else:
tail = ''
Pulkit Goyal
py3: use b"%d" to covert integer to bytes instead of str...
r36686 context = dict(('%d' % (i + 1), v) for i, v in enumerate(parts))
Jason R. Coombs
schemes: extract scheme expansion as its own method on ShortRepository
r27981 return ''.join(self.templater.process(self.url, context)) + tail
Alexander Solovyov
schemes extension
r9964
Matt Mackall
url: nuke some newly-introduced underbars in identifiers
r13827 def hasdriveletter(orig, path):
Patrick Mezard
util: fix url.__str__() for windows file URLs...
r15609 if path:
for scheme in schemes:
if path.startswith(scheme + ':'):
return False
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 return orig(path)
Alexander Solovyov
schemes extension
r9964 schemes = {
'py': 'http://hg.python.org/',
'bb': 'https://bitbucket.org/',
'bb+ssh': 'ssh://hg@bitbucket.org/',
Benjamin Pollack
schemes: add Kiln On Demand to default schemes
r10777 'gcode': 'https://{1}.googlecode.com/hg/',
'kiln': 'https://{1}.kilnhg.com/Repo/'
Alexander Solovyov
schemes extension
r9964 }
def extsetup(ui):
schemes.update(dict(ui.configitems('schemes')))
Yuya Nishihara
templater: parse template string to tree by templater class...
r38373 t = templater.engine(templater.parse)
Alexander Solovyov
schemes extension
r9964 for scheme, url in schemes.items():
Jun Wu
codemod: use pycompat.iswindows...
r34646 if (pycompat.iswindows and len(scheme) == 1 and scheme.isalpha()
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 and os.path.exists('%s:\\' % scheme)):
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_('custom scheme %s:// conflicts with drive '
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822 'letter %s:\\\n') % (scheme, scheme.upper()))
Matt Mackall
hg: move peerschemes back to schemes...
r14606 hg.schemes[scheme] = ShortRepository(url, scheme, t)
Brodie Rao
schemes: prevent one letter schemes from being interpreted as drive letters...
r13822
Brodie Rao
url: move URL parsing functions into util to improve startup time...
r14076 extensions.wrapfunction(util, 'hasdriveletter', hasdriveletter)
Jason R. Coombs
schemes: add debugexpandscheme command, resolving a scheme to canonical form
r27982
@command('debugexpandscheme', norepo=True)
def expandscheme(ui, url, **opts):
"""given a repo path, provide the scheme-expanded path
"""
repo = hg._peerlookup(url)
if isinstance(repo, ShortRepository):
url = repo.resolve(url)
ui.write(url + '\n')