##// 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:

r40329:c303d65d default
r40847:e13ab4ac default
Show More
share.py
181 lines | 6.3 KiB | text/x-python | PythonLexer
Matt Mackall
share: add experimental share extension
r8801 # Copyright 2006, 2007 Matt Mackall <mpm@selenic.com>
#
# 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.
Matt Mackall
share: add experimental share extension
r8801
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 '''share a common history between several working directories
Automatic Pooled Storage for Clones
-----------------------------------
When this extension is active, :hg:`clone` can be configured to
automatically share/pool storage across multiple clones. This
mode effectively converts :hg:`clone` to :hg:`clone` + :hg:`share`.
The benefit of using this mode is the automatic management of
store paths and intelligent pooling of related repositories.
The following ``share.`` config options influence this feature:
Matt Mackall
share: make option docs more check-config friendly
r25851 ``share.pool``
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 Filesystem path where shared repository data will be stored. When
defined, :hg:`clone` will automatically use shared repository
storage instead of creating a store inside each clone.
Matt Mackall
share: make option docs more check-config friendly
r25851 ``share.poolnaming``
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 How directory names in ``share.pool`` are constructed.
"identity" means the name is derived from the first changeset in the
repository. In this mode, different remotes share storage if their
root/initial changeset is identical. In this mode, the local shared
repository is an aggregate of all encountered remote repositories.
"remote" means the name is derived from the source repository's
path or URL. In this mode, storage is only shared if the path or URL
requested in the :hg:`clone` command matches exactly to a repository
that was cloned before.
Matt Harbison
help: minor copy editing for grammar
r34950 The default naming mode is "identity".
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 '''
Dirkjan Ochtman
help: add/fix docstrings for a bunch of extensions
r8873
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 from __future__ import absolute_import
import errno
Matt Mackall
share: add experimental share extension
r8801 from mercurial.i18n import _
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 from mercurial import (
bookmarks,
commands,
error,
extensions,
hg,
Yuya Nishihara
registrar: move cmdutil.command to registrar module (API)...
r32337 registrar,
FUJIWARA Katsunori
bookmarks: check HG_PENDING strictly...
r31052 txnutil,
Pulkit Goyal
py3: make files use absolute_import and print_function...
r29485 util,
)
Gregory Szorc
share: declare commands using decorator
r21253 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
Gregory Szorc
share: declare commands using decorator
r21253 @command('share',
Yuya Nishihara
commands: replace "working copy" with "working directory" in help/messages...
r24364 [('U', 'noupdate', None, _('do not create a working directory')),
Dan Villiom Podlaski Christiansen
share: add --relative flag to store a relative path to the source...
r31133 ('B', 'bookmarks', None, _('also share bookmarks')),
('', 'relative', None, _('point to source using a relative path '
'(EXPERIMENTAL)')),
],
Ryan McElroy
share: add option to share bookmarks...
r23614 _('[-U] [-B] SOURCE [DEST]'),
rdamazio@google.com
help: assigning categories to existing commands...
r40329 helpcategory=command.CATEGORY_REPO_CREATION,
Gregory Szorc
share: define norepo in command decorator
r21772 norepo=True)
Dan Villiom Podlaski Christiansen
share: add --relative flag to store a relative path to the source...
r31133 def share(ui, source, dest=None, noupdate=False, bookmarks=False,
relative=False):
Martin Geisler
share: drop experimental label...
r10798 """create a new shared repository
Matt Mackall
share: add experimental share extension
r8801
Martin Geisler
share: wrap docstrings at 70 characters
r9273 Initialize a new repository and working directory that shares its
Ryan McElroy
share: add option to share bookmarks...
r23614 history (and optionally bookmarks) with another repository.
Matt Mackall
share: add experimental share extension
r8801
Erik Zielke
Use note admonition
r12389 .. note::
Simon Heimberg
documentation: add an extra newline after note directive...
r19997
Erik Zielke
Use note admonition
r12389 using rollback or extensions that destroy/modify history (mq,
rebase, etc.) can cause considerable confusion with shared
clones. In particular, if two shared clones are both updated to
the same changeset, and one of them destroys that changeset
with rollback, the other clone will suddenly stop working: all
operations will fail with "abort: working directory has unknown
parent". The only known workaround is to use debugsetparents on
Matt Mackall
share: remove reference to tip
r19399 the broken clone to reset it to a changeset that still exists.
Matt Mackall
share: add experimental share extension
r8801 """
Matt Harbison
subrepo: share instead of clone if the parent repo is shared (issue5675) (BC)...
r34816 hg.share(ui, source, dest=dest, update=not noupdate,
bookmarks=bookmarks, relative=relative)
return 0
Matt Mackall
share: add experimental share extension
r8801
rdamazio@google.com
help: assigning categories to existing commands...
r40329 @command('unshare', [], '', helpcategory=command.CATEGORY_MAINTENANCE)
Simon Heimberg
hgext: introduce unshare command
r15079 def unshare(ui, repo):
"""convert a shared repository to a normal one
Copy the store data to the repo and remove the sharedpath data.
"""
Angel Ezquerra
localrepo: introduce shared method to check if a repository is shared...
r23666 if not repo.shared():
Pierre-Yves David
error: get Abort from 'error' instead of 'util'...
r26587 raise error.Abort(_("this is not a shared repo"))
Simon Heimberg
hgext: introduce unshare command
r15079
Matt Harbison
share: move the implementation of 'unshare' to the 'hg' module...
r34879 hg.unshare(ui, repo)
Ryan McElroy
share: implement shared bookmark functionality...
r23548
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 # Wrap clone command to pass auto share options.
def clone(orig, ui, source, *args, **opts):
Boris Feld
configitems: register the 'share.pool' config
r34498 pool = ui.config('share', 'pool')
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 if pool:
pool = util.expandpath(pool)
Yuya Nishihara
share: use dict literal instead of dict(key=value)...
r33021 opts[r'shareopts'] = {
'pool': pool,
Boris Feld
configitems: register the 'share.poolnaming' config
r34499 'mode': ui.config('share', 'poolnaming'),
Yuya Nishihara
share: use dict literal instead of dict(key=value)...
r33021 }
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761
return orig(ui, source, *args, **opts)
Ryan McElroy
share: implement shared bookmark functionality...
r23548 def extsetup(ui):
Augie Fackler
bookmarks: hoist getbkfile out of bmstore class...
r27186 extensions.wrapfunction(bookmarks, '_getbkfile', getbkfile)
Boris Feld
bookmark: deprecate 'recordchange' in favor of 'applychanges'...
r33515 extensions.wrapfunction(bookmarks.bmstore, '_recordchange', recordchange)
FUJIWARA Katsunori
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...
r26933 extensions.wrapfunction(bookmarks.bmstore, '_writerepo', writerepo)
Gregory Szorc
hg: support for auto sharing stores when cloning...
r25761 extensions.wrapcommand(commands.table, 'clone', clone)
Ryan McElroy
share: implement shared bookmark functionality...
r23548
def _hassharedbookmarks(repo):
"""Returns whether this repo has shared bookmarks"""
try:
Angel Ezquerra
share: replace the bookmarks.shared file with an entry on a new "shared" file...
r23883 shared = repo.vfs.read('shared').splitlines()
Gregory Szorc
global: mass rewrite to use modern exception syntax...
r25660 except IOError as inst:
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if inst.errno != errno.ENOENT:
raise
return False
Martijn Pieters
share: move magic string to a constant
r29424 return hg.sharedbookmarks in shared
Ryan McElroy
share: implement shared bookmark functionality...
r23548
Augie Fackler
bookmarks: hoist getbkfile out of bmstore class...
r27186 def getbkfile(orig, repo):
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if _hassharedbookmarks(repo):
Gregory Szorc
hg: move share._getsrcrepo into core...
r36177 srcrepo = hg.sharedreposource(repo)
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if srcrepo is not None:
FUJIWARA Katsunori
bookmarks: check HG_PENDING strictly...
r31052 # just orig(srcrepo) doesn't work as expected, because
# HG_PENDING refers repo.root.
try:
fp, pending = txnutil.trypending(repo.root, repo.vfs,
'bookmarks')
if pending:
# only in this case, bookmark information in repo
# is up-to-date.
return fp
fp.close()
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
# otherwise, we should read bookmarks from srcrepo,
# because .hg/bookmarks in srcrepo might be already
# changed via another sharing repo
Ryan McElroy
share: implement shared bookmark functionality...
r23548 repo = srcrepo
FUJIWARA Katsunori
bookmarks: check HG_PENDING strictly...
r31052
# TODO: Pending changes in repo are still invisible in
# srcrepo, because bookmarks.pending is written only into repo.
# See also https://www.mercurial-scm.org/wiki/SharedRepository
Augie Fackler
bookmarks: hoist getbkfile out of bmstore class...
r27186 return orig(repo)
Ryan McElroy
share: implement shared bookmark functionality...
r23548
def recordchange(orig, self, tr):
# Continue with write to local bookmarks file as usual
orig(self, tr)
if _hassharedbookmarks(self._repo):
Gregory Szorc
hg: move share._getsrcrepo into core...
r36177 srcrepo = hg.sharedreposource(self._repo)
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if srcrepo is not None:
category = 'share-bookmarks'
tr.addpostclose(category, lambda tr: self._writerepo(srcrepo))
FUJIWARA Katsunori
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...
r26933 def writerepo(orig, self, repo):
Ryan McElroy
share: implement shared bookmark functionality...
r23548 # First write local bookmarks file in case we ever unshare
FUJIWARA Katsunori
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...
r26933 orig(self, repo)
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if _hassharedbookmarks(self._repo):
Gregory Szorc
hg: move share._getsrcrepo into core...
r36177 srcrepo = hg.sharedreposource(self._repo)
Ryan McElroy
share: implement shared bookmark functionality...
r23548 if srcrepo is not None:
FUJIWARA Katsunori
share: wrap bmstore._writerepo for transaction sensitivity (issue4940)...
r26933 orig(self, srcrepo)