# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 1529318188 -19800 # Node ID c7eb9bce6041c8ae953f19961dd279ed9bce56d4 # Parent 365a78daf735a5f0310bda7eac4dbeb628a78e2e py3: slice over bytes to prevent getting ascii values Differential Revision: https://phab.mercurial-scm.org/D3792 diff -r 365a78daf735 -r c7eb9bce6041 hgext/transplant.py --- 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)) diff -r 365a78daf735 -r c7eb9bce6041 mercurial/subrepo.py --- 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':