( )⚙ D275 ui: refactor extractchoices so it doesn't break on Python 3

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D275

ui: refactor extractchoices so it doesn't break on Python 3
ClosedPublic

Authored by durin42 on Aug 8 2017, 3:49 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHGd880a6bcef2f: ui: refactor extractchoices so it doesn't break on Python 3
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 8 2017, 3:49 PM
quark accepted this revision.Aug 9 2017, 1:47 AM
Closed by commit rHGd880a6bcef2f: ui: refactor extractchoices so it doesn't break on Python 3 (authored by durin42). · Explain WhyAug 9 2017, 10:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (7 lines)

Diff 670

mercurial/ui.py

# Sadly, the prompt string may have been built with a filename # Sadly, the prompt string may have been built with a filename
# containing "$$" so let's try to find the first valid-looking # containing "$$" so let's try to find the first valid-looking
# prompt to start parsing. Sadly, we also can't rely on # prompt to start parsing. Sadly, we also can't rely on
# choices containing spaces, ASCII, or basically anything # choices containing spaces, ASCII, or basically anything
# except an ampersand followed by a character. # except an ampersand followed by a character.
m = re.match(br'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt) m = re.match(br'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt)
msg = m.group(1) msg = m.group(1)
choices = [p.strip(' ') for p in m.group(2).split('$$')] choices = [p.strip(' ') for p in m.group(2).split('$$')]
return (msg, def choicetuple(s):
[(s[s.index('&') + 1].lower(), s.replace('&', '', 1)) ampidx = s.index('&')
for s in choices]) return s[ampidx + 1:ampidx + 2].lower(), s.replace('&', '', 1)
return (msg, [choicetuple(s) for s in choices])
def promptchoice(self, prompt, default=0): def promptchoice(self, prompt, default=0):
"""Prompt user with a message, read response, and ensure it matches """Prompt user with a message, read response, and ensure it matches
one of the provided choices. The prompt is formatted as follows: one of the provided choices. The prompt is formatted as follows:
"would you like fries with that (Yn)? $$ &Yes $$ &No" "would you like fries with that (Yn)? $$ &Yes $$ &No"
The index of the choice is returned. Responses are case The index of the choice is returned. Responses are case