##// END OF EJS Templates
merge: fix race that could cause wrong size in dirstate...
merge: fix race that could cause wrong size in dirstate The problem is that hg merge/update/etc work the following way: 1. figure out what files to update 2. apply the update to disk 3. apply the update to in-memory dirstate 4. write dirstate where step3 looks at the filesystem and assumes it sees the result of step2. If a file is changed between step2 and step3, step3 will record incorrect information in the dirstate. I avoid this by passing the size step3 needs directly from step2, for the common path (not implemented for change/delete conflicts for instance). I didn't fix the same race for the exec bit for now, because it's less likely to be problematic and I had trouble due to the fact that the dirstate stores the permissions differently from the manifest (st_mode vs '' 'l' 'x'), in combination with tests that pretend that symlinks are not supported. However, I moved the lstat from step3 to step2, which should tighten the race window markedly, both for the exec bit and for the mtime. Differential Revision: https://phab.mercurial-scm.org/D6475

File last commit:

r39284:57d4754e default
r42649:773b0222 default
Show More
__init__.py
193 lines | 7.2 KiB | text/x-python | PythonLexer
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 # Copyright 2016-present Facebook. All Rights Reserved.
#
# fastannotate: faster annotate implementation using linelog
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
"""yet another annotate implementation that might be faster (EXPERIMENTAL)
The fastannotate extension provides a 'fastannotate' command that makes
use of the linelog data structure as a cache layer and is expected to
be faster than the vanilla 'annotate' if the cache is present.
In most cases, fastannotate requires a setup that mainbranch is some pointer
that always moves forward, to be most efficient.
Using fastannotate together with linkrevcache would speed up building the
annotate cache greatly. Run "debugbuildlinkrevcache" before
"debugbuildannotatecache".
::
[fastannotate]
# specify the main branch head. the internal linelog will only contain
# the linear (ignoring p2) "mainbranch". since linelog cannot move
# backwards without a rebuild, this should be something that always moves
# forward, usually it is "master" or "@".
mainbranch = master
# fastannotate supports different modes to expose its feature.
# a list of combination:
# - fastannotate: expose the feature via the "fastannotate" command which
# deals with everything in a most efficient way, and provides extra
# features like --deleted etc.
# - fctx: replace fctx.annotate implementation. note:
# a. it is less efficient than the "fastannotate" command
# b. it will make it practically impossible to access the old (disk
# side-effect free) annotate implementation
# c. it implies "hgweb".
# - hgweb: replace hgweb's annotate implementation. conflict with "fctx".
# (default: fastannotate)
modes = fastannotate
# default format when no format flags are used (default: number)
defaultformat = changeset, user, date
# serve the annotate cache via wire protocol (default: False)
# tip: the .hg/fastannotate directory is portable - can be rsynced
server = True
# build annotate cache on demand for every client request (default: True)
# disabling it could make server response faster, useful when there is a
# cronjob building the cache.
serverbuildondemand = True
# update local annotate cache from remote on demand
Augie Fackler
fastannotate: rip out specialized support for remotefilelog...
r39246 client = False
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243
# path to use when connecting to the remote server (default: default)
remotepath = default
# minimal length of the history of a file required to fetch linelog from
# the server. (default: 10)
clientfetchthreshold = 10
# use flock instead of the file existence lock
# flock may not work well on some network filesystems, but they avoid
# creating and deleting files frequently, which is faster when updating
# the annotate cache in batch. if you have issues with this option, set it
# to False. (default: True if flock is supported, False otherwise)
useflock = True
# for "fctx" mode, always follow renames regardless of command line option.
# this is a BC with the original command but will reduced the space needed
# for annotate cache, and is useful for client-server setup since the
# server will only provide annotate cache with default options (i.e. with
# follow). do not affect "fastannotate" mode. (default: True)
forcefollow = True
# for "fctx" mode, always treat file as text files, to skip the "isbinary"
# check. this is consistent with the "fastannotate" command and could help
# to avoid a file fetch if remotefilelog is used. (default: True)
forcetext = True
# use unfiltered repo for better performance.
unfilteredrepo = True
# sacrifice correctness in some corner cases for performance. it does not
# affect the correctness of the annotate cache being built. the option
# is experimental and may disappear in the future (default: False)
perfhack = True
"""
Augie Fackler
fastannotate: record some TODO items from indygreg's review...
r39245 # TODO from import:
# * `branch` is probably the wrong term, throughout the code.
#
# * replace the fastannotate `modes` configuration with a collection
# of booleans.
#
# * Use the templater instead of bespoke formatting
#
# * rename the config knob for updating the local cache from a remote server
#
# * move `flock` based locking to a common area
#
# * revise wireprotocol for sharing annotate files
#
# * figure out a sensible default for `mainbranch` (with the caveat
# that we probably also want to figure out a better term than
# `branch`, see above)
#
# * format changes to the revmap file (maybe use length-encoding
# instead of null-terminated file paths at least?)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
Matt Harbison
fastannotate: make the default value for `fastannotate.useflock` dynamic...
r39284 configitems,
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 error as hgerror,
localrepo,
registrar,
)
from . import (
commands,
context,
protocol,
)
# 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 = 'ships-with-hg-core'
cmdtable = commands.cmdtable
configtable = {}
configitem = registrar.configitem(configtable)
configitem('fastannotate', 'modes', default=['fastannotate'])
configitem('fastannotate', 'server', default=False)
Matt Harbison
fastannotate: make the default value for `fastannotate.useflock` dynamic...
r39284 configitem('fastannotate', 'useflock', default=configitems.dynamicdefault)
Augie Fackler
fastannotate: rip out specialized support for remotefilelog...
r39246 configitem('fastannotate', 'client', default=False)
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 configitem('fastannotate', 'unfilteredrepo', default=True)
configitem('fastannotate', 'defaultformat', default=['number'])
configitem('fastannotate', 'perfhack', default=False)
configitem('fastannotate', 'mainbranch')
configitem('fastannotate', 'forcetext', default=True)
configitem('fastannotate', 'forcefollow', default=True)
configitem('fastannotate', 'clientfetchthreshold', default=10)
configitem('fastannotate', 'serverbuildondemand', default=True)
configitem('fastannotate', 'remotepath', default='default')
def _flockavailable():
try:
import fcntl
fcntl.flock
Matt Harbison
py3: replace a StandardError reference...
r39918 except (AttributeError, ImportError):
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 return False
else:
return True
def uisetup(ui):
modes = set(ui.configlist('fastannotate', 'modes'))
if 'fctx' in modes:
modes.discard('hgweb')
for name in modes:
if name == 'fastannotate':
commands.registercommand()
elif name == 'hgweb':
from . import support
support.replacehgwebannotate()
elif name == 'fctx':
from . import support
support.replacefctxannotate()
commands.wrapdefault()
else:
raise hgerror.Abort(_('fastannotate: invalid mode: %s') % name)
if ui.configbool('fastannotate', 'server'):
protocol.serveruisetup(ui)
if ui.configbool('fastannotate', 'useflock', _flockavailable()):
context.pathhelper.lock = context.pathhelper._lockflock
Augie Fackler
fastannotate: move some global state mutation to extsetup()...
r39247 def extsetup(ui):
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 # fastannotate has its own locking, without depending on repo lock
Augie Fackler
fastannotate: move some global state mutation to extsetup()...
r39247 # TODO: avoid mutating this unless the specific repo has it enabled
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 localrepo.localrepository._wlockfreeprefix.add('fastannotate/')
def reposetup(ui, repo):
Augie Fackler
fastannotate: rip out specialized support for remotefilelog...
r39246 if ui.configbool('fastannotate', 'client'):
Augie Fackler
fastannotate: initial import from Facebook's hg-experimental...
r39243 protocol.clientreposetup(ui, repo)