Mercurial > public > mercurial-scm > hg

comparison hgext/fsmonitor/pywatchman/encoding.py @ 43385:6469c23a40a2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fsmonitor: refresh pywatchman with upstream This commit vendors pywatchman commit 259dc66dc9591f9b7ce76d0275bb1065f390c9b1 from upstream without modifications. The previously vendored pywatchman from changeset 16f4b341288d was from Git commit c77452. This commit effectively undoes the following Mercurial changesets: * dd35abc409ee fsmonitor: correct an error message * b1f62cd39b5c fsmonitor: layer on another hack in bser.c for os.stat() compat (issue5811) * c31ce080eb75 py3: convert arguments, cwd and env to native strings when spawning subprocess * 876494fd967d cleanup: delete lots of unused local variables * 57264906a996 watchman: add the possibility to set the exact watchman binary location The newly-vendored code has support for specifying the binary location, so 57264906a996 does not need applied. But we do need to modify our code to specify a proper argument name. 876494fd967d is not important, so it will be ignored. c31ce080eb75 globally changed the code base to always pass str to subprocess. But pywatchman's code is Python 3 clean, so we don't need to do this. This leaves dd35abc409ee and b1f62cd39b5c, which will be re-applied in subsequent commits. Differential Revision: https://phab.mercurial-scm.org/D7201
author Gregory Szorc <gregory.szorc@gmail.com>
date Sat, 02 Nov 2019 12:42:23 -0700
parents 16f4b341288d
children 6000f5b25c9b
comparison
equal deleted inserted replaced
43384:1edf620a37a3 43385:6469c23a40a2
24 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER 24 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, 25 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 26 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28 28
29 from __future__ import absolute_import
30 from __future__ import division
31 from __future__ import print_function
32 # no unicode literals 29 # no unicode literals
33 30 from __future__ import absolute_import, division, print_function
34 '''Module to deal with filename encoding on the local system, as returned by
35 Watchman.'''
36 31
37 import sys 32 import sys
38 33
39 from . import ( 34 from . import compat
40 compat, 35
41 ) 36
37 """Module to deal with filename encoding on the local system, as returned by
38 Watchman."""
39
42 40
43 if compat.PYTHON3: 41 if compat.PYTHON3:
44 default_local_errors = 'surrogateescape' 42 default_local_errors = "surrogateescape"
45 43
46 def get_local_encoding(): 44 def get_local_encoding():
47 if sys.platform == 'win32': 45 if sys.platform == "win32":
48 # Watchman always returns UTF-8 encoded strings on Windows. 46 # Watchman always returns UTF-8 encoded strings on Windows.
49 return 'utf-8' 47 return "utf-8"
50 # On the Python 3 versions we support, sys.getfilesystemencoding never 48 # On the Python 3 versions we support, sys.getfilesystemencoding never
51 # returns None. 49 # returns None.
52 return sys.getfilesystemencoding() 50 return sys.getfilesystemencoding()
51
52
53 else: 53 else:
54 # Python 2 doesn't support surrogateescape, so use 'strict' by 54 # Python 2 doesn't support surrogateescape, so use 'strict' by
55 # default. Users can register a custom surrogateescape error handler and use 55 # default. Users can register a custom surrogateescape error handler and use
56 # that if they so desire. 56 # that if they so desire.
57 default_local_errors = 'strict' 57 default_local_errors = "strict"
58 58
59 def get_local_encoding(): 59 def get_local_encoding():
60 if sys.platform == 'win32': 60 if sys.platform == "win32":
61 # Watchman always returns UTF-8 encoded strings on Windows. 61 # Watchman always returns UTF-8 encoded strings on Windows.
62 return 'utf-8' 62 return "utf-8"
63 fsencoding = sys.getfilesystemencoding() 63 fsencoding = sys.getfilesystemencoding()
64 if fsencoding is None: 64 if fsencoding is None:
65 # This is very unlikely to happen, but if it does, just use UTF-8 65 # This is very unlikely to happen, but if it does, just use UTF-8
66 fsencoding = 'utf-8' 66 fsencoding = "utf-8"
67 return fsencoding 67 return fsencoding
68
68 69
69 def encode_local(s): 70 def encode_local(s):
70 return s.encode(get_local_encoding(), default_local_errors) 71 return s.encode(get_local_encoding(), default_local_errors)
71 72
73
72 def decode_local(bs): 74 def decode_local(bs):
73 return bs.decode(get_local_encoding(), default_local_errors) 75 return bs.decode(get_local_encoding(), default_local_errors)