This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5864

py3: use pycompat.bytestr() on extra values because it can be int
ClosedPublic

Authored by pulkit on Feb 5 2019, 1:37 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb436059c1cca: py3: use pycompat.bytestr() on extra values because it can be int
Summary

One such example is {'close': 1} which marks a branch as closed.

This makes test-convert-mtn.t pass on Python 3.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Feb 5 2019, 1:37 PM
Closed by commit rHGb436059c1cca: py3: use pycompat.bytestr() on extra values because it can be int (authored by pulkit). · Explain WhyFeb 5 2019, 5:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mmercurial/changelog.py (5 lines)

Diff 13831

contrib/python3-whitelist

test-convert-cvs.t test-convert-cvs.t
test-convert-cvsnt-mergepoints.t test-convert-cvsnt-mergepoints.t
test-convert-datesort.t test-convert-datesort.t
test-convert-filemap.t test-convert-filemap.t
test-convert-git.t test-convert-git.t
test-convert-hg-sink.t test-convert-hg-sink.t
test-convert-hg-source.t test-convert-hg-source.t
test-convert-hg-startrev.t test-convert-hg-startrev.t
test-convert-mtn.t
test-convert-splicemap.t test-convert-splicemap.t
test-convert-svn-sink.t test-convert-svn-sink.t
test-convert-tagsbranch-topology.t test-convert-tagsbranch-topology.t
test-convert.t test-convert.t
test-copy-move-merge.t test-copy-move-merge.t
test-copy.t test-copy.t
test-copytrace-heuristics.t test-copytrace-heuristics.t
test-custom-filters.t test-custom-filters.t

mercurial/changelog.py

l = l.replace('\\0', '\0') l = l.replace('\\0', '\0')
l = l.replace('\n', '') l = l.replace('\n', '')
k, v = stringutil.unescapestr(l).split(':', 1) k, v = stringutil.unescapestr(l).split(':', 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 = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)] items = [
_string_escape('%s:%s' % (k, pycompat.bytestr(d[k])))
for k in sorted(d)
]
return "\0".join(items) return "\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 '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n') return '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n')
class appender(object): class appender(object):
'''the changelog index must be updated last on disk, so we use this class '''the changelog index must be updated last on disk, so we use this class