# HG changeset patch
# User Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
# Date 1140558492 21600
# Node ID e22bbca2e82bd0bb1c2f1b1d237dce48cb3b2811
# Parent  4eea6a747c27b56227c2b92662880d60cd6eb24a
hgmerge: add and use ask_if_merged function

This patch, unlike the earlier ones, doesn't use unportable select builtin.



diff -r 4eea6a747c27 -r e22bbca2e82b hgmerge
--- a/hgmerge	Tue Feb 21 15:48:09 2006 -0600
+++ b/hgmerge	Tue Feb 21 15:48:12 2006 -0600
@@ -70,6 +70,18 @@
     exit 1
 }
 
+# Ask if the merge was successful
+ask_if_merged() {
+    while 1; do
+        echo "$LOCAL seems unchanged. Was the merge successful? [y/n]"
+        read answer
+        case answer in
+            y*|Y*) success;;
+            n*|N*) failure;;
+        esac
+    done
+}
+
 # Clean up when interrupted
 trap "failure" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
 
@@ -98,16 +110,7 @@
     # filemerge prefers the right by default
     $FILEMERGE -left "$OTHER" -right "$LOCAL" -ancestor "$BASE" -merge "$LOCAL"
     [ $? -ne 0 ] && echo "FileMerge failed to launch" && failure
-    if test "$LOCAL" -nt "$CHGTEST"
-    then
-        success
-    else
-        echo "$LOCAL seems unchanged. Was the merge successful?"
-        select answer in yes no
-        do
-            test "$answer" == "yes" && success || failure
-        done
-    fi
+    test "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged
     failure
 fi