This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8332

py3: require values in changelog extras to be bytes
ClosedPublic

Authored by martinvonz on Mar 25 2020, 10:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG2141427533d2: py3: require values in changelog extras to be bytes
Summary

I don't know what happened here because b436059c1cca (py3: use
pycompat.bytestr() on extra values because it can be int, 2019-02-05)
came about b44a47214122 (py3: use string for "close" value in commit
extras, 2018-02-11). Whatever happened, we shouldn't need to convert
the values to bytes now. It's better to not convert because that might
cover up bugs where someone sets a unicode value in the extras and
that works until the unicode value happens to contain non-ascii (at
which point it will fail because bytestr() expects its argument to
be ascii if it's unicode).

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

martinvonz created this revision.Mar 25 2020, 10:19 PM
pulkit accepted this revision.Mar 26 2020, 4:45 AM
This revision is now accepted and ready to land.Mar 26 2020, 4:45 AM
martinvonz added a commit: rHG2141427533d2: py3: require values in changelog extras to be bytes.Mar 26 2020, 6:18 AM
Closed by commit rHG2141427533d2: py3: require values in changelog extras to be bytes (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changelog.py (5 lines)

Diff 20889

mercurial/changelog.py

if l: if l:
k, v = _string_unescape(l).split(b':', 1) k, v = _string_unescape(l).split(b':', 1)
extra[k] = v extra[k] = v
return extra return extra
def encodeextra(d): def encodeextra(d):
# keys must be sorted to produce a deterministic changelog entry # keys must be sorted to produce a deterministic changelog entry
items = [ items = [_string_escape(b'%s:%s' % (k, d[k])) for k in sorted(d)]
_string_escape(b'%s:%s' % (k, pycompat.bytestr(d[k])))
for k in sorted(d)
]
return b"\0".join(items) return b"\0".join(items)
def stripdesc(desc): def stripdesc(desc):
"""strip trailing whitespace and leading and trailing empty lines""" """strip trailing whitespace and leading and trailing empty lines"""
return b'\n'.join([l.rstrip() for l in desc.splitlines()]).strip(b'\n') return b'\n'.join([l.rstrip() for l in desc.splitlines()]).strip(b'\n')