Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.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 | b87a50b7125c |
line wrap: on
line diff
--- a/mercurial/merge.py Fri Apr 24 14:40:56 2009 -0700 +++ b/mercurial/merge.py Thu Apr 30 10:15:32 2009 -0500 @@ -147,8 +147,9 @@ if not a: # both differ from parent r = repo.ui.prompt( _(" conflicting flags for %s\n" - "(n)one, e(x)ec or sym(l)ink?") % f, "[nxl]", "n") - return r != "n" and r or '' + "(n)one, e(x)ec or sym(l)ink?") % f, + (_("&None"), _("E&xec"), _("Sym&link")), _("n")) + return r != _("n") and r or '' if m == a: return n # changed from m to n return m # changed from n to m @@ -219,7 +220,7 @@ if repo.ui.prompt( _(" local changed %s which remote deleted\n" "use (c)hanged version or (d)elete?") % f, - _("[cd]"), _("c")) == _("d"): + (_("&Changed"), _("&Delete")), _("c")) == _("d"): act("prompt delete", "r", f) act("prompt keep", "a", f) else: @@ -254,7 +255,7 @@ if repo.ui.prompt( _("remote changed %s which local deleted\n" "use (c)hanged version or leave (d)eleted?") % f, - _("[cd]"), _("c")) == _("c"): + (_("&Changed"), _("&Deleted")), _("c")) == _("c"): act("prompt recreating", "g", f, m2.flags(f)) else: act("remote created", "g", f, m2.flags(f))