comparison hgmerge @ 5660:3c80ecdc1bcd

Use VISUAL in addition to EDITOR when choosing the editor to use.

5659:3da652f2039c

LOCAL="$1"
BASE="$2"
OTHER="$3"

if [ -z "$EDITOR" ]; then
    EDITOR="vi"
fi

# find decent versions of our utilities, insisting on the GNU versions where we
# need to
MERGE="merge"

        # Also it doesn't return good error code
        $TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged
    fi
fi

# Attempt to do a merge with $EDITOR
if [ -n "$MERGE" -o -n "$DIFF3" ]; then
    echo "conflicts detected in $LOCAL"
    cp "$BACKUP" "$CHGTEST"
    case "$EDITOR" in
        "emacs")
            $EDITOR "$LOCAL" --eval '(condition-case nil (smerge-mode 1) (error nil))' || failure
            ;;
        *)
            $EDITOR "$LOCAL" || failure
            ;;
    esac
    # Some editors do not return meaningful error codes
    # Do not take any chances
    $TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged

    $DIFF -u "$BASE" "$OTHER" > "$HGTMP/diff" || :
    if $PATCH "$LOCAL" < "$HGTMP/diff"; then
        success
    else
        # If rejects are empty after using the editor, merge was ok
        $EDITOR "$LOCAL" "$LOCAL.rej" || failure
        $TEST -s "$LOCAL.rej" || success
    fi
    failure
fi

5660:3c80ecdc1bcd

LOCAL="$1"
BASE="$2"
OTHER="$3"

if [ -n "$VISUAL" ]; then
    EDIT_PROG="$VISUAL"
elif [ -n "$EDITOR" ]; then
    EDIT_PROG="$EDITOR"
else
    EDIT_PROG="vi"
fi

# find decent versions of our utilities, insisting on the GNU versions where we
# need to
MERGE="merge"

        # Also it doesn't return good error code
        $TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged
    fi
fi

# Attempt to do a merge with $EDIT_PROG
if [ -n "$MERGE" -o -n "$DIFF3" ]; then
    echo "conflicts detected in $LOCAL"
    cp "$BACKUP" "$CHGTEST"
    case "$EDIT_PROG" in
        "emacs")
            $EDIT_PROG "$LOCAL" --eval '(condition-case nil (smerge-mode 1) (error nil))' || failure
            ;;
        *)
            $EDIT_PROG "$LOCAL" || failure
            ;;
    esac
    # Some editors do not return meaningful error codes
    # Do not take any chances
    $TEST "$LOCAL" -nt "$CHGTEST" && conflicts_or_success || ask_if_merged

    $DIFF -u "$BASE" "$OTHER" > "$HGTMP/diff" || :
    if $PATCH "$LOCAL" < "$HGTMP/diff"; then
        success
    else
        # If rejects are empty after using the editor, merge was ok
        $EDIT_PROG "$LOCAL" "$LOCAL.rej" || failure
        $TEST -s "$LOCAL.rej" || success
    fi
    failure
fi