##// END OF EJS Templates
win32mbcs: wrap underlying pycompat.bytestr to use checkwinfilename safely...
win32mbcs: wrap underlying pycompat.bytestr to use checkwinfilename safely win32mbcs wraps some functions, to prevent them from unintentionally treating backslash (0x5c), which is used as the second or later byte of multi bytes characters by problematic encodings, as a path component delimiter on Windows platform. This wrapping assumes that wrapped functions can safely accept unicode string arguments. Unfortunately, d1937bdcee8c broke this assumption by introducing pycompat.bytestr() into util.checkwinfilename() for py3 support. After that, wrapped checkwinfilename() always fails for non-ASCII filename at pycompat.bytestr() invocation. This patch wraps underlying pycompat.bytestr() function to use util.checkwinfilename() safely. To avoid similar regression in the future, another patch series will add smoke testing on default branch.

File last commit:

r30361:1070df14 default
r32244:176ed32d stable
Show More
node.py
34 lines | 900 B | text/x-python | PythonLexer
Martin Geisler
put license and copyright info into comment blocks
r8226 # node.py - basic nodeid manipulation for mercurial
#
# Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
#
# This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
r10263 # GNU General Public License version 2 or any later version.
mpm@selenic.com
Break apart hg.py...
r1089
Gregory Szorc
node: use absolute_import
r25962 from __future__ import absolute_import
Matt Mackall
Replace demandload with new demandimport
r3877 import binascii
mpm@selenic.com
Break apart hg.py...
r1089
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980 # This ugly style has a noticeable effect in manifest parsing
hex = binascii.hexlify
bin = binascii.unhexlify
Thomas Arendsen Hein
Define and use nullrev (revision of nullid) instead of -1.
r3578 nullrev = -1
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 nullid = b"\0" * 20
Siddharth Agarwal
node: add 'nullhex', hex-encoded nullid...
r26980 nullhex = hex(nullid)
mpm@selenic.com
Break apart hg.py...
r1089
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360 # Phony node value to stand-in for new files in some uses of
# manifests.
newnodeid = '!' * 20
Durham Goode
dirstate: change added/modified placeholder hash length to 20 bytes...
r30361 addednodeid = ('0' * 15) + 'added'
modifiednodeid = ('0' * 12) + 'modified'
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Durham Goode
dirstate: change added/modified placeholder hash length to 20 bytes...
r30361 wdirnodes = set((newnodeid, addednodeid, modifiednodeid))
Durham Goode
dirstate: change placeholder hash length to 20 bytes...
r30360
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737 # pseudo identifiers for working directory
# (they are experimental, so don't add too many dependencies on them)
wdirrev = 0x7fffffff
Gregory Szorc
node: use byte literals to construct nullid and wdirid...
r28585 wdirid = b"\xff" * 20
Yuya Nishihara
node: define experimental identifiers for working directory...
r25737
mpm@selenic.com
Break apart hg.py...
r1089 def short(node):
return hex(node[:6])