This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2457

py3: slice over bytes or use .startswith() to prevent getting ascii values
ClosedPublic

Authored by pulkit on Feb 26 2018, 7:32 AM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG588048a6a8d3: py3: slice over bytes or use .startswith() to prevent getting ascii values
Summary

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.Feb 26 2018, 7:32 AM
yuja requested changes to this revision.Feb 26 2018, 8:21 AM
yuja added a subscriber: yuja.
yuja added inline comments.
mercurial/patch.py
2521

Nit: could be token.startswith('\t')

This revision now requires changes to proceed.Feb 26 2018, 8:21 AM
pulkit retitled this revision from py3: slice over bytes to prevent getting ascii values to py3: slice over bytes or use .startswith() to prevent getting ascii values.Feb 26 2018, 1:52 PM
pulkit updated this revision to Diff 6127.
yuja accepted this revision.Feb 27 2018, 7:07 AM
This revision is now accepted and ready to land.Feb 27 2018, 7:07 AM
Closed by commit rHG588048a6a8d3: py3: slice over bytes or use .startswith() to prevent getting ascii values (authored by pulkit). · Explain WhyFeb 27 2018, 7:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/archival.py (2 lines)
Mmercurial/patch.py (2 lines)

Diff 6163

mercurial/archival.py

self.fileobj.write(fname + '\000') self.fileobj.write(fname + '\000')
def __init__(self, dest, mtime, kind=''): def __init__(self, dest, mtime, kind=''):
self.mtime = mtime self.mtime = mtime
self.fileobj = None self.fileobj = None
def taropen(mode, name='', fileobj=None): def taropen(mode, name='', fileobj=None):
if kind == 'gz': if kind == 'gz':
mode = mode[0] mode = mode[0:1]
if not fileobj: if not fileobj:
fileobj = open(name, mode + 'b') fileobj = open(name, mode + 'b')
gzfileobj = self.GzipFileWithTime(name, mode + 'b', gzfileobj = self.GzipFileWithTime(name, mode + 'b',
zlib.Z_BEST_COMPRESSION, zlib.Z_BEST_COMPRESSION,
fileobj, timestamp=mtime) fileobj, timestamp=mtime)
self.fileobj = gzfileobj self.fileobj = gzfileobj
return tarfile.TarFile.taropen(name, mode, gzfileobj) return tarfile.TarFile.taropen(name, mode, gzfileobj)
else: else:

mercurial/patch.py

if diffline: if diffline:
if i in matches: if i in matches:
for t, l in _inlinediff(lines[i].rstrip(), for t, l in _inlinediff(lines[i].rstrip(),
lines[matches[i]].rstrip(), lines[matches[i]].rstrip(),
label): label):
yield (t, l) yield (t, l)
else: else:
for token in tabsplitter.findall(stripline): for token in tabsplitter.findall(stripline):
if '\t' == token[0]: if token.startswith('\t'):
yujaUnsubmitted
Not Done

Nit: could be token.startswith('\t')

yuja: Nit: could be `token.startswith('\t')`
yield (token, 'diff.tab') yield (token, 'diff.tab')
else: else:
yield (token, label) yield (token, label)
else: else:
yield (stripline, label) yield (stripline, label)
break break
else: else:
yield (line, '') yield (line, '')