mercurial-source: hgext/fsmonitor/__init_

annotate hgext/fsmonitor/init.py @ 34145:e48fb90f80c8

cmdutil: simplify the dirty check in howtocontinue() This is equivalent to the previous code. But it seems to me that if the user is going to be prompted that a commit is needed, missing files should be ignored, but branch and merge changes shouldn't be.

author	Matt Harbison <matt_harbison@yahoo.com>
date	Sun, 09 Jul 2017 00:53:16 -0400
parents	15e85dded933
children	8bb4c69c4000

rev	line source
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	1 # __init__.py - fsmonitor initialization and overrides
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	2 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	3 # Copyright 2013-2016 Facebook, Inc.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	4 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	5 # This software may be used and distributed according to the terms of the
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	6 # GNU General Public License version 2 or any later version.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	7
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	8 '''Faster status operations with the Watchman file monitor (EXPERIMENTAL)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	9
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	10 Integrates the file-watching program Watchman with Mercurial to produce faster
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	11 status results.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	12
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	13 On a particular Linux system, for a real-world repository with over 400,000
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	14 files hosted on ext4, vanilla `hg status` takes 1.3 seconds. On the same
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	15 system, with fsmonitor it takes about 0.3 seconds.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	16
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	17 fsmonitor requires no configuration -- it will tell Watchman about your
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	18 repository as necessary. You'll need to install Watchman from
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	19 https://facebook.github.io/watchman/ and make sure it is in your PATH.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	20
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	21 The following configuration options exist:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	22
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	23 ::
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	24
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	25 [fsmonitor]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	26 mode = {off, on, paranoid}
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	27
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	28 When `mode = off`, fsmonitor will disable itself (similar to not loading the
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	29 extension at all). When `mode = on`, fsmonitor will be enabled (the default).
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	30 When `mode = paranoid`, fsmonitor will query both Watchman and the filesystem,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	31 and ensure that the results are consistent.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	32
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	33 ::
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	34
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	35 [fsmonitor]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	36 timeout = (float)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	37
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	38 A value, in seconds, that determines how long fsmonitor will wait for Watchman
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	39 to return results. Defaults to `2.0`.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	40
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	41 ::
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	42
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	43 [fsmonitor]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	44 blacklistusers = (list of userids)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	45
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	46 A list of usernames for which fsmonitor will disable itself altogether.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	47
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	48 ::
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	49
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	50 [fsmonitor]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	51 walk_on_invalidate = (boolean)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	52
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	53 Whether or not to walk the whole repo ourselves when our cached state has been
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	54 invalidated, for example when Watchman has been restarted or .hgignore rules
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	55 have been changed. Walking the repo in that case can result in competing for
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	56 I/O with Watchman. For large repos it is recommended to set this value to
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	57 false. You may wish to set this to true if you have a very fast filesystem
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	58 that can outpace the IPC overhead of getting the result data for the full repo
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	59 from Watchman. Defaults to false.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	60
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	61 fsmonitor is incompatible with the largefiles and eol extensions, and
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	62 will disable itself if any of those are active.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	63
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	64 '''
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	65
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	66 # Platforms Supported
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	67 # ===================
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	68 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	69 # Linux: Stable. Watchman and fsmonitor are both known to work reliably,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	70 # even under severe loads.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	71 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	72 # Mac OS X: Stable. The Mercurial test suite passes with fsmonitor
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	73 # turned on, on case-insensitive HFS+. There has been a reasonable amount of
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	74 # user testing under normal loads.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	75 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	76 # Solaris, BSD: Alpha. watchman and fsmonitor are believed to work, but
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	77 # very little testing has been done.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	78 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	79 # Windows: Alpha. Not in a release version of watchman or fsmonitor yet.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	80 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	81 # Known Issues
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	82 # ============
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	83 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	84 # * fsmonitor will disable itself if any of the following extensions are
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	85 # enabled: largefiles, inotify, eol; or if the repository has subrepos.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	86 # * fsmonitor will produce incorrect results if nested repos that are not
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	87 # subrepos exist. Workaround: add nested repo paths to your `.hgignore`.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	88 #
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	89 # The issues related to nested repos and subrepos are probably not fundamental
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	90 # ones. Patches to fix them are welcome.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	91
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	92 from __future__ import absolute_import
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	93
32625 1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	94 import codecs
30091 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29955 diff changeset	95 import hashlib
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	96 import os
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	97 import stat
32625 1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	98 import sys
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	99
29955 a0939666b836 py3: move up symbol imports to enforce import-checker rules Yuya Nishihara <yuya@tcha.org> parents: 29114 diff changeset	100 from mercurial.i18n import _
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	101 from mercurial import (
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	102 context,
31445 6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	103 encoding,
32625 1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	104 error,
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	105 extensions,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	106 localrepo,
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	107 merge,
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	108 pathutil,
31445 6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	109 pycompat,
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	110 scmutil,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	111 util,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	112 )
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	113 from mercurial import match as matchmod
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	114
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	115 from . import (
32625 1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	116 pywatchman,
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	117 state,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	118 watchmanclient,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	119 )
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	120
30611 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 30091 diff changeset	121 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	122 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	123 # be specifying the version(s) of Mercurial they are tested with, or
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	124 # leave the attribute unspecified.
30611 d5883fd055c6 extensions: change magic "shipped with hg" string Augie Fackler <augie@google.com> parents: 30091 diff changeset	125 testedwith = 'ships-with-hg-core'
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	126
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	127 # This extension is incompatible with the following blacklisted extensions
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	128 # and will disable itself when encountering one of these:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	129 _blacklist = ['largefiles', 'eol']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	130
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	131 def _handleunavailable(ui, state, ex):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	132 """Exception handler for Watchman interaction exceptions"""
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	133 if isinstance(ex, watchmanclient.Unavailable):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	134 if ex.warn:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	135 ui.warn(str(ex) + '\n')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	136 if ex.invalidate:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	137 state.invalidate()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	138 ui.log('fsmonitor', 'Watchman unavailable: %s\n', ex.msg)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	139 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	140 ui.log('fsmonitor', 'Watchman exception: %s\n', ex)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	141
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	142 def _hashignore(ignore):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	143 """Calculate hash for ignore patterns and filenames
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	144
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	145 If this information changes between Mercurial invocations, we can't
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	146 rely on Watchman information anymore and have to re-scan the working
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	147 copy.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	148
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	149 """
30091 0d83ad967bf8 cleanup: replace uses of util.(md5\|sha1\|sha256\|sha512) with hashlib.\1 Augie Fackler <raf@durin42.com> parents: 29955 diff changeset	150 sha1 = hashlib.sha1()
33189 952017471f93 match: implement __repr__() and update users (API) Martin von Zweigbergk <martinvonz@google.com> parents: 33188 diff changeset	151 sha1.update(repr(ignore))
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	152 return sha1.hexdigest()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	153
32625 1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	154 _watchmanencoding = pywatchman.encoding.get_local_encoding()
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	155 _fsencoding = sys.getfilesystemencoding() or sys.getdefaultencoding()
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	156 _fixencoding = codecs.lookup(_watchmanencoding) != codecs.lookup(_fsencoding)
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	157
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	158 def _watchmantofsencoding(path):
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	159 """Fix path to match watchman and local filesystem encoding
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	160
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	161 watchman's paths encoding can differ from filesystem encoding. For example,
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	162 on Windows, it's always utf-8.
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	163 """
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	164 try:
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	165 decoded = path.decode(_watchmanencoding)
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	166 except UnicodeDecodeError as e:
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	167 raise error.Abort(str(e), hint='watchman encoding error')
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	168
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	169 try:
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	170 encoded = decoded.encode(_fsencoding, 'strict')
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	171 except UnicodeEncodeError as e:
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	172 raise error.Abort(str(e))
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	173
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	174 return encoded
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	175
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	176 def overridewalk(orig, self, match, subrepos, unknown, ignored, full=True):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	177 '''Replacement for dirstate.walk, hooking into Watchman.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	178
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	179 Whenever full is False, ignored is False, and the Watchman client is
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	180 available, use Watchman combined with saved state to possibly return only a
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	181 subset of files.'''
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	182 def bail():
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	183 return orig(match, subrepos, unknown, ignored, full=True)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	184
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	185 if full or ignored or not self._watchmanclient.available():
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	186 return bail()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	187 state = self._fsmonitorstate
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	188 clock, ignorehash, notefiles = state.get()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	189 if not clock:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	190 if state.walk_on_invalidate:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	191 return bail()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	192 # Initial NULL clock value, see
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	193 # https://facebook.github.io/watchman/docs/clockspec.html
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	194 clock = 'c:0:0'
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	195 notefiles = []
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	196
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	197 def fwarn(f, msg):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	198 self._ui.warn('%s: %s\n' % (self.pathto(f), msg))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	199 return False
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	200
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	201 def badtype(mode):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	202 kind = _('unknown')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	203 if stat.S_ISCHR(mode):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	204 kind = _('character device')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	205 elif stat.S_ISBLK(mode):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	206 kind = _('block device')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	207 elif stat.S_ISFIFO(mode):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	208 kind = _('fifo')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	209 elif stat.S_ISSOCK(mode):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	210 kind = _('socket')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	211 elif stat.S_ISDIR(mode):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	212 kind = _('directory')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	213 return _('unsupported file type (type is %s)') % kind
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	214
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	215 ignore = self._ignore
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	216 dirignore = self._dirignore
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	217 if unknown:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	218 if _hashignore(ignore) != ignorehash and clock != 'c:0:0':
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	219 # ignore list changed -- can't rely on Watchman state any more
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	220 if state.walk_on_invalidate:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	221 return bail()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	222 notefiles = []
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	223 clock = 'c:0:0'
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	224 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	225 # always ignore
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	226 ignore = util.always
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	227 dirignore = util.always
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	228
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	229 matchfn = match.matchfn
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	230 matchalways = match.always()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	231 dmap = self._map
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	232 nonnormalset = getattr(self, '_nonnormalset', None)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	233
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	234 copymap = self._copymap
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	235 getkind = stat.S_IFMT
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	236 dirkind = stat.S_IFDIR
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	237 regkind = stat.S_IFREG
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	238 lnkkind = stat.S_IFLNK
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	239 join = self._join
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	240 normcase = util.normcase
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	241 fresh_instance = False
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	242
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	243 exact = skipstep3 = False
33104 7df259077d4b fsmonitor: use modern match API Martin von Zweigbergk <martinvonz@google.com> parents: 33009 diff changeset	244 if match.isexact(): # match.exact
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	245 exact = True
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	246 dirignore = util.always # skip step 2
33104 7df259077d4b fsmonitor: use modern match API Martin von Zweigbergk <martinvonz@google.com> parents: 33009 diff changeset	247 elif match.prefix(): # match.match, no patterns
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	248 skipstep3 = True
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	249
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	250 if not exact and self._checkcase:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	251 # note that even though we could receive directory entries, we're only
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	252 # interested in checking if a file with the same name exists. So only
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	253 # normalize files if possible.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	254 normalize = self._normalizefile
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	255 skipstep3 = False
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	256 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	257 normalize = None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	258
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	259 # step 1: find all explicit files
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	260 results, work, dirsnotfound = self._walkexplicit(match, subrepos)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	261
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	262 skipstep3 = skipstep3 and not (work or dirsnotfound)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	263 work = [d for d in work if not dirignore(d[0])]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	264
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	265 if not work and (exact or skipstep3):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	266 for s in subrepos:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	267 del results[s]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	268 del results['.hg']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	269 return results
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	270
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	271 # step 2: query Watchman
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	272 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	273 # Use the user-configured timeout for the query.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	274 # Add a little slack over the top of the user query to allow for
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	275 # overheads while transferring the data
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	276 self._watchmanclient.settimeout(state.timeout + 0.1)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	277 result = self._watchmanclient.command('query', {
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	278 'fields': ['mode', 'mtime', 'size', 'exists', 'name'],
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	279 'since': clock,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	280 'expression': [
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	281 'not', [
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	282 'anyof', ['dirname', '.hg'],
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	283 ['name', '.hg', 'wholename']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	284 ]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	285 ],
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	286 'sync_timeout': int(state.timeout * 1000),
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	287 'empty_on_fresh_instance': state.walk_on_invalidate,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	288 })
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	289 except Exception as ex:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	290 _handleunavailable(self._ui, state, ex)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	291 self._watchmanclient.clearconnection()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	292 return bail()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	293 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	294 # We need to propagate the last observed clock up so that we
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	295 # can use it for our next query
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	296 state.setlastclock(result['clock'])
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	297 if result['is_fresh_instance']:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	298 if state.walk_on_invalidate:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	299 state.invalidate()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	300 return bail()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	301 fresh_instance = True
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	302 # Ignore any prior noteable files from the state info
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	303 notefiles = []
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	304
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	305 # for file paths which require normalization and we encounter a case
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	306 # collision, we store our own foldmap
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	307 if normalize:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	308 foldmap = dict((normcase(k), k) for k in results)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	309
31445 6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	310 switch_slashes = pycompat.ossep == '\\'
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	311 # The order of the results is, strictly speaking, undefined.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	312 # For case changes on a case insensitive filesystem we may receive
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	313 # two entries, one with exists=True and another with exists=False.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	314 # The exists=True entries in the same response should be interpreted
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	315 # as being happens-after the exists=False entries due to the way that
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	316 # Watchman tracks files. We use this property to reconcile deletes
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	317 # for name case changes.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	318 for entry in result['files']:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	319 fname = entry['name']
32625 1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	320 if _fixencoding:
1064a296a2a7 fsmonitor: match watchman and filesystem encoding Olivier Trempe <oliviertrempe@gmail.com> parents: 31445 diff changeset	321 fname = _watchmantofsencoding(fname)
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	322 if switch_slashes:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	323 fname = fname.replace('\\', '/')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	324 if normalize:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	325 normed = normcase(fname)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	326 fname = normalize(fname, True, True)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	327 foldmap[normed] = fname
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	328 fmode = entry['mode']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	329 fexists = entry['exists']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	330 kind = getkind(fmode)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	331
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	332 if not fexists:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	333 # if marked as deleted and we don't already have a change
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	334 # record, mark it as deleted. If we already have an entry
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	335 # for fname then it was either part of walkexplicit or was
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	336 # an earlier result that was a case change
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	337 if fname not in results and fname in dmap and (
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	338 matchalways or matchfn(fname)):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	339 results[fname] = None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	340 elif kind == dirkind:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	341 if fname in dmap and (matchalways or matchfn(fname)):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	342 results[fname] = None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	343 elif kind == regkind or kind == lnkkind:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	344 if fname in dmap:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	345 if matchalways or matchfn(fname):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	346 results[fname] = entry
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	347 elif (matchalways or matchfn(fname)) and not ignore(fname):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	348 results[fname] = entry
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	349 elif fname in dmap and (matchalways or matchfn(fname)):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	350 results[fname] = None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	351
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	352 # step 3: query notable files we don't already know about
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	353 # XXX try not to iterate over the entire dmap
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	354 if normalize:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	355 # any notable files that have changed case will already be handled
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	356 # above, so just check membership in the foldmap
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	357 notefiles = set((normalize(f, True, True) for f in notefiles
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	358 if normcase(f) not in foldmap))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	359 visit = set((f for f in notefiles if (f not in results and matchfn(f)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	360 and (f in dmap or not ignore(f)))))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	361
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	362 if nonnormalset is not None and not fresh_instance:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	363 if matchalways:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	364 visit.update(f for f in nonnormalset if f not in results)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	365 visit.update(f for f in copymap if f not in results)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	366 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	367 visit.update(f for f in nonnormalset
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	368 if f not in results and matchfn(f))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	369 visit.update(f for f in copymap
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	370 if f not in results and matchfn(f))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	371 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	372 if matchalways:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	373 visit.update(f for f, st in dmap.iteritems()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	374 if (f not in results and
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	375 (st[2] < 0 or st[0] != 'n' or fresh_instance)))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	376 visit.update(f for f in copymap if f not in results)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	377 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	378 visit.update(f for f, st in dmap.iteritems()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	379 if (f not in results and
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	380 (st[2] < 0 or st[0] != 'n' or fresh_instance)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	381 and matchfn(f)))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	382 visit.update(f for f in copymap
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	383 if f not in results and matchfn(f))
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	384
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	385 audit = pathutil.pathauditor(self._root).check
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	386 auditpass = [f for f in visit if audit(f)]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	387 auditpass.sort()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	388 auditfail = visit.difference(auditpass)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	389 for f in auditfail:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	390 results[f] = None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	391
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	392 nf = iter(auditpass).next
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	393 for st in util.statfiles([join(f) for f in auditpass]):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	394 f = nf()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	395 if st or f in dmap:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	396 results[f] = st
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	397
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	398 for s in subrepos:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	399 del results[s]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	400 del results['.hg']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	401 return results
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	402
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	403 def overridestatus(
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	404 orig, self, node1='.', node2=None, match=None, ignored=False,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	405 clean=False, unknown=False, listsubrepos=False):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	406 listignored = ignored
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	407 listclean = clean
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	408 listunknown = unknown
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	409
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	410 def _cmpsets(l1, l2):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	411 try:
31445 6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	412 if 'FSMONITOR_LOG_FILE' in encoding.environ:
6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	413 fn = encoding.environ['FSMONITOR_LOG_FILE']
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	414 f = open(fn, 'wb')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	415 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	416 fn = 'fsmonitorfail.log'
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	417 f = self.opener(fn, 'wb')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	418 except (IOError, OSError):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	419 self.ui.warn(_('warning: unable to write to %s\n') % fn)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	420 return
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	421
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	422 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	423 for i, (s1, s2) in enumerate(zip(l1, l2)):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	424 if set(s1) != set(s2):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	425 f.write('sets at position %d are unequal\n' % i)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	426 f.write('watchman returned: %s\n' % s1)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	427 f.write('stat returned: %s\n' % s2)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	428 finally:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	429 f.close()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	430
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	431 if isinstance(node1, context.changectx):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	432 ctx1 = node1
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	433 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	434 ctx1 = self[node1]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	435 if isinstance(node2, context.changectx):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	436 ctx2 = node2
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	437 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	438 ctx2 = self[node2]
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	439
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	440 working = ctx2.rev() is None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	441 parentworking = working and ctx1 == self['.']
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	442 match = match or matchmod.always(self.root, self.getcwd())
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	443
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	444 # Maybe we can use this opportunity to update Watchman's state.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	445 # Mercurial uses workingcommitctx and/or memctx to represent the part of
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	446 # the workingctx that is to be committed. So don't update the state in
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	447 # that case.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	448 # HG_PENDING is set in the environment when the dirstate is being updated
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	449 # in the middle of a transaction; we must not update our state in that
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	450 # case, or we risk forgetting about changes in the working copy.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	451 updatestate = (parentworking and match.always() and
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	452 not isinstance(ctx2, (context.workingcommitctx,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	453 context.memctx)) and
31445 6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	454 'HG_PENDING' not in encoding.environ)
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	455
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	456 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	457 if self._fsmonitorstate.walk_on_invalidate:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	458 # Use a short timeout to query the current clock. If that
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	459 # takes too long then we assume that the service will be slow
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	460 # to answer our query.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	461 # walk_on_invalidate indicates that we prefer to walk the
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	462 # tree ourselves because we can ignore portions that Watchman
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	463 # cannot and we tend to be faster in the warmer buffer cache
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	464 # cases.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	465 self._watchmanclient.settimeout(0.1)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	466 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	467 # Give Watchman more time to potentially complete its walk
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	468 # and return the initial clock. In this mode we assume that
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	469 # the filesystem will be slower than parsing a potentially
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	470 # very large Watchman result set.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	471 self._watchmanclient.settimeout(
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	472 self._fsmonitorstate.timeout + 0.1)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	473 startclock = self._watchmanclient.getcurrentclock()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	474 except Exception as ex:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	475 self._watchmanclient.clearconnection()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	476 _handleunavailable(self.ui, self._fsmonitorstate, ex)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	477 # boo, Watchman failed. bail
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	478 return orig(node1, node2, match, listignored, listclean,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	479 listunknown, listsubrepos)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	480
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	481 if updatestate:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	482 # We need info about unknown files. This may make things slower the
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	483 # first time, but whatever.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	484 stateunknown = True
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	485 else:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	486 stateunknown = listunknown
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	487
33598 15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	488 if updatestate:
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	489 ps = poststatus(startclock)
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	490 self.addpostdsstatus(ps)
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	491
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	492 r = orig(node1, node2, match, listignored, listclean, stateunknown,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	493 listsubrepos)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	494 modified, added, removed, deleted, unknown, ignored, clean = r
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	495
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	496 if not listunknown:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	497 unknown = []
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	498
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	499 # don't do paranoid checks if we're not going to query Watchman anyway
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	500 full = listclean or match.traversedir is not None
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	501 if self._fsmonitorstate.mode == 'paranoid' and not full:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	502 # run status again and fall back to the old walk this time
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	503 self.dirstate._fsmonitordisable = True
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	504
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	505 # shut the UI up
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	506 quiet = self.ui.quiet
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	507 self.ui.quiet = True
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	508 fout, ferr = self.ui.fout, self.ui.ferr
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	509 self.ui.fout = self.ui.ferr = open(os.devnull, 'wb')
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	510
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	511 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	512 rv2 = orig(
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	513 node1, node2, match, listignored, listclean, listunknown,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	514 listsubrepos)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	515 finally:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	516 self.dirstate._fsmonitordisable = False
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	517 self.ui.quiet = quiet
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	518 self.ui.fout, self.ui.ferr = fout, ferr
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	519
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	520 # clean isn't tested since it's set to True above
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	521 _cmpsets([modified, added, removed, deleted, unknown, ignored, clean],
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	522 rv2)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	523 modified, added, removed, deleted, unknown, ignored, clean = rv2
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	524
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	525 return scmutil.status(
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	526 modified, added, removed, deleted, unknown, ignored, clean)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	527
33598 15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	528 class poststatus(object):
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	529 def __init__(self, startclock):
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	530 self._startclock = startclock
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	531
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	532 def __call__(self, wctx, status):
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	533 clock = wctx.repo()._fsmonitorstate.getlastclock() or self._startclock
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	534 hashignore = _hashignore(wctx.repo().dirstate._ignore)
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	535 notefiles = (status.modified + status.added + status.removed +
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	536 status.deleted + status.unknown)
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	537 wctx.repo()._fsmonitorstate.set(clock, hashignore, notefiles)
15e85dded933 fsmonitor: write state with wlock held and dirstate unchanged (issue5581) Siddharth Agarwal <sid0@fb.com> parents: 33505 diff changeset	538
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	539 def makedirstate(cls):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	540 class fsmonitordirstate(cls):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	541 def _fsmonitorinit(self, fsmonitorstate, watchmanclient):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	542 # _fsmonitordisable is used in paranoid mode
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	543 self._fsmonitordisable = False
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	544 self._fsmonitorstate = fsmonitorstate
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	545 self._watchmanclient = watchmanclient
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	546
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	547 def walk(self, args, *kwargs):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	548 orig = super(fsmonitordirstate, self).walk
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	549 if self._fsmonitordisable:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	550 return orig(args, *kwargs)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	551 return overridewalk(orig, self, args, *kwargs)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	552
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	553 def rebuild(self, args, *kwargs):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	554 self._fsmonitorstate.invalidate()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	555 return super(fsmonitordirstate, self).rebuild(args, *kwargs)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	556
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	557 def invalidate(self, args, *kwargs):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	558 self._fsmonitorstate.invalidate()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	559 return super(fsmonitordirstate, self).invalidate(args, *kwargs)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	560
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	561 return fsmonitordirstate
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	562
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	563 def wrapdirstate(orig, self):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	564 ds = orig(self)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	565 # only override the dirstate when Watchman is available for the repo
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	566 if util.safehasattr(self, '_fsmonitorstate'):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	567 ds.__class__ = makedirstate(ds.__class__)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	568 ds._fsmonitorinit(self._fsmonitorstate, self._watchmanclient)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	569 return ds
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	570
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	571 def extsetup(ui):
33505 de09138bf0f5 extensions: move wrapfilecache function from fsmonitor Augie Fackler <augie@google.com> parents: 33189 diff changeset	572 extensions.wrapfilecache(
de09138bf0f5 extensions: move wrapfilecache function from fsmonitor Augie Fackler <augie@google.com> parents: 33189 diff changeset	573 localrepo.localrepository, 'dirstate', wrapdirstate)
31445 6ada1658fc6b py3: use python 3 compatible variables in hgext/fsmontor/__init__.py Pulkit Goyal <7895pulkit@gmail.com> parents: 31111 diff changeset	574 if pycompat.sysplatform == 'darwin':
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	575 # An assist for avoiding the dangling-symlink fsevents bug
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	576 extensions.wrapfunction(os, 'symlink', wrapsymlink)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	577
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	578 extensions.wrapfunction(merge, 'update', wrapupdate)
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	579
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	580 def wrapsymlink(orig, source, link_name):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	581 ''' if we create a dangling symlink, also touch the parent dir
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	582 to encourage fsevents notifications to work more correctly '''
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	583 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	584 return orig(source, link_name)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	585 finally:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	586 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	587 os.utime(os.path.dirname(link_name), None)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	588 except OSError:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	589 pass
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	590
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	591 class state_update(object):
31111 318a24b52eeb spelling: fixes of non-dictionary words Mads Kiilerich <madski@unity3d.com> parents: 30611 diff changeset	592 ''' This context manager is responsible for dispatching the state-enter
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	593 and state-leave signals to the watchman service '''
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	594
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	595 def __init__(self, repo, node, distance, partial):
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	596 self.repo = repo
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	597 self.node = node
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	598 self.distance = distance
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	599 self.partial = partial
33117 6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	600 self._lock = None
33118 354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	601 self.need_leave = False
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	602
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	603 def __enter__(self):
33117 6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	604 # We explicitly need to take a lock here, before we proceed to update
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	605 # watchman about the update operation, so that we don't race with
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	606 # some other actor. merge.update is going to take the wlock almost
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	607 # immediately anyway, so this is effectively extending the lock
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	608 # around a couple of short sanity checks.
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	609 self._lock = self.repo.wlock()
33118 354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	610 self.need_leave = self._state('state-enter')
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	611 return self
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	612
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	613 def __exit__(self, type_, value, tb):
33117 6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	614 try:
33118 354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	615 if self.need_leave:
354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	616 status = 'ok' if type_ is None else 'failed'
354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	617 self._state('state-leave', status=status)
33117 6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	618 finally:
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	619 if self._lock:
6e0d1043e8fc fsmonitor: acquire localrepo.wlock prior to emitting hg.update state Wez Furlong <wez@fb.com> parents: 33104 diff changeset	620 self._lock.release()
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	621
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	622 def _state(self, cmd, status='ok'):
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	623 if not util.safehasattr(self.repo, '_watchmanclient'):
33118 354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	624 return False
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	625 try:
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	626 commithash = self.repo[self.node].hex()
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	627 self.repo._watchmanclient.command(cmd, {
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	628 'name': 'hg.update',
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	629 'metadata': {
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	630 # the target revision
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	631 'rev': commithash,
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	632 # approximate number of commits between current and target
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	633 'distance': self.distance,
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	634 # success/failure (only really meaningful for state-leave)
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	635 'status': status,
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	636 # whether the working copy parent is changing
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	637 'partial': self.partial,
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	638 }})
33118 354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	639 return True
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	640 except Exception as e:
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	641 # Swallow any errors; fire and forget
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	642 self.repo.ui.log(
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	643 'watchman', 'Exception %s while running %s\n', e, cmd)
33118 354329178dee fsmonitor: don't attempt state-leave if we didn't state-enter Wez Furlong <wez@fb.com> parents: 33117 diff changeset	644 return False
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	645
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	646 # Bracket working copy updates with calls to the watchman state-enter
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	647 # and state-leave commands. This allows clients to perform more intelligent
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	648 # settling during bulk file change scenarios
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	649 # https://facebook.github.io/watchman/docs/cmd/subscribe.html#advanced-settling
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	650 def wrapupdate(orig, repo, node, branchmerge, force, ancestor=None,
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	651 mergeancestor=False, labels=None, matcher=None, **kwargs):
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	652
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	653 distance = 0
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	654 partial = True
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	655 if matcher is None or matcher.always():
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	656 partial = False
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	657 wc = repo[None]
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	658 parents = wc.parents()
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	659 if len(parents) == 2:
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	660 anc = repo.changelog.ancestor(parents[0].node(), parents[1].node())
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	661 ancrev = repo[anc].rev()
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	662 distance = abs(repo[node].rev() - ancrev)
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	663 elif len(parents) == 1:
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	664 distance = abs(repo[node].rev() - parents[0].rev())
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	665
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	666 with state_update(repo, node, distance, partial):
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	667 return orig(
49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	668 repo, node, branchmerge, force, ancestor, mergeancestor,
33188 bdc4861ffe59 fsmonitor: fix silly "kwargs" bug in merge.update() override Martin von Zweigbergk <martinvonz@google.com>* parents: 33118 diff changeset	669 labels, matcher, **kwargs)
29114 49d65663d7e4 fsmonitor: hook up state-enter, state-leave signals Martijn Pieters <mjpieters@fb.com> parents: 29104 diff changeset	670
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	671 def reposetup(ui, repo):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	672 # We don't work with largefiles or inotify
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	673 exts = extensions.enabled()
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	674 for ext in _blacklist:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	675 if ext in exts:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	676 ui.warn(_('The fsmonitor extension is incompatible with the %s '
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	677 'extension and has been disabled.\n') % ext)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	678 return
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	679
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	680 if util.safehasattr(repo, 'dirstate'):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	681 # We don't work with subrepos either. Note that we can get passed in
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	682 # e.g. a statichttprepo, which throws on trying to access the substate.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	683 # XXX This sucks.
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	684 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	685 # if repo[None].substate can cause a dirstate parse, which is too
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	686 # slow. Instead, look for a file called hgsubstate,
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	687 if repo.wvfs.exists('.hgsubstate') or repo.wvfs.exists('.hgsub'):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	688 return
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	689 except AttributeError:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	690 return
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	691
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	692 fsmonitorstate = state.state(repo)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	693 if fsmonitorstate.mode == 'off':
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	694 return
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	695
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	696 try:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	697 client = watchmanclient.client(repo)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	698 except Exception as ex:
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	699 _handleunavailable(ui, fsmonitorstate, ex)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	700 return
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	701
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	702 repo._fsmonitorstate = fsmonitorstate
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	703 repo._watchmanclient = client
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	704
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	705 # at this point since fsmonitorstate wasn't present, repo.dirstate is
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	706 # not a fsmonitordirstate
33009 bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	707 dirstate = repo.dirstate
bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	708 dirstate.__class__ = makedirstate(dirstate.__class__)
bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	709 dirstate._fsmonitorinit(fsmonitorstate, client)
bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	710 # invalidate property cache, but keep filecache which contains the
bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	711 # wrapped dirstate object
bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	712 del repo.unfiltered().__dict__['dirstate']
bf3af0eced44 fsmonitor: do not nuke dirstate filecache Jun Wu <quark@fb.com> parents: 32625 diff changeset	713 assert dirstate is repo._filecache['dirstate'].obj
29104 3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	714
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	715 class fsmonitorrepo(repo.__class__):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	716 def status(self, args, *kwargs):
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	717 orig = super(fsmonitorrepo, self).status
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	718 return overridestatus(orig, self, args, *kwargs)
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	719
3b67f27bb908 fsmonitor: new experimental extension Martijn Pieters <mjpieters@fb.com> parents: diff changeset	720 repo.__class__ = fsmonitorrepo

Mercurial > hg > mercurial-source

annotate hgext/fsmonitor/__init__.py @ 34145:e48fb90f80c8

annotate hgext/fsmonitor/init.py @ 34145:e48fb90f80c8