Skip to content

Commit

Permalink
mergetool--lib: Make style consistent with git
Browse files Browse the repository at this point in the history 
Use the predominant conditional style where "then" appears
alone on the line after the test expression.
Remove spaces after ">" output redirections.
Remove unnecessary parentheses around the kdiff3 commands.

Signed-off-by: David Aguilar <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>
  • Loading branch information
@davvid @gitster
davvid authored and gitster committed Aug 19, 2011
1 parent fdd7aa1 commit 240dc3e
Showing 1 changed file with 100 additions and 53 deletions.
153 changes: 100 additions & 53 deletions git-mergetool--lib.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ translate_merge_tool_path () {
}

check_unchanged () {
if test "$MERGED" -nt "$BACKUP"; then
if test "$MERGED" -nt "$BACKUP"
then
status=0
else
while true; do
while true
do
echo "$MERGED seems unchanged."
printf "Was the merge successful? [y/n] "
read answer
Expand All @@ -53,17 +55,20 @@ valid_tool () {
kdiff3 | meld | opendiff | p4merge | tkdiff | vimdiff | vimdiff2 | xxdiff)
;; # happy
kompare)
if ! diff_mode; then
if ! diff_mode
then
return 1
fi
;;
tortoisemerge)
if ! merge_mode; then
if ! merge_mode
then
return 1
fi
;;
*)
if test -z "$(get_merge_tool_cmd "$1")"; then
if test -z "$(get_merge_tool_cmd "$1")"
then
return 1
fi
;;
Expand All @@ -72,12 +77,14 @@ valid_tool () {

get_merge_tool_cmd () {
# Prints the custom command for a merge tool
if test -n "$1"; then
if test -n "$1"
then
merge_tool="$1"
else
merge_tool="$(get_merge_tool)"
fi
if diff_mode; then
if diff_mode
then
echo "$(git config difftool.$merge_tool.cmd ||
git config mergetool.$merge_tool.cmd)"
else
Expand All @@ -97,9 +104,11 @@ run_merge_tool () {

case "$1" in
araxis)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" -wait -merge -3 -a1 \
"$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
>/dev/null 2>&1
Expand All @@ -115,9 +124,11 @@ run_merge_tool () {
fi
;;
bc3)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \
-mergeoutput="$MERGED"
else
Expand All @@ -130,9 +141,11 @@ run_merge_tool () {
fi
;;
diffuse)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" \
"$LOCAL" "$MERGED" "$REMOTE" \
"$BASE" | cat
Expand All @@ -146,9 +159,11 @@ run_merge_tool () {
fi
;;
ecmerge)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \
--default --mode=merge3 --to="$MERGED"
else
Expand All @@ -162,8 +177,10 @@ run_merge_tool () {
fi
;;
emerge)
if merge_mode; then
if $base_present; then
if merge_mode
then
if $base_present
then
"$merge_tool_path" \
-f emerge-files-with-ancestor-command \
"$LOCAL" "$REMOTE" "$BASE" \
Expand All @@ -181,9 +198,11 @@ run_merge_tool () {
fi
;;
gvimdiff|vimdiff)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" -f -d -c "wincmd J" \
"$MERGED" "$LOCAL" "$BASE" "$REMOTE"
else
Expand All @@ -198,7 +217,8 @@ run_merge_tool () {
fi
;;
gvimdiff2|vimdiff2)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
"$merge_tool_path" -f -d -c "wincmd l" \
"$LOCAL" "$MERGED" "$REMOTE"
Expand All @@ -210,36 +230,39 @@ run_merge_tool () {
fi
;;
kdiff3)
if merge_mode; then
if $base_present; then
("$merge_tool_path" --auto \
if merge_mode
then
if $base_present
then
"$merge_tool_path" --auto \
--L1 "$MERGED (Base)" \
--L2 "$MERGED (Local)" \
--L3 "$MERGED (Remote)" \
-o "$MERGED" \
"$BASE" "$LOCAL" "$REMOTE" \
> /dev/null 2>&1)
>/dev/null 2>&1
else
("$merge_tool_path" --auto \
"$merge_tool_path" --auto \
--L1 "$MERGED (Local)" \
--L2 "$MERGED (Remote)" \
-o "$MERGED" \
"$LOCAL" "$REMOTE" \
> /dev/null 2>&1)
>/dev/null 2>&1
fi
status=$?
else
("$merge_tool_path" --auto \
"$merge_tool_path" --auto \
--L1 "$MERGED (A)" \
--L2 "$MERGED (B)" "$LOCAL" "$REMOTE" \
> /dev/null 2>&1)
>/dev/null 2>&1
fi
;;
kompare)
"$merge_tool_path" "$LOCAL" "$REMOTE"
;;
meld)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
check_unchanged
Expand All @@ -248,9 +271,11 @@ run_merge_tool () {
fi
;;
opendiff)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" "$LOCAL" "$REMOTE" \
-ancestor "$BASE" \
-merge "$MERGED" | cat
Expand All @@ -264,7 +289,8 @@ run_merge_tool () {
fi
;;
p4merge)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
$base_present || >"$BASE"
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
Expand All @@ -274,8 +300,10 @@ run_merge_tool () {
fi
;;
tkdiff)
if merge_mode; then
if $base_present; then
if merge_mode
then
if $base_present
then
"$merge_tool_path" -a "$BASE" \
-o "$MERGED" "$LOCAL" "$REMOTE"
else
Expand All @@ -288,7 +316,8 @@ run_merge_tool () {
fi
;;
tortoisemerge)
if $base_present; then
if $base_present
then
touch "$BACKUP"
"$merge_tool_path" \
-base:"$BASE" -mine:"$LOCAL" \
Expand All @@ -300,9 +329,11 @@ run_merge_tool () {
fi
;;
xxdiff)
if merge_mode; then
if merge_mode
then
touch "$BACKUP"
if $base_present; then
if $base_present
then
"$merge_tool_path" -X --show-merged-pane \
-R 'Accel.SaveAsMerged: "Ctrl-S"' \
-R 'Accel.Search: "Ctrl+F"' \
Expand All @@ -327,16 +358,20 @@ run_merge_tool () {
;;
*)
merge_tool_cmd="$(get_merge_tool_cmd "$1")"
if test -z "$merge_tool_cmd"; then
if merge_mode; then
if test -z "$merge_tool_cmd"
then
if merge_mode
then
status=1
fi
break
fi
if merge_mode; then
if merge_mode
then
trust_exit_code="$(git config --bool \
mergetool."$1".trustExitCode || echo false)"
if test "$trust_exit_code" = "false"; then
if test "$trust_exit_code" = "false"
then
touch "$BACKUP"
( eval $merge_tool_cmd )
check_unchanged
Expand All @@ -353,13 +388,16 @@ run_merge_tool () {
}

guess_merge_tool () {
if merge_mode; then
if merge_mode
then
tools="tortoisemerge"
else
tools="kompare"
fi
if test -n "$DISPLAY"; then
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
if test -n "$DISPLAY"
then
if test -n "$GNOME_DESKTOP_SESSION_ID"
then
tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
else
tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
Expand All @@ -380,7 +418,8 @@ guess_merge_tool () {
for i in $tools
do
merge_tool_path="$(translate_merge_tool_path "$i")"
if type "$merge_tool_path" > /dev/null 2>&1; then
if type "$merge_tool_path" >/dev/null 2>&1
then
echo "$i"
return 0
fi
Expand All @@ -393,12 +432,14 @@ guess_merge_tool () {
get_configured_merge_tool () {
# Diff mode first tries diff.tool and falls back to merge.tool.
# Merge mode only checks merge.tool
if diff_mode; then
if diff_mode
then
merge_tool=$(git config diff.tool || git config merge.tool)
else
merge_tool=$(git config merge.tool)
fi
if test -n "$merge_tool" && ! valid_tool "$merge_tool"; then
if test -n "$merge_tool" && ! valid_tool "$merge_tool"
then
echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
echo >&2 "Resetting to default..."
return 1
Expand All @@ -408,26 +449,31 @@ get_configured_merge_tool () {

get_merge_tool_path () {
# A merge tool has been set, so verify that it's valid.
if test -n "$1"; then
if test -n "$1"
then
merge_tool="$1"
else
merge_tool="$(get_merge_tool)"
fi
if ! valid_tool "$merge_tool"; then
if ! valid_tool "$merge_tool"
then
echo >&2 "Unknown merge tool $merge_tool"
exit 1
fi
if diff_mode; then
if diff_mode
then
merge_tool_path=$(git config difftool."$merge_tool".path ||
git config mergetool."$merge_tool".path)
else
merge_tool_path=$(git config mergetool."$merge_tool".path)
fi
if test -z "$merge_tool_path"; then
if test -z "$merge_tool_path"
then
merge_tool_path="$(translate_merge_tool_path "$merge_tool")"
fi
if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
! type "$merge_tool_path" > /dev/null 2>&1; then
! type "$merge_tool_path" >/dev/null 2>&1
then
echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
"'$merge_tool_path'"
exit 1
Expand All @@ -439,7 +485,8 @@ get_merge_tool () {
# Check if a merge tool has been configured
merge_tool=$(get_configured_merge_tool)
# Try to guess an appropriate merge tool if no tool has been set.
if test -z "$merge_tool"; then
if test -z "$merge_tool"
then
merge_tool="$(guess_merge_tool)" || exit
fi
echo "$merge_tool"
Expand Down

0 comments on commit 240dc3e

Please sign in to comment.