This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6508

py3: use .startswith() instead of bytes[0]
ClosedPublic

Authored by pulkit on Jun 11 2019, 8:50 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc1bf63ac30c5: py3: use .startswith() instead of bytes[0]
Summary

Doing bytes[0] will return the ascii value of that position which breaks
comparison with a bytechar.

This makes test-absorb.t work again on py3.

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.Jun 11 2019, 8:50 AM
pulkit added a commit: rHGc1bf63ac30c5: py3: use .startswith() instead of bytes[0].Jun 11 2019, 11:46 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc1bf63ac30c5: py3: use .startswith() instead of bytes[0] (authored by pulkit). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/absorb.py (2 lines)

Diff 15442

hgext/absorb.py

a1 = hunk.fromline + len(hunk.before) - 1 a1 = hunk.fromline + len(hunk.before) - 1
# remove before and after context # remove before and after context
hunk.before = hunk.after = [] hunk.before = hunk.after = []
buf = util.stringio() buf = util.stringio()
hunk.write(buf) hunk.write(buf)
patchlines = mdiff.splitnewlines(buf.getvalue()) patchlines = mdiff.splitnewlines(buf.getvalue())
# hunk.prettystr() will update hunk.removed # hunk.prettystr() will update hunk.removed
a2 = a1 + hunk.removed a2 = a1 + hunk.removed
blines = [l[1:] for l in patchlines[1:] if l[0] != '-'] blines = [l[1:] for l in patchlines[1:] if not l.startswith('-')]
return path, (a1, a2, blines) return path, (a1, a2, blines)
def overlaydiffcontext(ctx, chunks): def overlaydiffcontext(ctx, chunks):
"""(ctx, [crecord.uihunk]) -> memctx """(ctx, [crecord.uihunk]) -> memctx
return a memctx with some [1] patches (chunks) applied to ctx. return a memctx with some [1] patches (chunks) applied to ctx.
[1]: modifications are handled. renames, mode changes, etc. are ignored. [1]: modifications are handled. renames, mode changes, etc. are ignored.
""" """