Patchwork D3792: py3: slice over bytes to prevent getting ascii values

login
register
mail settings
Submitter phabricator
Date June 18, 2018, 11:02 a.m.
Message ID <cfeb87f3045f4dd1977a500821fcacfb@localhost.localdomain>
Download mbox | patch
Permalink /patch/32255/
State Not Applicable
Headers show

Comments

phabricator - June 18, 2018, 11:02 a.m.
pulkit updated this revision to Diff 9165.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3792?vs=9163&id=9165

REVISION DETAIL
  https://phab.mercurial-scm.org/D3792

AFFECTED FILES
  hgext/transplant.py
  mercurial/subrepo.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/subrepo.py b/mercurial/subrepo.py
--- a/mercurial/subrepo.py
+++ b/mercurial/subrepo.py
@@ -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':
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -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))