[PATCH 2 of 3] merge: provide choices to ui.prompt()

[Steve Borho]

# HG changeset patch
# User Steve Borho <steve at borho.org>
# Date 1240980179 18000
# Node ID 4b4f4e848a84e4a2a0e0ecda28b1d6c2984b2d35
# Parent  1264366a42f88ed95499f95ef635dc107bfa9c22
merge: provide choices to ui.prompt()

diff -r 1264366a42f8 -r 4b4f4e848a84 mercurial/merge.py
--- a/mercurial/merge.py	Tue Apr 28 23:20:31 2009 -0500
+++ b/mercurial/merge.py	Tue Apr 28 23:42:59 2009 -0500
@@ -147,7 +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")
+                      "(n)one, e(x)ec or sym(l)ink?") % f,
+                     ((_("n"),_("none")), (_("e"),_("exec")),
+                             (_("l"),_("symlink"))), "n")
                 return r != "n" and r or ''
             if m == a:
                 return n # changed from m to n
@@ -219,7 +221,8 @@
                 if repo.ui.prompt(
                     _(" local changed %s which remote deleted\n"
                       "use (c)hanged version or (d)elete?") % f,
-                    _("[cd]"), _("c")) == _("d"):
+                     ((_("c"),_("changed")), (_("d"),_("delete"))),
+                    _("c")) == _("d"):
                     act("prompt delete", "r", f)
                 act("prompt keep", "a", f)
             else:
@@ -254,7 +257,8 @@
                 if repo.ui.prompt(
                     _("remote changed %s which local deleted\n"
                       "use (c)hanged version or leave (d)eleted?") % f,
-                    _("[cd]"), _("c")) == _("c"):
+                     ((_("c"),_("changed")), (_("d"),_("deleted"))),
+                    _("c")) == _("c"):
                     act("prompt recreating", "g", f, m2.flags(f))
         else:
             act("remote created", "g", f, m2.flags(f))