##// END OF EJS Templates
merge: use merge.clean_update() when applicable...
merge: use merge.clean_update() when applicable We have had this higher-level function (higher than `merge.update()`, that is) for a while. Let's simply some callers by using it. I don't know why I didn't do this when I introduced the function. After this patch, there are no remaining callers that call `hg.updaterepo()` with `overwrite=True`. We'll clean that up soon. Differential Revision: https://phab.mercurial-scm.org/D9063

File last commit:

r46034:c1d6e930 default
r46133:03726f5b default
Show More
__init__.py
986 lines | 31.8 KiB | text/x-python | PythonLexer
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # __init__.py - fsmonitor initialization and overrides
#
# Copyright 2013-2016 Facebook, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
'''Faster status operations with the Watchman file monitor (EXPERIMENTAL)
Integrates the file-watching program Watchman with Mercurial to produce faster
status results.
On a particular Linux system, for a real-world repository with over 400,000
files hosted on ext4, vanilla `hg status` takes 1.3 seconds. On the same
system, with fsmonitor it takes about 0.3 seconds.
fsmonitor requires no configuration -- it will tell Watchman about your
repository as necessary. You'll need to install Watchman from
https://facebook.github.io/watchman/ and make sure it is in your PATH.
Gregory Szorc
fsmonitor: warn when fsmonitor could be used...
r34886 fsmonitor is incompatible with the largefiles and eol extensions, and
will disable itself if any of those are active.
Martijn Pieters
fsmonitor: new experimental extension...
r28433 The following configuration options exist:
::
[fsmonitor]
mode = {off, on, paranoid}
When `mode = off`, fsmonitor will disable itself (similar to not loading the
extension at all). When `mode = on`, fsmonitor will be enabled (the default).
When `mode = paranoid`, fsmonitor will query both Watchman and the filesystem,
and ensure that the results are consistent.
::
[fsmonitor]
timeout = (float)
A value, in seconds, that determines how long fsmonitor will wait for Watchman
to return results. Defaults to `2.0`.
::
[fsmonitor]
blacklistusers = (list of userids)
A list of usernames for which fsmonitor will disable itself altogether.
::
[fsmonitor]
walk_on_invalidate = (boolean)
Whether or not to walk the whole repo ourselves when our cached state has been
invalidated, for example when Watchman has been restarted or .hgignore rules
have been changed. Walking the repo in that case can result in competing for
I/O with Watchman. For large repos it is recommended to set this value to
false. You may wish to set this to true if you have a very fast filesystem
that can outpace the IPC overhead of getting the result data for the full repo
from Watchman. Defaults to false.
Gregory Szorc
fsmonitor: warn when fsmonitor could be used...
r34886 ::
[fsmonitor]
warn_when_unused = (boolean)
Whether to print a warning during certain operations when fsmonitor would be
beneficial to performance but isn't enabled.
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Gregory Szorc
fsmonitor: warn when fsmonitor could be used...
r34886 ::
[fsmonitor]
warn_update_file_count = (integer)
Valentin Gatien-Baron
fsmonitor: increase the threshold before we recommend it, when using rust...
r46034 # or when mercurial is built with rust support
warn_update_file_count_rust = (integer)
Gregory Szorc
fsmonitor: warn when fsmonitor could be used...
r34886
If ``warn_when_unused`` is set and fsmonitor isn't enabled, a warning will
be printed during working directory updates if this many files will be
created.
Martijn Pieters
fsmonitor: new experimental extension...
r28433 '''
# Platforms Supported
# ===================
#
# **Linux:** *Stable*. Watchman and fsmonitor are both known to work reliably,
# even under severe loads.
#
# **Mac OS X:** *Stable*. The Mercurial test suite passes with fsmonitor
# turned on, on case-insensitive HFS+. There has been a reasonable amount of
# user testing under normal loads.
#
# **Solaris, BSD:** *Alpha*. watchman and fsmonitor are believed to work, but
# very little testing has been done.
#
# **Windows:** *Alpha*. Not in a release version of watchman or fsmonitor yet.
#
# Known Issues
# ============
#
# * fsmonitor will disable itself if any of the following extensions are
# enabled: largefiles, inotify, eol; or if the repository has subrepos.
# * fsmonitor will produce incorrect results if nested repos that are not
# subrepos exist. *Workaround*: add nested repo paths to your `.hgignore`.
#
# The issues related to nested repos and subrepos are probably not fundamental
# ones. Patches to fix them are welcome.
from __future__ import absolute_import
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 import codecs
Martijn Pieters
fsmonitor: new experimental extension...
r28433 import os
import stat
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 import sys
Augie Fackler
fsmonitor: add support for extra `hg debuginstall` data...
r42879 import tempfile
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 import weakref
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Yuya Nishihara
py3: move up symbol imports to enforce import-checker rules...
r29205 from mercurial.i18n import _
Augie Fackler
formatting: blacken the codebase...
r43346 from mercurial.node import hex
Gregory Szorc
py3: manually import pycompat.open into files that need it...
r43355 from mercurial.pycompat import open
Martijn Pieters
fsmonitor: new experimental extension...
r28433 from mercurial import (
context,
Pulkit Goyal
py3: use python 3 compatible variables in hgext/fsmontor/__init__.py...
r30666 encoding,
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 error,
Martijn Pieters
fsmonitor: new experimental extension...
r28433 extensions,
localrepo,
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 merge,
Martijn Pieters
fsmonitor: new experimental extension...
r28433 pathutil,
Pulkit Goyal
py3: use python 3 compatible variables in hgext/fsmontor/__init__.py...
r30666 pycompat,
Gregory Szorc
fsmonitor: use configitem...
r34464 registrar,
Martijn Pieters
fsmonitor: new experimental extension...
r28433 scmutil,
util,
)
from mercurial import match as matchmod
Augie Fackler
hgext: replace references to hashlib.sha1 with hashutil.sha1...
r44519 from mercurial.utils import (
hashutil,
stringutil,
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
from . import (
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 pywatchman,
Martijn Pieters
fsmonitor: new experimental extension...
r28433 state,
watchmanclient,
)
Augie Fackler
extensions: change magic "shipped with hg" string...
r29841 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # 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
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 testedwith = b'ships-with-hg-core'
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Gregory Szorc
fsmonitor: use configitem...
r34464 configtable = {}
configitem = registrar.configitem(configtable)
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fsmonitor', b'mode', default=b'on',
Gregory Szorc
fsmonitor: use configitem...
r34464 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fsmonitor', b'walk_on_invalidate', default=False,
Gregory Szorc
fsmonitor: use configitem...
r34464 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fsmonitor', b'timeout', default=b'2',
Gregory Szorc
fsmonitor: use configitem...
r34464 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fsmonitor', b'blacklistusers', default=list,
Gregory Szorc
fsmonitor: use configitem...
r34464 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fsmonitor', b'watchman_exe', default=b'watchman',
Boris Feld
watchman: add the possibility to set the exact watchman binary location...
r42134 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fsmonitor', b'verbose', default=True, experimental=True,
Boris Feld
watchman: add verbose config knob...
r41629 )
Augie Fackler
formatting: blacken the codebase...
r43346 configitem(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'experimental', b'fsmonitor.transaction_notify', default=False,
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 )
Gregory Szorc
fsmonitor: use configitem...
r34464
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # This extension is incompatible with the following blacklisted extensions
# and will disable itself when encountering one of these:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 _blacklist = [b'largefiles', b'eol']
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Augie Fackler
formatting: blacken the codebase...
r43346
Augie Fackler
fsmonitor: add support for extra `hg debuginstall` data...
r42879 def debuginstall(ui, fm):
Augie Fackler
formatting: blacken the codebase...
r43346 fm.write(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"fsmonitor-watchman",
_(b"fsmonitor checking for watchman binary... (%s)\n"),
ui.configpath(b"fsmonitor", b"watchman_exe"),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
fsmonitor: add support for extra `hg debuginstall` data...
r42879 root = tempfile.mkdtemp()
c = watchmanclient.client(ui, root)
err = None
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 v = c.command(b"version")
Augie Fackler
formatting: blacken the codebase...
r43346 fm.write(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"fsmonitor-watchman-version",
_(b" watchman binary version %s\n"),
Gregory Szorc
fsmonitor: fix str/bytes mismatch when accessing watchman version...
r43707 pycompat.bytestr(v["version"]),
Augie Fackler
formatting: blacken the codebase...
r43346 )
Augie Fackler
fsmonitor: add support for extra `hg debuginstall` data...
r42879 except watchmanclient.Unavailable as e:
Ian Moody
fsmonitor: use stringutil.forcebytestr() instead of str() on an exception...
r43721 err = stringutil.forcebytestr(e)
Augie Fackler
formatting: blacken the codebase...
r43346 fm.condwrite(
err,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"fsmonitor-watchman-error",
_(b" watchman binary missing or broken: %s\n"),
Augie Fackler
formatting: blacken the codebase...
r43346 err,
)
Augie Fackler
fsmonitor: add support for extra `hg debuginstall` data...
r42879 return 1 if err else 0
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def _handleunavailable(ui, state, ex):
"""Exception handler for Watchman interaction exceptions"""
if isinstance(ex, watchmanclient.Unavailable):
Boris Feld
fsmonitor: rename new verbose config knob...
r41758 # experimental config: fsmonitor.verbose
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ex.warn and ui.configbool(b'fsmonitor', b'verbose'):
Emmanuel Leblond
py3: fix fsmonitor's _handleunavailable exception message encoding...
r43679 if b'illegal_fstypes' not in stringutil.forcebytestr(ex):
ui.warn(stringutil.forcebytestr(ex) + b'\n')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if ex.invalidate:
state.invalidate()
Boris Feld
fsmonitor: rename new verbose config knob...
r41758 # experimental config: fsmonitor.verbose
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if ui.configbool(b'fsmonitor', b'verbose'):
Gregory Szorc
fsmonitor: coerce watchman exception to bytes...
r43708 ui.log(
b'fsmonitor',
b'Watchman unavailable: %s\n',
stringutil.forcebytestr(ex.msg),
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 else:
Gregory Szorc
fsmonitor: coerce watchman exception to bytes...
r43708 ui.log(
b'fsmonitor',
b'Watchman exception: %s\n',
stringutil.forcebytestr(ex),
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def _hashignore(ignore):
"""Calculate hash for ignore patterns and filenames
If this information changes between Mercurial invocations, we can't
rely on Watchman information anymore and have to re-scan the working
copy.
"""
Augie Fackler
hgext: replace references to hashlib.sha1 with hashutil.sha1...
r44519 sha1 = hashutil.sha1()
Gregory Szorc
fsmonitor: make _hashignore compatible with Python 3...
r43711 sha1.update(pycompat.byterepr(ignore))
return pycompat.sysbytes(sha1.hexdigest())
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Augie Fackler
formatting: blacken the codebase...
r43346
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 _watchmanencoding = pywatchman.encoding.get_local_encoding()
_fsencoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
_fixencoding = codecs.lookup(_watchmanencoding) != codecs.lookup(_fsencoding)
Augie Fackler
formatting: blacken the codebase...
r43346
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 def _watchmantofsencoding(path):
"""Fix path to match watchman and local filesystem encoding
watchman's paths encoding can differ from filesystem encoding. For example,
on Windows, it's always utf-8.
"""
try:
decoded = path.decode(_watchmanencoding)
except UnicodeDecodeError as e:
Emmanuel Leblond
py3: fix fsmonitor's _watchmantofsencoding exception message encoding...
r43691 raise error.Abort(
stringutil.forcebytestr(e), hint=b'watchman encoding error'
)
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846
try:
encoded = decoded.encode(_fsencoding, 'strict')
except UnicodeEncodeError as e:
Emmanuel Leblond
py3: fix fsmonitor's _watchmantofsencoding exception message encoding...
r43691 raise error.Abort(stringutil.forcebytestr(e))
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846
return encoded
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True):
'''Replacement for dirstate.walk, hooking into Watchman.
Whenever full is False, ignored is False, and the Watchman client is
available, use Watchman combined with saved state to possibly return only a
subset of files.'''
Augie Fackler
formatting: blacken the codebase...
r43346
Boris Feld
fsmonitor: issue debug messages when we fall back to core status...
r35146 def bail(reason):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._ui.debug(b'fsmonitor: fallback to core status, %s\n' % reason)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return orig(match, subrepos, unknown, ignored, full=True)
Boris Feld
fsmonitor: issue debug messages when we fall back to core status...
r35146 if full:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'full rewalk requested')
Boris Feld
fsmonitor: issue debug messages when we fall back to core status...
r35146 if ignored:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'listing ignored files')
Boris Feld
fsmonitor: issue debug messages when we fall back to core status...
r35146 if not self._watchmanclient.available():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'client unavailable')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 state = self._fsmonitorstate
clock, ignorehash, notefiles = state.get()
if not clock:
if state.walk_on_invalidate:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'no clock')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # Initial NULL clock value, see
# https://facebook.github.io/watchman/docs/clockspec.html
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 clock = b'c:0:0'
Martijn Pieters
fsmonitor: new experimental extension...
r28433 notefiles = []
ignore = self._ignore
dirignore = self._dirignore
if unknown:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if _hashignore(ignore) != ignorehash and clock != b'c:0:0':
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # ignore list changed -- can't rely on Watchman state any more
if state.walk_on_invalidate:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'ignore rules changed')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 notefiles = []
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 clock = b'c:0:0'
Martijn Pieters
fsmonitor: new experimental extension...
r28433 else:
# always ignore
ignore = util.always
dirignore = util.always
matchfn = match.matchfn
matchalways = match.always()
Mark Thomas
fsmonitor: only access inner dirstate map if it is available...
r35084 dmap = self._map
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if util.safehasattr(dmap, b'_map'):
Mark Thomas
fsmonitor: only access inner dirstate map if it is available...
r35084 # for better performance, directly access the inner dirstate map if the
# standard dirstate implementation is in use.
dmap = dmap._map
Jun Wu
fsmonitor: use nonnormalset from dirstatemap...
r34898 nonnormalset = self._map.nonnormalset
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Gregory Szorc
fsmonitor: access copymap in new location...
r34463 copymap = self._map.copymap
Martijn Pieters
fsmonitor: new experimental extension...
r28433 getkind = stat.S_IFMT
dirkind = stat.S_IFDIR
regkind = stat.S_IFREG
lnkkind = stat.S_IFLNK
join = self._join
normcase = util.normcase
fresh_instance = False
exact = skipstep3 = False
Martin von Zweigbergk
fsmonitor: use modern match API...
r32322 if match.isexact(): # match.exact
Martijn Pieters
fsmonitor: new experimental extension...
r28433 exact = True
dirignore = util.always # skip step 2
Martin von Zweigbergk
fsmonitor: use modern match API...
r32322 elif match.prefix(): # match.match, no patterns
Martijn Pieters
fsmonitor: new experimental extension...
r28433 skipstep3 = True
if not exact and self._checkcase:
# note that even though we could receive directory entries, we're only
# interested in checking if a file with the same name exists. So only
# normalize files if possible.
normalize = self._normalizefile
skipstep3 = False
else:
normalize = None
# step 1: find all explicit files
results, work, dirsnotfound = self._walkexplicit(match, subrepos)
skipstep3 = skipstep3 and not (work or dirsnotfound)
work = [d for d in work if not dirignore(d[0])]
if not work and (exact or skipstep3):
for s in subrepos:
del results[s]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 del results[b'.hg']
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return results
# step 2: query Watchman
try:
# Use the user-configured timeout for the query.
# Add a little slack over the top of the user query to allow for
# overheads while transferring the data
self._watchmanclient.settimeout(state.timeout + 0.1)
Augie Fackler
formatting: blacken the codebase...
r43346 result = self._watchmanclient.command(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'query',
Augie Fackler
formatting: blacken the codebase...
r43346 {
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'fields': [b'mode', b'mtime', b'size', b'exists', b'name'],
b'since': clock,
b'expression': [
b'not',
[
b'anyof',
[b'dirname', b'.hg'],
[b'name', b'.hg', b'wholename'],
],
Augie Fackler
formatting: blacken the codebase...
r43346 ],
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'sync_timeout': int(state.timeout * 1000),
b'empty_on_fresh_instance': state.walk_on_invalidate,
Augie Fackler
formatting: blacken the codebase...
r43346 },
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 except Exception as ex:
_handleunavailable(self._ui, state, ex)
self._watchmanclient.clearconnection()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'exception during run')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 else:
# We need to propagate the last observed clock up so that we
# can use it for our next query
Gregory Szorc
fsmonitor: normalize clock value to bytes...
r43715 state.setlastclock(pycompat.sysbytes(result[b'clock']))
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if result[b'is_fresh_instance']:
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if state.walk_on_invalidate:
state.invalidate()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 return bail(b'fresh instance')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 fresh_instance = True
# Ignore any prior noteable files from the state info
notefiles = []
# for file paths which require normalization and we encounter a case
# collision, we store our own foldmap
if normalize:
Augie Fackler
cleanup: run pyupgrade on our source tree to clean up varying things...
r44937 foldmap = {normcase(k): k for k in results}
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 switch_slashes = pycompat.ossep == b'\\'
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # The order of the results is, strictly speaking, undefined.
# For case changes on a case insensitive filesystem we may receive
# two entries, one with exists=True and another with exists=False.
# The exists=True entries in the same response should be interpreted
# as being happens-after the exists=False entries due to the way that
# Watchman tracks files. We use this property to reconcile deletes
# for name case changes.
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 for entry in result[b'files']:
fname = entry[b'name']
Gregory Szorc
fsmonitor: normalize Watchman paths to bytes...
r43713
# Watchman always give us a str. Normalize to bytes on Python 3
# using Watchman's encoding, if needed.
if not isinstance(fname, bytes):
fname = fname.encode(_watchmanencoding)
Olivier Trempe
fsmonitor: match watchman and filesystem encoding...
r31846 if _fixencoding:
fname = _watchmantofsencoding(fname)
Gregory Szorc
fsmonitor: normalize Watchman paths to bytes...
r43713
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if switch_slashes:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fname = fname.replace(b'\\', b'/')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if normalize:
normed = normcase(fname)
fname = normalize(fname, True, True)
foldmap[normed] = fname
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fmode = entry[b'mode']
fexists = entry[b'exists']
Martijn Pieters
fsmonitor: new experimental extension...
r28433 kind = getkind(fmode)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'/.hg/' in fname or fname.endswith(b'/.hg'):
return bail(b'nested-repo-detected')
Boris Feld
watchman: detect nested mercurial repositories and abort...
r41630
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if not fexists:
# if marked as deleted and we don't already have a change
# record, mark it as deleted. If we already have an entry
# for fname then it was either part of walkexplicit or was
# an earlier result that was a case change
Augie Fackler
formatting: blacken the codebase...
r43346 if (
fname not in results
and fname in dmap
and (matchalways or matchfn(fname))
):
Martijn Pieters
fsmonitor: new experimental extension...
r28433 results[fname] = None
elif kind == dirkind:
if fname in dmap and (matchalways or matchfn(fname)):
results[fname] = None
elif kind == regkind or kind == lnkkind:
if fname in dmap:
if matchalways or matchfn(fname):
results[fname] = entry
elif (matchalways or matchfn(fname)) and not ignore(fname):
results[fname] = entry
elif fname in dmap and (matchalways or matchfn(fname)):
results[fname] = None
# step 3: query notable files we don't already know about
# XXX try not to iterate over the entire dmap
if normalize:
# any notable files that have changed case will already be handled
# above, so just check membership in the foldmap
Augie Fackler
cleanup: run pyupgrade on our source tree to clean up varying things...
r44937 notefiles = {
normalize(f, True, True)
Augie Fackler
formatting: blacken the codebase...
r43346 for f in notefiles
Augie Fackler
cleanup: run pyupgrade on our source tree to clean up varying things...
r44937 if normcase(f) not in foldmap
}
visit = {
f
for f in notefiles
if (f not in results and matchfn(f) and (f in dmap or not ignore(f)))
}
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Jun Wu
fsmonitor: use nonnormalset from dirstatemap...
r34898 if not fresh_instance:
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if matchalways:
visit.update(f for f in nonnormalset if f not in results)
visit.update(f for f in copymap if f not in results)
else:
Augie Fackler
formatting: blacken the codebase...
r43346 visit.update(
f for f in nonnormalset if f not in results and matchfn(f)
)
visit.update(f for f in copymap if f not in results and matchfn(f))
Martijn Pieters
fsmonitor: new experimental extension...
r28433 else:
if matchalways:
Gregory Szorc
py3: define and use pycompat.iteritems() for hgext/...
r43375 visit.update(
f for f, st in pycompat.iteritems(dmap) if f not in results
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 visit.update(f for f in copymap if f not in results)
else:
Augie Fackler
formatting: blacken the codebase...
r43346 visit.update(
f
Gregory Szorc
py3: define and use pycompat.iteritems() for hgext/...
r43375 for f, st in pycompat.iteritems(dmap)
Augie Fackler
formatting: blacken the codebase...
r43346 if f not in results and matchfn(f)
)
visit.update(f for f in copymap if f not in results and matchfn(f))
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Yuya Nishihara
pathauditor: disable cache of audited paths by default (issue5628)...
r33722 audit = pathutil.pathauditor(self._root, cached=True).check
Martijn Pieters
fsmonitor: new experimental extension...
r28433 auditpass = [f for f in visit if audit(f)]
auditpass.sort()
auditfail = visit.difference(auditpass)
for f in auditfail:
results[f] = None
Gregory Szorc
fsmonitor: use next() instead of .next()...
r43714 nf = iter(auditpass)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 for st in util.statfiles([join(f) for f in auditpass]):
Gregory Szorc
fsmonitor: use next() instead of .next()...
r43714 f = next(nf)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 if st or f in dmap:
results[f] = st
for s in subrepos:
del results[s]
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 del results[b'.hg']
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return results
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def overridestatus(
Augie Fackler
formatting: blacken the codebase...
r43346 orig,
self,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 node1=b'.',
Augie Fackler
formatting: blacken the codebase...
r43346 node2=None,
match=None,
ignored=False,
clean=False,
unknown=False,
listsubrepos=False,
):
Martijn Pieters
fsmonitor: new experimental extension...
r28433 listignored = ignored
listclean = clean
listunknown = unknown
def _cmpsets(l1, l2):
try:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if b'FSMONITOR_LOG_FILE' in encoding.environ:
fn = encoding.environ[b'FSMONITOR_LOG_FILE']
f = open(fn, b'wb')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 else:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 fn = b'fsmonitorfail.log'
f = self.vfs.open(fn, b'wb')
Martijn Pieters
fsmonitor: new experimental extension...
r28433 except (IOError, OSError):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.ui.warn(_(b'warning: unable to write to %s\n') % fn)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return
try:
for i, (s1, s2) in enumerate(zip(l1, l2)):
if set(s1) != set(s2):
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 f.write(b'sets at position %d are unequal\n' % i)
f.write(b'watchman returned: %s\n' % s1)
f.write(b'stat returned: %s\n' % s2)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 finally:
f.close()
if isinstance(node1, context.changectx):
ctx1 = node1
else:
ctx1 = self[node1]
if isinstance(node2, context.changectx):
ctx2 = node2
else:
ctx2 = self[node2]
working = ctx2.rev() is None
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 parentworking = working and ctx1 == self[b'.']
Martin von Zweigbergk
match: delete unused root and cwd arguments from {always,never,exact}() (API)...
r41825 match = match or matchmod.always()
Martijn Pieters
fsmonitor: new experimental extension...
r28433
# Maybe we can use this opportunity to update Watchman's state.
# Mercurial uses workingcommitctx and/or memctx to represent the part of
# the workingctx that is to be committed. So don't update the state in
# that case.
# HG_PENDING is set in the environment when the dirstate is being updated
# in the middle of a transaction; we must not update our state in that
# case, or we risk forgetting about changes in the working copy.
Augie Fackler
formatting: blacken the codebase...
r43346 updatestate = (
parentworking
and match.always()
and not isinstance(ctx2, (context.workingcommitctx, context.memctx))
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 and b'HG_PENDING' not in encoding.environ
Augie Fackler
formatting: blacken the codebase...
r43346 )
Martijn Pieters
fsmonitor: new experimental extension...
r28433
try:
if self._fsmonitorstate.walk_on_invalidate:
# Use a short timeout to query the current clock. If that
# takes too long then we assume that the service will be slow
# to answer our query.
# walk_on_invalidate indicates that we prefer to walk the
# tree ourselves because we can ignore portions that Watchman
# cannot and we tend to be faster in the warmer buffer cache
# cases.
self._watchmanclient.settimeout(0.1)
else:
# Give Watchman more time to potentially complete its walk
# and return the initial clock. In this mode we assume that
# the filesystem will be slower than parsing a potentially
# very large Watchman result set.
Augie Fackler
formatting: blacken the codebase...
r43346 self._watchmanclient.settimeout(self._fsmonitorstate.timeout + 0.1)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 startclock = self._watchmanclient.getcurrentclock()
except Exception as ex:
self._watchmanclient.clearconnection()
_handleunavailable(self.ui, self._fsmonitorstate, ex)
# boo, Watchman failed. bail
Augie Fackler
formatting: blacken the codebase...
r43346 return orig(
node1,
node2,
match,
listignored,
listclean,
listunknown,
listsubrepos,
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
if updatestate:
# We need info about unknown files. This may make things slower the
# first time, but whatever.
stateunknown = True
else:
stateunknown = listunknown
Siddharth Agarwal
fsmonitor: write state with wlock held and dirstate unchanged (issue5581)...
r32815 if updatestate:
ps = poststatus(startclock)
self.addpostdsstatus(ps)
Augie Fackler
formatting: blacken the codebase...
r43346 r = orig(
node1, node2, match, listignored, listclean, stateunknown, listsubrepos
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 modified, added, removed, deleted, unknown, ignored, clean = r
if not listunknown:
unknown = []
# don't do paranoid checks if we're not going to query Watchman anyway
full = listclean or match.traversedir is not None
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if self._fsmonitorstate.mode == b'paranoid' and not full:
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # run status again and fall back to the old walk this time
self.dirstate._fsmonitordisable = True
# shut the UI up
quiet = self.ui.quiet
self.ui.quiet = True
fout, ferr = self.ui.fout, self.ui.ferr
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.ui.fout = self.ui.ferr = open(os.devnull, b'wb')
Martijn Pieters
fsmonitor: new experimental extension...
r28433
try:
rv2 = orig(
Augie Fackler
formatting: blacken the codebase...
r43346 node1,
node2,
match,
listignored,
listclean,
listunknown,
listsubrepos,
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 finally:
self.dirstate._fsmonitordisable = False
self.ui.quiet = quiet
self.ui.fout, self.ui.ferr = fout, ferr
# clean isn't tested since it's set to True above
FUJIWARA Katsunori
fsmonitor: use vfs instead of opener (issue5938)...
r40245 with self.wlock():
_cmpsets(
[modified, added, removed, deleted, unknown, ignored, clean],
Augie Fackler
formatting: blacken the codebase...
r43346 rv2,
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 modified, added, removed, deleted, unknown, ignored, clean = rv2
return scmutil.status(
Augie Fackler
formatting: blacken the codebase...
r43346 modified, added, removed, deleted, unknown, ignored, clean
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Siddharth Agarwal
fsmonitor: write state with wlock held and dirstate unchanged (issue5581)...
r32815 class poststatus(object):
def __init__(self, startclock):
Connor Sheehan
fsmonitor: coerce `clock` variable to byte-string (issue6321)...
r45372 self._startclock = pycompat.sysbytes(startclock)
Siddharth Agarwal
fsmonitor: write state with wlock held and dirstate unchanged (issue5581)...
r32815
def __call__(self, wctx, status):
clock = wctx.repo()._fsmonitorstate.getlastclock() or self._startclock
hashignore = _hashignore(wctx.repo().dirstate._ignore)
Augie Fackler
formatting: blacken the codebase...
r43346 notefiles = (
status.modified
+ status.added
+ status.removed
+ status.deleted
+ status.unknown
)
Siddharth Agarwal
fsmonitor: write state with wlock held and dirstate unchanged (issue5581)...
r32815 wctx.repo()._fsmonitorstate.set(clock, hashignore, notefiles)
Augie Fackler
formatting: blacken the codebase...
r43346
FUJIWARA Katsunori
fsmonitor: centralize setup procedures for dirstate
r33386 def makedirstate(repo, dirstate):
class fsmonitordirstate(dirstate.__class__):
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 def _fsmonitorinit(self, repo):
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # _fsmonitordisable is used in paranoid mode
self._fsmonitordisable = False
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 self._fsmonitorstate = repo._fsmonitorstate
self._watchmanclient = repo._watchmanclient
self._repo = weakref.proxy(repo)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
def walk(self, *args, **kwargs):
orig = super(fsmonitordirstate, self).walk
if self._fsmonitordisable:
return orig(*args, **kwargs)
return overridewalk(orig, self, *args, **kwargs)
def rebuild(self, *args, **kwargs):
self._fsmonitorstate.invalidate()
return super(fsmonitordirstate, self).rebuild(*args, **kwargs)
def invalidate(self, *args, **kwargs):
self._fsmonitorstate.invalidate()
return super(fsmonitordirstate, self).invalidate(*args, **kwargs)
FUJIWARA Katsunori
fsmonitor: centralize setup procedures for dirstate
r33386 dirstate.__class__ = fsmonitordirstate
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 dirstate._fsmonitorinit(repo)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def wrapdirstate(orig, self):
ds = orig(self)
# only override the dirstate when Watchman is available for the repo
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if util.safehasattr(self, b'_fsmonitorstate'):
FUJIWARA Katsunori
fsmonitor: centralize setup procedures for dirstate
r33386 makedirstate(self, ds)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return ds
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def extsetup(ui):
Augie Fackler
extensions: move wrapfilecache function from fsmonitor...
r32722 extensions.wrapfilecache(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 localrepo.localrepository, b'dirstate', wrapdirstate
Augie Fackler
formatting: blacken the codebase...
r43346 )
Jun Wu
codemod: use pycompat.isdarwin...
r34648 if pycompat.isdarwin:
Martijn Pieters
fsmonitor: new experimental extension...
r28433 # An assist for avoiding the dangling-symlink fsevents bug
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(os, b'symlink', wrapsymlink)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 extensions.wrapfunction(merge, b'update', wrapupdate)
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def wrapsymlink(orig, source, link_name):
''' if we create a dangling symlink, also touch the parent dir
to encourage fsevents notifications to work more correctly '''
try:
return orig(source, link_name)
finally:
try:
os.utime(os.path.dirname(link_name), None)
except OSError:
pass
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 class state_update(object):
Mads Kiilerich
spelling: fixes of non-dictionary words
r30332 ''' This context manager is responsible for dispatching the state-enter
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 and state-leave signals to the watchman service. The enter and leave
methods can be invoked manually (for scenarios where context manager
semantics are not possible). If parameters oldnode and newnode are None,
they will be populated based on current working copy in enter and
leave, respectively. Similarly, if the distance is none, it will be
calculated based on the oldnode and newnode in the leave method.'''
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
Augie Fackler
formatting: blacken the codebase...
r43346 def __init__(
self,
repo,
name,
oldnode=None,
newnode=None,
distance=None,
partial=False,
):
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 self.repo = repo.unfiltered()
self.name = name
self.oldnode = oldnode
self.newnode = newnode
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 self.distance = distance
self.partial = partial
Wez Furlong
fsmonitor: acquire localrepo.wlock prior to emitting hg.update state...
r32334 self._lock = None
Wez Furlong
fsmonitor: don't attempt state-leave if we didn't state-enter...
r32335 self.need_leave = False
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
def __enter__(self):
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 self.enter()
def enter(self):
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 # Make sure we have a wlock prior to sending notifications to watchman.
# We don't want to race with other actors. In the update case,
# merge.update is going to take the wlock almost immediately. We are
# effectively extending the lock around several short sanity checks.
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 if self.oldnode is None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.oldnode = self.repo[b'.'].node()
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314
if self.repo.currentwlock() is None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if util.safehasattr(self.repo, b'wlocknostateupdate'):
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 self._lock = self.repo.wlocknostateupdate()
else:
self._lock = self.repo.wlock()
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.need_leave = self._state(b'state-enter', hex(self.oldnode))
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 return self
def __exit__(self, type_, value, tb):
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 abort = True if type_ else False
self.exit(abort=abort)
def exit(self, abort=False):
Wez Furlong
fsmonitor: acquire localrepo.wlock prior to emitting hg.update state...
r32334 try:
Wez Furlong
fsmonitor: don't attempt state-leave if we didn't state-enter...
r32335 if self.need_leave:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 status = b'failed' if abort else b'ok'
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 if self.newnode is None:
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.newnode = self.repo[b'.'].node()
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 if self.distance is None:
self.distance = calcdistance(
Augie Fackler
formatting: blacken the codebase...
r43346 self.repo, self.oldnode, self.newnode
)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self._state(b'state-leave', hex(self.newnode), status=status)
Wez Furlong
fsmonitor: acquire localrepo.wlock prior to emitting hg.update state...
r32334 finally:
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 self.need_leave = False
Wez Furlong
fsmonitor: acquire localrepo.wlock prior to emitting hg.update state...
r32334 if self._lock:
self._lock.release()
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 def _state(self, cmd, commithash, status=b'ok'):
if not util.safehasattr(self.repo, b'_watchmanclient'):
Wez Furlong
fsmonitor: don't attempt state-leave if we didn't state-enter...
r32335 return False
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 try:
Augie Fackler
formatting: blacken the codebase...
r43346 self.repo._watchmanclient.command(
cmd,
{
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'name': self.name,
b'metadata': {
Augie Fackler
formatting: blacken the codebase...
r43346 # the target revision
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'rev': commithash,
Augie Fackler
formatting: blacken the codebase...
r43346 # approximate number of commits between current and target
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'distance': self.distance if self.distance else 0,
Augie Fackler
formatting: blacken the codebase...
r43346 # success/failure (only really meaningful for state-leave)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'status': status,
Augie Fackler
formatting: blacken the codebase...
r43346 # whether the working copy parent is changing
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'partial': self.partial,
Augie Fackler
formatting: blacken the codebase...
r43346 },
},
)
Wez Furlong
fsmonitor: don't attempt state-leave if we didn't state-enter...
r32335 return True
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 except Exception as e:
# Swallow any errors; fire and forget
self.repo.ui.log(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'watchman', b'Exception %s while running %s\n', e, cmd
Augie Fackler
formatting: blacken the codebase...
r43346 )
Wez Furlong
fsmonitor: don't attempt state-leave if we didn't state-enter...
r32335 return False
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
Augie Fackler
formatting: blacken the codebase...
r43346
Eamonn Kent
fsmonitor: change the distance calculation...
r34565 # Estimate the distance between two nodes
def calcdistance(repo, oldnode, newnode):
anc = repo.changelog.ancestor(oldnode, newnode)
ancrev = repo[anc].rev()
Augie Fackler
formatting: blacken the codebase...
r43346 distance = abs(repo[oldnode].rev() - ancrev) + abs(
repo[newnode].rev() - ancrev
)
Eamonn Kent
fsmonitor: change the distance calculation...
r34565 return distance
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 # Bracket working copy updates with calls to the watchman state-enter
# and state-leave commands. This allows clients to perform more intelligent
# settling during bulk file change scenarios
# https://facebook.github.io/watchman/docs/cmd/subscribe.html#advanced-settling
Augie Fackler
formatting: blacken the codebase...
r43346 def wrapupdate(
orig,
repo,
node,
branchmerge,
force,
ancestor=None,
mergeancestor=False,
labels=None,
matcher=None,
**kwargs
):
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
distance = 0
partial = True
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 oldnode = repo[b'.'].node()
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 newnode = repo[node].node()
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 if matcher is None or matcher.always():
partial = False
Eamonn Kent
fsmonitor: add new watchman notifications to fsmonitor extension...
r34566 distance = calcdistance(repo.unfiltered(), oldnode, newnode)
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
Augie Fackler
formatting: blacken the codebase...
r43346 with state_update(
repo,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 name=b"hg.update",
Augie Fackler
formatting: blacken the codebase...
r43346 oldnode=oldnode,
newnode=newnode,
distance=distance,
partial=partial,
):
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443 return orig(
Augie Fackler
formatting: blacken the codebase...
r43346 repo,
node,
branchmerge,
force,
ancestor,
mergeancestor,
labels,
matcher,
**kwargs
)
Martijn Pieters
fsmonitor: hook up state-enter, state-leave signals...
r28443
Boris Feld
watchman: detect nested mercurial repositories and abort...
r41630 def repo_has_depth_one_nested_repo(repo):
for f in repo.wvfs.listdir():
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if os.path.isdir(os.path.join(repo.root, f, b'.hg')):
msg = b'fsmonitor: sub-repository %r detected, fsmonitor disabled\n'
Boris Feld
watchman: detect nested mercurial repositories and abort...
r41630 repo.ui.debug(msg % f)
return True
return False
Augie Fackler
formatting: blacken the codebase...
r43346
Martijn Pieters
fsmonitor: new experimental extension...
r28433 def reposetup(ui, repo):
# We don't work with largefiles or inotify
exts = extensions.enabled()
for ext in _blacklist:
if ext in exts:
Augie Fackler
formatting: blacken the codebase...
r43346 ui.warn(
_(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b'The fsmonitor extension is incompatible with the %s '
b'extension and has been disabled.\n'
Augie Fackler
formatting: blacken the codebase...
r43346 )
% ext
)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return
FUJIWARA Katsunori
fsmonitor: avoid needless instantiation of dirstate...
r33385 if repo.local():
# We don't work with subrepos either.
#
# if repo[None].substate can cause a dirstate parse, which is too
# slow. Instead, look for a file called hgsubstate,
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if repo.wvfs.exists(b'.hgsubstate') or repo.wvfs.exists(b'.hgsub'):
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return
Boris Feld
watchman: detect nested mercurial repositories and abort...
r41630 if repo_has_depth_one_nested_repo(repo):
return
Martijn Pieters
fsmonitor: new experimental extension...
r28433 fsmonitorstate = state.state(repo)
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 if fsmonitorstate.mode == b'off':
Martijn Pieters
fsmonitor: new experimental extension...
r28433 return
try:
Gregory Szorc
fsmonitor: access repo.root...
r43709 client = watchmanclient.client(repo.ui, repo.root)
Martijn Pieters
fsmonitor: new experimental extension...
r28433 except Exception as ex:
_handleunavailable(ui, fsmonitorstate, ex)
return
repo._fsmonitorstate = fsmonitorstate
repo._watchmanclient = client
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 dirstate, cached = localrepo.isfilecached(repo, b'dirstate')
FUJIWARA Katsunori
fsmonitor: execute setup procedures only if dirstate is already instantiated...
r33387 if cached:
# at this point since fsmonitorstate wasn't present,
# repo.dirstate is not a fsmonitordirstate
makedirstate(repo, dirstate)
Martijn Pieters
fsmonitor: new experimental extension...
r28433
class fsmonitorrepo(repo.__class__):
def status(self, *args, **kwargs):
orig = super(fsmonitorrepo, self).status
return overridestatus(orig, self, *args, **kwargs)
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 def wlocknostateupdate(self, *args, **kwargs):
return super(fsmonitorrepo, self).wlock(*args, **kwargs)
def wlock(self, *args, **kwargs):
l = super(fsmonitorrepo, self).wlock(*args, **kwargs)
if not ui.configbool(
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 b"experimental", b"fsmonitor.transaction_notify"
Augie Fackler
formatting: blacken the codebase...
r43346 ):
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 return l
if l.held != 1:
return l
origrelease = l.releasefn
def staterelease():
if origrelease:
origrelease()
if l.stateupdate:
l.stateupdate.exit()
l.stateupdate = None
try:
l.stateupdate = None
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 l.stateupdate = state_update(self, name=b"hg.transaction")
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 l.stateupdate.enter()
l.releasefn = staterelease
except Exception as e:
# Swallow any errors; fire and forget
Augie Fackler
formatting: byteify all mercurial/ and hgext/ string literals...
r43347 self.ui.log(
b'watchman', b'Exception in state update %s\n', e
)
Eamonn Kent
fsmonitor: fsmonitor should send wlock notifications to watchman...
r35314 return l
Martijn Pieters
fsmonitor: new experimental extension...
r28433 repo.__class__ = fsmonitorrepo