##// END OF EJS Templates
copies: detect files as `touched/salvaged` if they only existed on one side...
copies: detect files as `touched/salvaged` if they only existed on one side The file cannot be merged if there was content to merge on the other side. So the previous record was wrong. In the general case, the file existed only on one side and got touched during the merge. So it should detected as touched. They are a special case where the merge manually prevent the file to be deleted. In this case the file is marked as `salvaged`. The result of this `salvaged` recording, copy-tracing-wise, is the same as recording it as `merged`. This is probably why they were recorded as `merged` in the first place. Differential Revision: https://phab.mercurial-scm.org/D10219

File last commit:

r43703:6469c23a stable
r47570:c52c3c4c default
Show More
encoding.py
75 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.
# no unicode literals
Gregory Szorc
fsmonitor: refresh pywatchman with upstream...
r43703 from __future__ import absolute_import, division, print_function
Zack Hricz
fsmonitor: refresh pywatchman to upstream...
r30656
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)