hgmerge
188 lines
| 4.9 KiB
| text/plain
|
TextLexer
|
r544 | #!/bin/sh | ||
|
r240 | # | ||
# hgmerge - default merge helper for Mercurial | ||||
# | ||||
# This tries to find a way to do three-way merge on the current system. | ||||
|
r1885 | # The result ought to end up in $1. Script is run in root directory of | ||
# repository. | ||||
|
r1883 | # | ||
# Environment variables set by Mercurial: | ||||
# HG_FILE name of file within repo | ||||
# HG_MY_NODE revision being merged | ||||
# HG_OTHER_NODE revision being merged | ||||
|
r240 | |||
set -e # bail out quickly on failure | ||||
|
r795 | LOCAL="$1" | ||
BASE="$2" | ||||
OTHER="$3" | ||||
|
r240 | |||
|
r795 | if [ -z "$EDITOR" ]; then | ||
EDITOR="vi" | ||||
fi | ||||
|
r304 | |||
|
r1434 | # find decent versions of our utilities, insisting on the GNU versions where we | ||
# need to | ||||
|
r1770 | MERGE="merge" | ||
DIFF3="gdiff3" | ||||
DIFF="gdiff" | ||||
PATCH="gpatch" | ||||
|
r1434 | |||
|
r1770 | type "$MERGE" >/dev/null 2>&1 || MERGE= | ||
type "$DIFF3" >/dev/null 2>&1 || DIFF3="diff3" | ||||
|
r1434 | $DIFF3 --version >/dev/null 2>&1 || DIFF3= | ||
|
r1770 | type "$DIFF" >/dev/null 2>&1 || DIFF="diff" | ||
type "$DIFF" >/dev/null 2>&1 || DIFF= | ||||
type "$PATCH" >/dev/null 2>&1 || PATCH="patch" | ||||
type "$PATCH" >/dev/null 2>&1 || PATCH= | ||||
|
r1434 | |||
|
r1699 | # find optional visual utilities | ||
|
r1770 | FILEMERGE="/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge" | ||
KDIFF3="kdiff3" | ||||
TKDIFF="tkdiff" | ||||
|
r1774 | MELD="meld" | ||
|
r1699 | |||
|
r1770 | type "$FILEMERGE" >/dev/null 2>&1 || FILEMERGE= | ||
type "$KDIFF3" >/dev/null 2>&1 || KDIFF3= | ||||
type "$TKDIFF" >/dev/null 2>&1 || TKDIFF= | ||||
|
r1774 | type "$MELD" >/dev/null 2>&1 || MELD= | ||
|
r1699 | |||
|
r2051 | # Hack for Solaris | ||
TEST="/usr/bin/test" | ||||
type "$TEST" >/dev/null 2>&1 || TEST="/bin/test" | ||||
type "$TEST" >/dev/null 2>&1 || TEST="test" | ||||
|
r1701 | # random part of names | ||
|
r1770 | RAND="$RANDOM$RANDOM" | ||
|
r1701 | |||
|
r1700 | # temporary directory for diff+patch merge | ||
|
r1797 | HGTMP="${TMPDIR-/tmp}/hgmerge.$RAND" | ||
|
r1701 | |||
# backup file | ||||
BACKUP="$LOCAL.orig.$RAND" | ||||
# file used to test for file change | ||||
CHGTEST="$LOCAL.chg.$RAND" | ||||
|
r1700 | |||
# put all your required cleanup here | ||||
cleanup() { | ||||
|
r1701 | rm -f "$BACKUP" "$CHGTEST" | ||
|
r1700 | rm -rf "$HGTMP" | ||
} | ||||
# functions concerning program exit | ||||
success() { | ||||
cleanup | ||||
exit 0 | ||||
} | ||||
failure() { | ||||
echo "merge failed" 1>&2 | ||||
|
r1701 | mv "$BACKUP" "$LOCAL" | ||
|
r1700 | cleanup | ||
exit 1 | ||||
} | ||||
|
r1771 | # Ask if the merge was successful | ||
ask_if_merged() { | ||||
|
r1797 | while true; do | ||
echo "$LOCAL seems unchanged." | ||||
echo "Was the merge successful? [y/n]" | ||||
|
r1771 | read answer | ||
|
r1797 | case "$answer" in | ||
|
r1771 | y*|Y*) success;; | ||
n*|N*) failure;; | ||||
esac | ||||
done | ||||
} | ||||
|
r1700 | # Clean up when interrupted | ||
trap "failure" 1 2 3 6 15 # HUP INT QUIT ABRT TERM | ||||
|
r1701 | # Back up our file (and try hard to keep the mtime unchanged) | ||
mv "$LOCAL" "$BACKUP" | ||||
cp "$BACKUP" "$LOCAL" | ||||
|
r240 | |||
# Attempt to do a non-interactive merge | ||||
|
r1770 | if [ -n "$MERGE" -o -n "$DIFF3" ]; then | ||
if [ -n "$MERGE" ]; then | ||||
$MERGE "$LOCAL" "$BASE" "$OTHER" 2> /dev/null && success | ||||
elif [ -n "$DIFF3" ]; then | ||||
$DIFF3 -m "$BACKUP" "$BASE" "$OTHER" > "$LOCAL" && success | ||||
fi | ||||
if [ $? -gt 1 ]; then | ||||
echo "automatic merge failed! Exiting." 1>&2 | ||||
|
r1700 | failure | ||
|
r1434 | fi | ||
|
r240 | fi | ||
|
r1664 | # on MacOS X try FileMerge.app, shipped with Apple's developer tools | ||
|
r1699 | if [ -n "$FILEMERGE" ]; then | ||
|
r1701 | cp "$BACKUP" "$LOCAL" | ||
cp "$BACKUP" "$CHGTEST" | ||||
|
r1664 | # filemerge prefers the right by default | ||
|
r1701 | $FILEMERGE -left "$OTHER" -right "$LOCAL" -ancestor "$BASE" -merge "$LOCAL" | ||
[ $? -ne 0 ] && echo "FileMerge failed to launch" && failure | ||||
|
r2051 | $TEST "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged | ||
|
r1647 | fi | ||
|
r303 | if [ -n "$DISPLAY" ]; then | ||
# try using kdiff3, which is fairly nice | ||||
|
r1699 | if [ -n "$KDIFF3" ]; then | ||
|
r1798 | $KDIFF3 --auto "$BASE" "$BACKUP" "$OTHER" -o "$LOCAL" || failure | ||
|
r1770 | success | ||
|
r240 | fi | ||
|
r303 | # try using tkdiff, which is a bit less sophisticated | ||
|
r1699 | if [ -n "$TKDIFF" ]; then | ||
|
r1798 | $TKDIFF "$BACKUP" "$OTHER" -a "$BASE" -o "$LOCAL" || failure | ||
|
r1770 | success | ||
|
r240 | fi | ||
|
r1774 | |||
if [ -n "$MELD" ]; then | ||||
cp "$BACKUP" "$CHGTEST" | ||||
# protect our feet - meld allows us to save to the left file | ||||
cp "$BACKUP" "$LOCAL.tmp.$RAND" | ||||
# Meld doesn't have automatic merging, so to reduce intervention | ||||
# use the file with conflicts | ||||
$MELD "$LOCAL.tmp.$RAND" "$LOCAL" "$OTHER" || failure | ||||
# Also it doesn't return good error code | ||||
|
r2051 | $TEST "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged | ||
|
r1774 | fi | ||
|
r240 | fi | ||
# Attempt to do a merge with $EDITOR | ||||
|
r1772 | if [ -n "$MERGE" -o -n "$DIFF3" ]; then | ||
|
r242 | echo "conflicts detected in $LOCAL" | ||
|
r1772 | cp "$BACKUP" "$CHGTEST" | ||
$EDITOR "$LOCAL" || failure | ||||
# Some editors do not return meaningful error codes | ||||
# Do not take any chances | ||||
|
r2051 | $TEST "$LOCAL" -nt "$CHGTEST" && success || ask_if_merged | ||
|
r240 | fi | ||
# attempt to manually merge with diff and patch | ||||
|
r1434 | if [ -n "$DIFF" -a -n "$PATCH" ]; then | ||
|
r795 | |||
|
r829 | (umask 077 && mkdir "$HGTMP") || { | ||
|
r1770 | echo "Could not create temporary directory $HGTMP" 1>&2 | ||
failure | ||||
|
r829 | } | ||
|
r795 | |||
|
r1434 | $DIFF -u "$BASE" "$OTHER" > "$HGTMP/diff" || : | ||
if $PATCH "$LOCAL" < "$HGTMP/diff"; then | ||||
|
r1770 | success | ||
|
r829 | else | ||
|
r1770 | # If rejects are empty after using the editor, merge was ok | ||
|
r1772 | $EDITOR "$LOCAL" "$LOCAL.rej" || failure | ||
|
r2051 | $TEST -s "$LOCAL.rej" || success | ||
|
r240 | fi | ||
|
r1700 | failure | ||
|
r240 | fi | ||
|
r1773 | echo | ||
echo "hgmerge: unable to find any merge utility!" | ||||
echo "supported programs:" | ||||
|
r1774 | echo "merge, FileMerge, tkdiff, kdiff3, meld, diff+patch" | ||
|
r1773 | echo | ||
|
r1700 | failure | ||