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: slice over bytes to prevent getting ascii values
authorPulkit Goyal <7895pulkit@gmail.com>
Mon, 18 Jun 2018 16:06:28 +0530
changeset 38370 c7eb9bce6041
parent 38369 365a78daf735
child 38371 fb4813304c5f
py3: slice over bytes to prevent getting ascii values Differential Revision: https://phab.mercurial-scm.org/D3792
hgext/transplant.py file | annotate | diff | comparison | revisions
mercurial/subrepo.py file | annotate | diff | comparison | revisions 
--- a/hgext/transplant.py	Mon Jun 18 16:06:01 2018 +0530
+++ b/hgext/transplant.py	Mon Jun 18 16:06:28 2018 +0530
@@ -523,7 +523,8 @@
         displayer.show(repo[node])
         action = None
         while not action:
-            action = 'ynmpcq?'[ui.promptchoice(prompt)]
+            choice = ui.promptchoice(prompt)
+            action = 'ynmpcq?'[choice:choice + 1]
             if action == '?':
                 for c, t in ui.extractchoices(prompt)[1]:
                     ui.write('%s: %s\n' % (c, t))
--- a/mercurial/subrepo.py	Mon Jun 18 16:06:01 2018 +0530
+++ b/mercurial/subrepo.py	Mon Jun 18 16:06:28 2018 +0530
@@ -1695,7 +1695,7 @@
             tab = line.find('\t')
             if tab == -1:
                 continue
-            status, f = line[tab - 1], line[tab + 1:]
+            status, f = line[tab - 1:tab], line[tab + 1:]
             if status == 'M':
                 modified.append(f)
             elif status == 'A':
Mercurial