Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/revlog.py @ 43663:c207c46a86b9
py3: pass a bytes value for "msg" to nouideprecwarn()
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.
Differential Revision: https://phab.mercurial-scm.org/D7373
author | Denis Laxalde <denis.laxalde@logilab.fr> |
---|---|
date | Wed, 13 Nov 2019 09:09:42 +0100 |
parents | f5991fd7cca7 |
children | 2e30d7df4809 |
comparison
equal
deleted
inserted
replaced
43662:c5f6f58f6c71 | 43663:c207c46a86b9 |
---|---|
205 | 205 |
206 | 206 |
207 class revlogoldindex(list): | 207 class revlogoldindex(list): |
208 @property | 208 @property |
209 def nodemap(self): | 209 def nodemap(self): |
210 msg = "index.nodemap is deprecated, " "use index.[has_node|rev|get_rev]" | 210 msg = b"index.nodemap is deprecated, use index.[has_node|rev|get_rev]" |
211 util.nouideprecwarn(msg, b'5.3', stacklevel=2) | 211 util.nouideprecwarn(msg, b'5.3', stacklevel=2) |
212 return self._nodemap | 212 return self._nodemap |
213 | 213 |
214 @util.propertycache | 214 @util.propertycache |
215 def _nodemap(self): | 215 def _nodemap(self): |
655 return storageutil.iterrevs(len(self), start=start, stop=stop) | 655 return storageutil.iterrevs(len(self), start=start, stop=stop) |
656 | 656 |
657 @property | 657 @property |
658 def nodemap(self): | 658 def nodemap(self): |
659 msg = ( | 659 msg = ( |
660 "revlog.nodemap is deprecated, " | 660 b"revlog.nodemap is deprecated, " |
661 "use revlog.index.[has_node|rev|get_rev]" | 661 b"use revlog.index.[has_node|rev|get_rev]" |
662 ) | 662 ) |
663 util.nouideprecwarn(msg, b'5.3', stacklevel=2) | 663 util.nouideprecwarn(msg, b'5.3', stacklevel=2) |
664 return self.index.nodemap | 664 return self.index.nodemap |
665 | 665 |
666 @property | 666 @property |
667 def _nodecache(self): | 667 def _nodecache(self): |
668 msg = "revlog._nodecache is deprecated, use revlog.index.nodemap" | 668 msg = b"revlog._nodecache is deprecated, use revlog.index.nodemap" |
669 util.nouideprecwarn(msg, b'5.3', stacklevel=2) | 669 util.nouideprecwarn(msg, b'5.3', stacklevel=2) |
670 return self.index.nodemap | 670 return self.index.nodemap |
671 | 671 |
672 def hasnode(self, node): | 672 def hasnode(self, node): |
673 try: | 673 try: |