# HG changeset patch
# User mpm@selenic.com
# Date 1123190861 28800
# Node ID 1fe3b14c704408d57e0b33efdaaf5adba6d87617
# Parent  a61728b58dc0ef6efdd2ff80f9bc73707b890cf7# Parent  9de3535caae8ebbf2cf58997850abbea1c627387
Merge with TAH



diff -r a61728b58dc0 -r 1fe3b14c7044 doc/hg.1.txt
diff -r a61728b58dc0 -r 1fe3b14c7044 hgeditor
--- a/hgeditor	Thu Aug 04 13:25:59 2005 -0800
+++ b/hgeditor	Thu Aug 04 13:27:41 2005 -0800
@@ -24,11 +24,11 @@
 HGTMP=""
 cleanup_exit() {
     rm -rf "$HGTMP"
-    exit $1
 }
 
 # Remove temporary files even if we get interrupted
-trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
 
 HGTMP="${TMPDIR-/tmp}/hgeditor.$RANDOM.$RANDOM.$RANDOM.$$"
 (umask 077 && mkdir "$HGTMP") || {
@@ -51,8 +51,8 @@
 grep -vE '^(HG: manifest hash .*)?$' "$1" >> "$HGTMP/msg"
 
 CHECKSUM=`md5sum "$HGTMP/msg"`
-$EDITOR "$HGTMP/msg" "$HGTMP/diff" || cleanup_exit $?
-echo "$CHECKSUM" | md5sum -c >/dev/null 2>&1 && cleanup_exit 13
+$EDITOR "$HGTMP/msg" "$HGTMP/diff" || exit $?
+echo "$CHECKSUM" | md5sum -c >/dev/null 2>&1 && exit 13
 
 if [ "$SIGN" == "1" ]; then
     {
@@ -64,4 +64,4 @@
     mv "$HGTMP/msg" "$1"
 fi
 
-cleanup_exit $?
+exit $?
diff -r a61728b58dc0 -r 1fe3b14c7044 hgmerge
--- a/hgmerge	Thu Aug 04 13:25:59 2005 -0800
+++ b/hgmerge	Thu Aug 04 13:27:41 2005 -0800
@@ -19,48 +19,36 @@
 cp "$LOCAL" "$LOCAL.orig"
 
 # Attempt to do a non-interactive merge
-if type merge > /dev/null ; then
-    if merge "$LOCAL" "$BASE" "$OTHER" 2> /dev/null; then
-	# success!
-	exit 0
-    fi
+if type merge > /dev/null 2>&1; then
+    merge "$LOCAL" "$BASE" "$OTHER" 2> /dev/null && exit 0
     cp "$LOCAL.orig" "$LOCAL"
-elif type diff3 > /dev/null ; then
-    if diff3 -m "$LOCAL.orig" "$BASE" "$OTHER" > "$LOCAL" ; then
-	# success
-	exit 0
-    fi
+elif type diff3 > /dev/null 2>&1; then
+    diff3 -m "$LOCAL.orig" "$BASE" "$OTHER" > "$LOCAL" && exit 0
     cp "$LOCAL.orig" "$LOCAL"
 fi
 
 if [ -n "$DISPLAY" ]; then
     # try using kdiff3, which is fairly nice
-    if type kdiff3 > /dev/null ; then
-	if kdiff3 --auto "$BASE" "$LOCAL" "$OTHER" -o "$LOCAL" ; then
-	    exit 0
-	else
-	    exit 1
-	fi
+    if type kdiff3 > /dev/null 2>&1; then
+	kdiff3 --auto "$BASE" "$LOCAL" "$OTHER" -o "$LOCAL" || exit 1
+	exit 0
     fi
 
     # try using tkdiff, which is a bit less sophisticated
-    if type tkdiff > /dev/null ; then
-	if tkdiff "$LOCAL" "$OTHER" -a "$BASE" -o "$LOCAL" ; then
-	    exit 0
-	else
-	    exit 1
-	fi
+    if type tkdiff > /dev/null 2>&1; then
+	tkdiff "$LOCAL" "$OTHER" -a "$BASE" -o "$LOCAL" || exit 1
+	exit 0
     fi
 fi
 
 # Attempt to do a merge with $EDITOR
-if type merge > /dev/null ; then
+if type merge > /dev/null 2>&1; then
     echo "conflicts detected in $LOCAL"
     merge "$LOCAL" "$BASE" "$OTHER" 2>/dev/null || $EDITOR "$LOCAL"
     exit 0
 fi
 
-if type diff3 > /dev/null ; then
+if type diff3 > /dev/null 2>&1; then
     echo "conflicts detected in $LOCAL"
     diff3 -m "$LOCAL.orig" "$BASE" "$OTHER" > "$LOCAL" || $EDITOR "$LOCAL"
     exit 0
@@ -69,29 +57,28 @@
 HGTMP=""
 cleanup_exit() {
     rm -rf "$HGTMP"
-    exit $1
 }
 
 # attempt to manually merge with diff and patch
-if type diff > /dev/null ; then
-    if type patch > /dev/null ; then
-	# Remove temporary files even if we get interrupted
-	trap "cleanup_exit 1" TERM KILL INT QUIT ABRT
+if type diff > /dev/null 2>&1 && type patch > /dev/null 2>&1; then
+    # Remove temporary files even if we get interrupted
+    trap "cleanup_exit" 0 # normal exit
+    trap "exit 1" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
 
-	HGTMP="${TMPDIR-/tmp}/hgmerge.$RANDOM.$RANDOM.$RANDOM.$$"
-	(umask 077 && mkdir "$HGTMP") || {
-	    echo "Could not create temporary directory! Exiting." 1>&2
-	    exit 1
-	}
+    HGTMP="${TMPDIR-/tmp}/hgmerge.$RANDOM.$RANDOM.$RANDOM.$$"
+    (umask 077 && mkdir "$HGTMP") || {
+	echo "Could not create temporary directory! Exiting." 1>&2
+	exit 1
+    }
 
-	diff -u "$BASE" "$OTHER" > "$HGTMP/diff"
-	if patch "$LOCAL" < "$HGTMP/diff" ; then
-	    cleanup_exit 0
-	else
-	    $EDITOR "$LOCAL" "$LOCAL.rej"
-	fi
-	cleanup_exit 1
+    diff -u "$BASE" "$OTHER" > "$HGTMP/diff"
+    if patch "$LOCAL" < "$HGTMP/diff"; then
+	exit 0
+    else
+	# If rejects are empty after using the editor, merge was ok
+	$EDITOR "$LOCAL" "$LOCAL.rej" && test -s "$LOCAL.rej" || exit 0
     fi
+    exit 1
 fi
 
 echo "hgmerge: unable to find merge, tkdiff, kdiff3, or diff+patch!"
diff -r a61728b58dc0 -r 1fe3b14c7044 mercurial/bdiff.c
diff -r a61728b58dc0 -r 1fe3b14c7044 mercurial/commands.py
--- a/mercurial/commands.py	Thu Aug 04 13:25:59 2005 -0800
+++ b/mercurial/commands.py	Thu Aug 04 13:27:41 2005 -0800
@@ -1419,7 +1419,14 @@
     except SignalInterrupt:
         u.warn("killed!\n")
     except KeyboardInterrupt:
-        u.warn("interrupted!\n")
+        try:
+            u.warn("interrupted!\n")
+        except IOError, inst:
+            if inst.errno == errno.EPIPE:
+                if u.debugflag:
+                    u.warn("\nbroken pipe\n")
+            else:
+                raise
     except IOError, inst:
         if hasattr(inst, "code"):
             u.warn("abort: %s\n" % inst)
diff -r a61728b58dc0 -r 1fe3b14c7044 mercurial/hg.py
diff -r a61728b58dc0 -r 1fe3b14c7044 mercurial/hgweb.py
diff -r a61728b58dc0 -r 1fe3b14c7044 mercurial/util.py
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/run-tests
--- a/tests/run-tests	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/run-tests	Thu Aug 04 13:27:41 2005 -0800
@@ -27,11 +27,11 @@
 HGTMP=""
 cleanup_exit() {
     rm -rf "$HGTMP"
-    exit $1
 }
 
 # Remove temporary files even if we get interrupted
-trap "cleanup_exit 255" TERM KILL INT QUIT ABRT
+trap "cleanup_exit" 0 # normal exit
+trap "exit 255" 1 2 3 6 15 # HUP INT QUIT ABRT TERM
 
 HGTMP="${TMPDIR-/tmp}/hgtests.$RANDOM.$RANDOM.$RANDOM.$$"
 (umask 077 && mkdir "$HGTMP") || {
@@ -61,7 +61,7 @@
     chmod 755 "$INST/bin/hg"
 else
     cat tests/install.err
-    cleanup_exit 1
+    exit 1
 fi
 cd "$TESTDIR"
 
@@ -97,17 +97,11 @@
 	if diff -u "$OUTOK" "$OUT" > /dev/null; then
 	    : no differences
 	else
-	    if FIXME="`grep 'FIXME' \"$TESTDIR/$1\"`"; then
-		echo
-		echo "$1 failed, but this is ignored because of:"
-		echo "$FIXME"
-	    else
-		cp "$OUT" "$ERR"
-		echo
-		echo "$1 output changed:"
-		diff -u "$OUTOK" "$ERR" || true
-		fail=1
-	    fi
+	    cp "$OUT" "$ERR"
+	    echo
+	    echo "$1 output changed:"
+	    diff -u "$OUTOK" "$ERR" || true
+	    fail=1
 	fi
     fi
 
@@ -132,6 +126,6 @@
 echo "Ran $tests tests, $failed failed."
 
 if [ $failed -gt 0 ] ; then
-    cleanup_exit 1
+    exit 1
 fi
-cleanup_exit 0
+exit 0
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-clone
--- a/tests/test-clone	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/test-clone	Thu Aug 04 13:27:41 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 mkdir a
 cd a
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-clone-failure
--- a/tests/test-clone-failure	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/test-clone-failure	Thu Aug 04 13:27:41 2005 -0800
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # No local source
 hg clone a b
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-merge-revert
--- a/tests/test-merge-revert	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/test-merge-revert	Thu Aug 04 13:27:41 2005 -0800
@@ -1,5 +1,4 @@
 #!/bin/sh
-# FIXME: This test may fail due to an uncritical bug in Mercurial.
 
 mkdir t
 cd t
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-merge-revert.out
--- a/tests/test-merge-revert.out	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/test-merge-revert.out	Thu Aug 04 13:27:41 2005 -0800
@@ -26,6 +26,7 @@
 + hg update
 merging file1
 + hg diff
+FIXME: This is a known bug:
 + hg status
 + hg id
 3aa14bbc23d9 tip
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-merge-revert2
--- a/tests/test-merge-revert2	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/test-merge-revert2	Thu Aug 04 13:27:41 2005 -0800
@@ -1,5 +1,4 @@
 #!/bin/sh
-# FIXME: This test may fail due to an uncritical bug in Mercurial.
 
 mkdir t
 cd t
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-merge-revert2.out
--- a/tests/test-merge-revert2.out	Thu Aug 04 13:25:59 2005 -0800
+++ b/tests/test-merge-revert2.out	Thu Aug 04 13:27:41 2005 -0800
@@ -44,6 +44,7 @@
 3aa14bbc23d9+ tip
 + hg revert
 + hg diff
+FIXME: This is a known bug:
 + hg status
 + hg id
 3aa14bbc23d9 tip
diff -r a61728b58dc0 -r 1fe3b14c7044 tests/test-merge5.out