undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-mergetool: Make default selection of merge-tool more intelligent

Browse Source 
Make git-mergetool prefer meld under GNOME, and kdiff3 under KDE.  When
considering emerge and vimdiff, check $VISUAL and $EDITOR to see which the
user might prefer.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Cc: Josh Triplett <josh@freedesktop.org>
This commit is contained in:
Theodore Ts'o 2007-06-10 11:17:30 -04:00
parent 730b5b45fb
commit 301ac38b12
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
git-mergetool.sh
View File

@ -310,23 +310,35 @@ if test -z "$merge_tool"; then
fi fi
if test -z "$merge_tool" ; then if test -z "$merge_tool" ; then
if type kdiff3 >/dev/null 2>&1 && test -n "$DISPLAY"; then if test -n "$DISPLAY"; then
merge_tool="kdiff3"; merge_tool_candidates="kdiff3 tkdiff xxdiff meld gvimdiff"
elif type tkdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
merge_tool=tkdiff merge_tool_candidates="meld $merge_tool_candidates"
elif type xxdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then fi
merge_tool=xxdiff if test "$KDE_FULL_SESSION" = "true"; then
elif type meld >/dev/null 2>&1 && test -n "$DISPLAY"; then merge_tool_candidates="kdiff3 $merge_tool_candidates"
merge_tool=meld fi
elif type gvimdiff >/dev/null 2>&1 && test -n "$DISPLAY"; then fi
merge_tool=gvimdiff if echo "${VISUAL:-$EDITOR}" | grep 'emacs' > /dev/null 2>&1; then
elif type opendiff >/dev/null 2>&1; then merge_tool_candidates="$merge_tool_candidates emerge"
merge_tool=opendiff fi
elif type emacs >/dev/null 2>&1; then if echo "${VISUAL:-$EDITOR}" | grep 'vim' > /dev/null 2>&1; then
merge_tool=emerge merge_tool_candidates="$merge_tool_candidates vimdiff"
elif type vimdiff >/dev/null 2>&1; then fi
merge_tool=vimdiff merge_tool_candidates="$merge_tool_candidates opendiff emerge vimdiff"
else echo "merge tool candidates: $merge_tool_candidates"
for i in $merge_tool_candidates; do
if test $i = emerge ; then
cmd=emacs
else
cmd=$i
fi
if type $cmd > /dev/null 2>&1; then
merge_tool=$i
break
fi
done
if test -z "$merge_tool" ; then
echo "No available merge resolution programs available." echo "No available merge resolution programs available."
exit 1 exit 1
fi fi