( )⚙ D3609 py3: bytestr() bytes to get bytechar while iterating on it

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3609

py3: bytestr() bytes to get bytechar while iterating on it
ClosedPublic

Authored by pulkit on May 19 2018, 10:40 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe887381e2976: py3: bytestr() bytes to get bytechar while iterating on it
Summary

Iterating on bytes give you ascii values instead of bytechr so we need to wrap
the bytes in pycompat.bytestr() to get bytechr while iterating.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.May 19 2018, 10:40 AM
Closed by commit rHGe887381e2976: py3: bytestr() bytes to get bytechar while iterating on it (authored by pulkit). · Explain WhyMay 19 2018, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/patch.py (2 lines)
Mmercurial/templater.py (3 lines)

Diff 8815

mercurial/patch.py

yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy()) yield 'file', ('a/' + gp.path, 'b/' + gp.path, None, gp.copy())
def applybindelta(binchunk, data): def applybindelta(binchunk, data):
"""Apply a binary delta hunk """Apply a binary delta hunk
The algorithm used is the algorithm from git's patch-delta.c The algorithm used is the algorithm from git's patch-delta.c
""" """
def deltahead(binchunk): def deltahead(binchunk):
i = 0 i = 0
for c in binchunk: for c in pycompat.bytestr(binchunk):
i += 1 i += 1
if not (ord(c) & 0x80): if not (ord(c) & 0x80):
return i return i
return i return i
out = "" out = ""
s = deltahead(binchunk) s = deltahead(binchunk)
binchunk = binchunk[s:] binchunk = binchunk[s:]
s = deltahead(binchunk) s = deltahead(binchunk)

mercurial/templater.py

def _scantemplate(tmpl, start, stop, quote='', raw=False): def _scantemplate(tmpl, start, stop, quote='', raw=False):
"""Parse template string into chunks of strings and template expressions""" """Parse template string into chunks of strings and template expressions"""
sepchars = '{' + quote sepchars = '{' + quote
unescape = [parser.unescapestr, pycompat.identity][raw] unescape = [parser.unescapestr, pycompat.identity][raw]
pos = start pos = start
p = parser.parser(elements) p = parser.parser(elements)
try: try:
while pos < stop: while pos < stop:
n = min((tmpl.find(c, pos, stop) for c in sepchars), n = min((tmpl.find(c, pos, stop)
for c in pycompat.bytestr(sepchars)),
key=lambda n: (n < 0, n)) key=lambda n: (n < 0, n))
if n < 0: if n < 0:
yield ('string', unescape(tmpl[pos:stop]), pos) yield ('string', unescape(tmpl[pos:stop]), pos)
pos = stop pos = stop
break break
c = tmpl[n:n + 1] c = tmpl[n:n + 1]
bs = 0 # count leading backslashes bs = 0 # count leading backslashes
if not raw: if not raw: