D3792: py3: slice over bytes to prevent getting ascii values
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Mon Jun 18 11:02:24 UTC 2018
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
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))
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list