##// END OF EJS Templates
largefiles: sync up `largefilesdirstate` methods with `dirstate` base class...
largefiles: sync up `largefilesdirstate` methods with `dirstate` base class As it currently stands, pytype infers the `dirstate` class (and anything else decorated with `@interfaceutil.implementer`) as `Any`. When that is worked around, it suddenly noticed that most of these methods don't exist in the `dirstate` class anymore. Since they only called into the missing methods and there's no test failures, we can assume these are never called, and they can be dropped. In addition, PyCharm flagged `set_tracked()` and `_ignore()` as not overriding a superclass method with the same arguments. The missing default parameter for the former was the obvious issue. I'm guessing that the latter was named wrong because while there is `_ignore()` in the base class, it takes no arguments and returns a matcher. The `_ignorefiles()` superclass method also takes no args, and returns a list of bytes. The `_ignorefileandline()` superclass method DOES take a file, but returns a tuple. Therefore, the closest match is `_dirignore()`, which takes a file AND returns a bool. No idea why this needs to be overridden though.

File last commit:

r52596:ca7bde5d default
r52700:0b2c978f default
Show More
encoding.py
71 lines | 2.8 KiB | text/x-python | PythonLexer
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # Copyright 2016-present Facebook, Inc.
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# * Neither the name Facebook nor the names of its contributors may be used to
# endorse or promote products derived from this software without specific
# prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import sys
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 from . import compat
"""Module to deal with filename encoding on the local system, as returned by
Watchman."""
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
if compat.PYTHON3:
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 default_local_errors = "surrogateescape"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
def get_local_encoding():
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 if sys.platform == "win32":
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # Watchman always returns UTF-8 encoded strings on Windows.
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 return "utf-8"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # On the Python 3 versions we support, sys.getfilesystemencoding never
# returns None.
return sys.getfilesystemencoding()
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 else:
# Python 2 doesn't support surrogateescape, so use 'strict' by
# default. Users can register a custom surrogateescape error handler and use
# that if they so desire.
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 default_local_errors = "strict"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
def get_local_encoding():
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 if sys.platform == "win32":
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 # Watchman always returns UTF-8 encoded strings on Windows.
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 return "utf-8"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 fsencoding = sys.getfilesystemencoding()
if fsencoding is None:
# This is very unlikely to happen, but if it does, just use UTF-8
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 fsencoding = "utf-8"
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 return fsencoding
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 def encode_local(s):
return s.encode(get_local_encoding(), default_local_errors)
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656 def decode_local(bs):
return bs.decode(get_local_encoding(), default_local_errors)