Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert set of revset initial symbols back to bytes
authorYuya Nishihara <yuya@tcha.org>
Sun, 12 Mar 2017 17:10:14 -0700
changeset 31383 7556fe09cc48
parent 31382 c9fd842dc886
child 31384 fac5cd3b8673
py3: convert set of revset initial symbols back to bytes Otherwise tokenize() would fail due to comparison between unicode and bytes.
mercurial/revsetlang.py file | annotate | diff | comparison | revisions 
--- a/mercurial/revsetlang.py	Sun Mar 12 17:04:45 2017 -0700
+++ b/mercurial/revsetlang.py	Sun Mar 12 17:10:14 2017 -0700
@@ -46,12 +46,13 @@
 keywords = set(['and', 'or', 'not'])
 
 # default set of valid characters for the initial letter of symbols
-_syminitletters = set(
-    string.ascii_letters +
-    string.digits + pycompat.sysstr('._@')) | set(map(chr, xrange(128, 256)))
+_syminitletters = set(pycompat.iterbytestr(
+    string.ascii_letters.encode('ascii') +
+    string.digits.encode('ascii') +
+    '._@')) | set(map(pycompat.bytechr, xrange(128, 256)))
 
 # default set of valid characters for non-initial letters of symbols
-_symletters = _syminitletters | set(pycompat.sysstr('-/'))
+_symletters = _syminitletters | set(pycompat.iterbytestr('-/'))
 
 def tokenize(program, lookup=None, syminitletters=None, symletters=None):
     '''
Mercurial