# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1446495144 28800
# Node ID 859f453e8b4e2b42b6b6552b79c5c5e7e2fc1cf7
# Parent  00209e38e7d96248436ad9b807dead70422db12a
filemerge.prompt: separate out choice selection and action

This will make future patches cleaner.

diff -r 00209e38e7d9 -r 859f453e8b4e mercurial/filemerge.py
--- a/mercurial/filemerge.py	Mon Nov 02 12:25:15 2015 -0800
+++ b/mercurial/filemerge.py	Mon Nov 02 12:12:24 2015 -0800
@@ -175,9 +175,12 @@
     ui = repo.ui
     fd = fcd.path()
 
-    if ui.promptchoice(_(" no tool found to merge %s\n"
-                         "keep (l)ocal or take (o)ther?"
-                         "$$ &Local $$ &Other") % fd, 0):
+    index = ui.promptchoice(_(" no tool found to merge %s\n"
+                              "keep (l)ocal or take (o)ther?"
+                              "$$ &Local $$ &Other") % fd, 0)
+    choice = ['local', 'other'][index]
+
+    if choice == 'other':
         return _iother(repo, mynode, orig, fcd, fco, fca, toolconf)
     else:
         return _ilocal(repo, mynode, orig, fcd, fco, fca, toolconf)