<commit_before>#!/bin/sh
#
# imerge - help merge one file to another interactively
#
# Copyright (c) 2007 <NAME>
#
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
#
# The latest version of this script can be downloaded from a read-only
# subversion repository available at the following URL:
#
#     http://svn.idaemons.org/repos/imerge/
#
# Typically you just want the trunk/ subdirectory out of the whole
# source tree including all the past release snapshots and so on.
#
# $Id$

MYNAME="$(basename "$0")"
VERSION="0.2.1"

# workaround for ksh not having "local"
__f__ () { local __x__; }; eval __f__ 2>/dev/null || local () { for __x__; do case "$__x__" in *=*) $__x__ ;; esac; done }; unset __f__ __x__

usage () {
    {
        echo "imerge version $VERSION - help merge one file to another interactively"
        echo "usage: $MYNAME [ -x diff_flags ] [ -X sdiff_flags ] source destination"
    } >&2
    exit 1
}

call_diff () {
    diff ${DIFF_FLAGS} "$@"
}

call_sdiff () {
    sdiff ${SDIFF_FLAGS} "$@"
}

do_imerge () {
    local src dest merged ans

    src="$1";  shift
    dest="$1"; shift

    if [ -L "$src" ]; then
        echo "$MYNAME: $src => $dest: Source file is a symlink."
        return
    fi

    if [ -L "$dest" ]; then
        echo "$MYNAME: $src => $dest: Destination file is a symlink."
        return
    fi

    if [ ! -f "$src" ]; then
        echo "$MYNAME: $src => $dest: Source file is not found."

        echo -n "$MYNAME: Delete destination file? (N/y): "
        read ans </dev/tty
        case "${ans:-N}" in
            [Yy]*)
                rm -f "$dest"
                ;;
        esac

        return
    fi

    if [ ! -f "$dest" ]; then
        echo "$MYNAME: $src => $dest: Destination file is not found."

        echo -n "$MYNAME: Install source file? (N/y): "
        read ans </dev/tty
        case "${ans:-N}" in
            [Yy]*)
                cp -p "$src" "$dest"
                ;;
        esac

        return
    fi

    if cmp -s "$src" "$dest"; then
        return
    fi

    while :; do
        call_diff -L "destination: $(ls -l "$dest")" -L "source:      $(ls -l "$src")" "$dest" "$src" | "${PAGER:-more}"

        echo "$MYNAME: $src => $dest: Destination file differs from source file."

        echo -n "$MYNAME: Install source file, edit files, or merge them? (N/y/e/m): "
        read ans </dev/tty
        case "${ans:-N}" in
            [Yy]*)
                cp -p "$src" "$dest"
                return
                ;;
            [Ee]*)
                "$EDITOR" "$src" "$dest"
                ;;
            [Mm]*)
                break
                ;;
            *)
                return
                ;;
        esac
    done

    merged="$(mktemp "$dest.merged.XXXXXX")"

    finalize () {
        rm -f "$merged"
    }

    trap "finalize; exit 130" 1 2 3 15

    call_sdiff -o "$merged" "$src" "$dest"

    while :; do
        call_diff -L "destination: $(ls -l "$dest")" -L "merged:      $(ls -l "$merged")" "$dest" "$merged" | "${PAGER:-more}"

        echo -n "$MYNAME: Install merged file, edit files, or redo the merge? (N/y/e/m): "
        read ans </dev/tty
        case "${ans:-N}" in
            [Yy]*)
                cat "$merged" > "$dest"
                ;;
            [Ee]*)
                "$EDITOR" "$src" "$dest" "$merged"
                continue
                ;;
            [Mm]*)
                call_sdiff -o "$merged" "$src" "$dest"
                continue
                ;;
        esac<commit_msg>- Change answer options to more comprehensive letters. - Make each answer input a loop. - Replace 'echo -n' with 'printf "%s"' for BSD incompatible echo(1)   implementation. - Bump the version number to 0.2.2.<commit_after>#!/bin/sh
#
# imerge - help merge one file to another interactively
#
# Copyright (c) 2007 <NAME>
#
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
#
# The latest version of this script can be downloaded from a read-only
# subversion repository available at the following URL:
#
#     http://svn.idaemons.org/repos/imerge/
#
# Typically you just want the trunk/ subdirectory out of the whole
# source tree including all the past release snapshots and so on.
#
# $Id$

MYNAME="$(basename "$0")"
VERSION="0.2.2"

# workaround for ksh not having "local"
__f__ () { local __x__; }; eval __f__ 2>/dev/null || local () { for __x__; do case "$__x__" in *=*) $__x__ ;; esac; done }; unset __f__ __x__

usage () {
    {
        echo "imerge version $VERSION - help merge one file to another interactively"
        echo "usage: $MYNAME [ -x diff_flags ] [ -X sdiff_flags ] source destination"
    } >&2
    exit 1
}

call_diff () {
    diff ${DIFF_FLAGS} "$@"
}

call_sdiff () {
    sdiff ${SDIFF_FLAGS} "$@"
}

do_imerge () {
    local src dest merged ans endloop contloop line1 line2

    src="$1";  shift
    dest="$1"; shift

    if [ -L "$src" ]; then
        echo "$MYNAME: $src => $dest: Source file is a symlink."
        return
    fi

    if [ -L "$dest" ]; then
        echo "$MYNAME: $src => $dest: Destination file is a symlink."
        return
    fi

    if [ ! -f "$src" ]; then
        echo "$MYNAME: $src => $dest: Source file is not found."

        while printf "%s" "$MYNAME: Delete destination file, or skip? (d/S): "; do
            read ans </dev/tty
            case "${ans:-S}" in
                [Dd]*)
                    rm -f "$dest"
                    break
                    ;;
                [Ss]*)
                    break
                    ;;
            esac
        done

        return
    fi

    if [ ! -f "$dest" ]; then
        echo "$MYNAME: $src => $dest: Destination file is not found."

        while printf "%s" "$MYNAME: Install source file? (i/S): "; do
            read ans </dev/tty
            case "${ans:-S}" in
                [Ii]*)
                    cp -p "$src" "$dest"
                    break;
                    ;;
                [Ss]*)
                    break
                    ;;
            esac
        done

        return
    fi

    if cmp -s "$src" "$dest"; then
        return
    fi

    while :; do
        ls -l "$dest" "$src" | {
            read line1
            read line2
            call_diff -L "destination: $line1" -L "source:      $line2" "$dest" "$src"
        } | "${PAGER:-more}"

        echo "$MYNAME: $src => $dest: Destination file differs from source file."

        endloop=

        while printf "%s" "$MYNAME: Install source file, edit files, merge them, or skip? (i/e/m/S): "; do
            read ans </dev/tty
            case "${ans:-S}" in
                [Ii]*)
                    cp -p "$src" "$dest"
                    return
                    ;;
                [Ee]*)
                    "$EDITOR" "$src" "$dest"
                    break
                    ;;
                [Mm]*)
                    endloop=t
                    break
                    ;;
                [Ss]*)
                    return
                    ;;
            esac
        done

        [ -n "$endloop" ] && break
    done

    merged="$(mktemp "$dest.merged.XXXXXX")"

    finalize () {
        rm -f "$merged"
    }

    trap "finalize; exit 130" 1 2 3 15

    ls -l "$dest" "$src" | {
        read line1
        read line2
        echo "--- left (source):		$line1"
        echo "+++ right (destination):	$line2"
    }
    call_sdiff -o "$merged" "$src" "$dest"

    while :; do
        ls -l "$dest" "$src" | {
            read line1
            read line2
            call_diff -L "destination: $line1" -L "merged:      $line2" "$dest" "$merged"
        } | "${PAGER:-more}"

        contloop=

        while printf "%s" "$MYNAME: Install merged file, edit files, redo the merge, or skip? (i/e/r/S): "; do
            read ans </dev/tty
            case "${ans:-S}" in
                [Ii]*)
                    cat "$merged" > "$dest"
                    break
                    ;;
                [Ee]*)
                    "$EDITOR" "$src" "$dest" "$merged"
                    contloop=t
                    break
                    ;;
                [Rr]*)
                    echo "--- left (source):		$(ls -l "$src")"
                    echo "+++ right (destination):	$(ls -l "$dest")"
                    call_sdiff -o "$merged" "$src" "$dest"
                    contloop=t
                    break
                    ;;
                [Ss]*)
                    break
                    ;;
            esac
        done

        [ -n "$contloop" ] && continue
{'fraction_non_alphanumeric': 0.12029051293690422, 'fraction_numerical': 0.00581025873808443, 'mean_word_length': 1.7409803433689972, 'pattern_counts': {'":': 0, '<': 13, '<?xml version=': 0, '>': 21, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 2, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '1480861', 'n_tokens_mistral': 3391, 'n_tokens_neox': 3086, 'n_words': 1199}