This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7373

py3: pass a bytes value for "msg" to nouideprecwarn()
ClosedPublic

Authored by dlax on Nov 13 2019, 3:16 AM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc207c46a86b9: py3: pass a bytes value for "msg" to nouideprecwarn()
Summary

That function formats "msg" with the "version" value. On Python 3, this
leads to "TypeError: can only concatenate str (not "bytes") to str".

Also eliminate spurious strings concatenation in single-line
declarations.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

dlax created this revision.Nov 13 2019, 3:16 AM
pulkit accepted this revision.Nov 13 2019, 8:11 AM
This revision is now accepted and ready to land.Nov 13 2019, 8:11 AM
dlax added a commit: rHGc207c46a86b9: py3: pass a bytes value for "msg" to nouideprecwarn().Nov 13 2019, 9:00 AM
Closed by commit rHGc207c46a86b9: py3: pass a bytes value for "msg" to nouideprecwarn() (authored by dlax). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (2 lines)
Mmercurial/revlog.py (8 lines)

Diff 18051

mercurial/pure/parsers.py

def offset_type(offset, type): def offset_type(offset, type):
return int(int(offset) << 16 | type) return int(int(offset) << 16 | type)
class BaseIndexObject(object): class BaseIndexObject(object):
@property @property
def nodemap(self): def nodemap(self):
msg = "index.nodemap is deprecated, " "use index.[has_node|rev|get_rev]" msg = b"index.nodemap is deprecated, use index.[has_node|rev|get_rev]"
util.nouideprecwarn(msg, b'5.3', stacklevel=2) util.nouideprecwarn(msg, b'5.3', stacklevel=2)
return self._nodemap return self._nodemap
@util.propertycache @util.propertycache
def _nodemap(self): def _nodemap(self):
nodemap = revlogutils.NodeMap({nullid: nullrev}) nodemap = revlogutils.NodeMap({nullid: nullrev})
for r in range(0, len(self)): for r in range(0, len(self)):
n = self[r][7] n = self[r][7]

mercurial/revlog.py

indexformatv0 = struct.Struct(b">4l20s20s20s") indexformatv0 = struct.Struct(b">4l20s20s20s")
indexformatv0_pack = indexformatv0.pack indexformatv0_pack = indexformatv0.pack
indexformatv0_unpack = indexformatv0.unpack indexformatv0_unpack = indexformatv0.unpack
class revlogoldindex(list): class revlogoldindex(list):
@property @property
def nodemap(self): def nodemap(self):
msg = "index.nodemap is deprecated, " "use index.[has_node|rev|get_rev]" msg = b"index.nodemap is deprecated, use index.[has_node|rev|get_rev]"
util.nouideprecwarn(msg, b'5.3', stacklevel=2) util.nouideprecwarn(msg, b'5.3', stacklevel=2)
return self._nodemap return self._nodemap
@util.propertycache @util.propertycache
def _nodemap(self): def _nodemap(self):
nodemap = revlogutils.NodeMap({nullid: nullrev}) nodemap = revlogutils.NodeMap({nullid: nullrev})
for r in range(0, len(self)): for r in range(0, len(self)):
n = self[r][7] n = self[r][7]
def revs(self, start=0, stop=None): def revs(self, start=0, stop=None):
"""iterate over all rev in this revlog (from start to stop)""" """iterate over all rev in this revlog (from start to stop)"""
return storageutil.iterrevs(len(self), start=start, stop=stop) return storageutil.iterrevs(len(self), start=start, stop=stop)
@property @property
def nodemap(self): def nodemap(self):
msg = ( msg = (
"revlog.nodemap is deprecated, " b"revlog.nodemap is deprecated, "
"use revlog.index.[has_node|rev|get_rev]" b"use revlog.index.[has_node|rev|get_rev]"
) )
util.nouideprecwarn(msg, b'5.3', stacklevel=2) util.nouideprecwarn(msg, b'5.3', stacklevel=2)
return self.index.nodemap return self.index.nodemap
@property @property
def _nodecache(self): def _nodecache(self):
msg = "revlog._nodecache is deprecated, use revlog.index.nodemap" msg = b"revlog._nodecache is deprecated, use revlog.index.nodemap"
util.nouideprecwarn(msg, b'5.3', stacklevel=2) util.nouideprecwarn(msg, b'5.3', stacklevel=2)
return self.index.nodemap return self.index.nodemap
def hasnode(self, node): def hasnode(self, node):
try: try:
self.rev(node) self.rev(node)
return True return True
except KeyError: except KeyError: