( )⚙ D271 obsolete: use bytes() instead of str() so the node is bytes on py3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D271

obsolete: use bytes() instead of str() so the node is bytes on py3
ClosedPublic

Authored by durin42 on Aug 8 2017, 3:49 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG388901a15bfa: obsolete: use bytes() instead of str() so the node is bytes on py3
Summary

I'm not sure this is right, since this should either be bytes or str
to match what's going on in the revlog layer.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Aug 8 2017, 3:49 PM
quark accepted this revision.Aug 9 2017, 1:12 AM
yuja added a subscriber: yuja.Aug 9 2017, 9:57 AM
yuja added inline comments.
mercurial/obsolete.py
587

Why can't this be just bytes(prec) ?

I don't think str(prec).encode('ascii') is valid for binary node id.

durin42 retitled this revision from obsolete: use bytestr() instead of str() so the node is bytes on py3 to obsolete: use bytes() instead of str() so the node is bytes on py3.Aug 9 2017, 10:24 AM
durin42 added a child revision: D293: tests: fix simple heredoc print statements to work on Py3.
durin42 updated this revision to Diff 675.
durin42 marked an inline comment as done.Aug 9 2017, 10:24 AM
durin42 added inline comments.
mercurial/obsolete.py
587

I swear that didn't work before. But it does work, so yay!

durin42 marked an inline comment as done.Aug 9 2017, 10:51 AM
Closed by commit rHG388901a15bfa: obsolete: use bytes() instead of str() so the node is bytes on py3 (authored by durin42). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsolete.py (4 lines)

Diff 636

mercurial/obsolete.py

from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
node, node,
obsutil, obsutil,
phases, phases,
policy, policy,
pycompat,
util, util,
) )
parsers = policy.importmod(r'parsers') parsers = policy.importmod(r'parsers')
_pack = struct.pack _pack = struct.pack
_unpack = struct.unpack _unpack = struct.unpack
_calcsize = struct.calcsize _calcsize = struct.calcsize
for succ in succs: for succ in succs:
if len(succ) != 20: if len(succ) != 20:
raise ValueError(succ) raise ValueError(succ)
if prec in succs: if prec in succs:
raise ValueError(_('in-marker cycle with %s') % node.hex(prec)) raise ValueError(_('in-marker cycle with %s') % node.hex(prec))
metadata = tuple(sorted(metadata.iteritems())) metadata = tuple(sorted(metadata.iteritems()))
marker = (str(prec), tuple(succs), int(flag), metadata, date, parents) prec = bytes(pycompat.bytestr(prec))
yujaUnsubmitted
Done

Why can't this be just bytes(prec) ?

I don't think str(prec).encode('ascii') is valid for binary node id.

yuja: Why can't this be just `bytes(prec)` ? I don't think `str(prec).encode('ascii')` is valid for…
durin42AuthorUnsubmitted
Not Done

I swear that didn't work before. But it does work, so yay!

durin42: I swear that didn't work before. But it does work, so yay!
marker = (prec, tuple(succs), int(flag), metadata, date, parents)
return bool(self.add(transaction, [marker])) return bool(self.add(transaction, [marker]))
def add(self, transaction, markers): def add(self, transaction, markers):
"""Add new markers to the store """Add new markers to the store
Take care of filtering duplicate. Take care of filtering duplicate.
Return the number of new marker.""" Return the number of new marker."""
if self._readonly: if self._readonly: