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: bytestr() bytes to get bytechar while iterating on it
authorPulkit Goyal <7895pulkit@gmail.com>
Sat, 19 May 2018 18:51:14 +0530
changeset 38085 e887381e2976
parent 38084 86e0a4bede5d
child 38086 b95a6fb7ae66
py3: bytestr() bytes to get bytechar while iterating on it Iterating on bytes give you ascii values instead of bytechr so we need to wrap the bytes in pycompat.bytestr() to get bytechr while iterating. Differential Revision: https://phab.mercurial-scm.org/D3609
mercurial/patch.py file | annotate | diff | comparison | revisions
mercurial/templater.py file | annotate | diff | comparison | revisions 
--- a/mercurial/patch.py	Sat May 19 18:49:07 2018 +0530
+++ b/mercurial/patch.py	Sat May 19 18:51:14 2018 +0530
@@ -1946,7 +1946,7 @@
     """
     def deltahead(binchunk):
         i = 0
-        for c in binchunk:
+        for c in pycompat.bytestr(binchunk):
             i += 1
             if not (ord(c) & 0x80):
                 return i
--- a/mercurial/templater.py	Sat May 19 18:49:07 2018 +0530
+++ b/mercurial/templater.py	Sat May 19 18:51:14 2018 +0530
@@ -253,7 +253,8 @@
     p = parser.parser(elements)
     try:
         while pos < stop:
-            n = min((tmpl.find(c, pos, stop) for c in sepchars),
+            n = min((tmpl.find(c, pos, stop)
+                     for c in pycompat.bytestr(sepchars)),
                     key=lambda n: (n < 0, n))
             if n < 0:
                 yield ('string', unescape(tmpl[pos:stop]), pos)
Mercurial