release: merge default into stable for 4.7 release freeze stable
authorAugie Fackler <augie@google.com>
Thu, 19 Jul 2018 13:55:54 -0400
branchstable
changeset 38739 7acec9408e1c
parent 38615 443029011990 (diff)
parent 38738 faea9b1980d9 (current diff)
child 38740 c08ea1e219c0
release: merge default into stable for 4.7 release freeze
contrib/build-linux-wheels.sh
contrib/builddeb
contrib/buildrpm
contrib/debian/cacerts.rc
contrib/debian/changelog
contrib/debian/compat
contrib/debian/control
contrib/debian/copyright
contrib/debian/default-tools.rc
contrib/debian/hgkpath.rc
contrib/debian/rules
contrib/docker/centos5
contrib/docker/centos6
contrib/docker/centos7
contrib/docker/debian.template
contrib/docker/fedora20
contrib/docker/fedora21
contrib/docker/ubuntu.template
contrib/dockerdeb
contrib/dockerlib.sh
contrib/dockerrpm
contrib/fixpax.py
contrib/linux-wheel-centos5-blacklist
contrib/macosx/Readme.html
contrib/macosx/Welcome.html
contrib/macosx/distribution.xml
contrib/mercurial.spec
contrib/packagelib.sh
hgext/narrow/narrowmerge.py
mercurial/encoding.py
tests/test-command-template.t
tests/test-hybridencode.py.out
tests/test-template-engine.t
--- a/mercurial/encoding.py	Thu Jul 19 22:30:37 2018 +0530
+++ b/mercurial/encoding.py	Thu Jul 19 13:55:54 2018 -0400
@@ -72,6 +72,11 @@
     '646': lambda: 'ascii',
     'ANSI_X3.4-1968': lambda: 'ascii',
 }
+# cp65001 is a Windows variant of utf-8, which isn't supported on Python 2.
+# No idea if it should be rewritten to the canonical name 'utf-8' on Python 3.
+# https://bugs.python.org/issue13216
+if pycompat.iswindows and not pycompat.ispy3:
+    _encodingfixers['cp65001'] = lambda: 'utf-8'
 
 try:
     encoding = environ.get("HGENCODING")