Mercurial > public > mercurial-scm > hg-stable
diff mercurial/filemerge.py @ 8259:98acfd1d2b08
ui: replace regexp pattern with sequence of choices
Use ampersands (&) to delineate the response char in each choice.
ui.prompt() responses are now explicitly case insensitive. GUIs
that subclass ui can generate dialogs from the full choice names.
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Thu, 30 Apr 2009 10:15:32 -0500 |
| parents | 46293a0c7e9f |
| children | bb9f13974d8e |
line wrap: on
line diff
--- a/mercurial/filemerge.py Fri Apr 24 14:40:56 2009 -0700 +++ b/mercurial/filemerge.py Thu Apr 30 10:15:32 2009 -0500 @@ -143,7 +143,7 @@ tool = "internal:local" if ui.prompt(_(" no tool found to merge %s\n" "keep (l)ocal or take (o)ther?") % fd, - _("[lo]"), _("l")) != _("l"): + (_("&Local"), _("&Other")), _("l")) != _("l"): tool = "internal:other" if tool == "internal:local": return 0 @@ -205,7 +205,7 @@ if filecmp.cmp(repo.wjoin(fd), back): if ui.prompt(_(" output file %s appears unchanged\n" "was merge successful (yn)?") % fd, - _("[yn]"), _("n")) != _("y"): + (_("&Yes"), _("&No")), _("n")) != _("y"): r = 1 if _toolbool(ui, tool, "fixeol"):