From: Markus Heidelberg <markus.heidelberg@web.de>
To: David Aguilar <davvid@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org, charles@hashpling.org
Subject: Re: [PATCH v4 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib
Date: Wed, 8 Apr 2009 07:33:00 +0200 [thread overview]
Message-ID: <200904080733.01030.markus.heidelberg@web.de> (raw)
In-Reply-To: <1239145213-76701-1-git-send-email-davvid@gmail.com>
David Aguilar, 08.04.2009:
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> +guess_merge_tool () {
> + tools="ecmerge"
> + if merge_mode; then
> + tools="$tools tortoisemerge"
ecmerge can now go to the block after "test -n $DISPLAY", so that in
this if-then-else really only merge-only and diff-only tools are
handled.
Then here it is
+ tools="tortoisemerge"
> + else
> + kompare="kompare"
and here
+ tools="kompare"
> + fi
> + if test -n "$DISPLAY"; then
> + if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
> + tools="meld opendiff kdiff3 $kompare tkdiff $tools"
> + tools="$tools xxdiff gvimdiff diffuse"
> + else
> + tools="opendiff kdiff3 $kompare tkdiff xxdiff $tools"
> + tools="$tools meld gvimdiff diffuse"
> + fi
And above ecmerge
And now that we remove the duplicated spaces afterwards anyway, we can
get rid of the double tools= and continue the line with \
if we adjust the sed command below...
> + fi
> + if echo "${VISUAL:-$EDITOR}" | grep emacs > /dev/null 2>&1; then
> + # $EDITOR is emacs so add emerge as a candidate
> + tools="$tools emerge vimdiff"
> + elif echo "${VISUAL:-$EDITOR}" | grep vim > /dev/null 2>&1; then
> + # $EDITOR is vim so add vimdiff as a candidate
> + tools="$tools vimdiff emerge"
> + else
> + tools="$tools emerge vimdiff"
> + fi
> + tools="$(echo "$tools" | sed -e 's/ +/ /g')"
Doesn't work for me. For me 's/ \+/ /g' works.
...like this: 's/[ ]\+/ /g' (space and tab)
OK, for clarification now:
if merge_mode; then
tools="tortoisemerge"
else
tools="kompare"
fi
if test -n "$DISPLAY"; then
if test -n "$GNOME_DESKTOP_SESSION_ID" ; then
tools="meld opendiff kdiff3 tkdiff xxdiff $tools \
gvimdiff diffuse ecmerge"
else
tools="opendiff kdiff3 tkdiff xxdiff meld $tools \
gvimdiff diffuse ecmerge"
fi
fi
[...]
tools="$(echo "$tools" | sed -e 's/[ ]\+/ /g')"
> + echo >&2 "merge tool candidates: $tools"
> +
> + # Loop over each candidate and stop when a valid merge tool is found.
> + for i in $tools
> + do
> + merge_tool_path="$(translate_merge_tool_path "$i")"
> + if type "$merge_tool_path" > /dev/null 2>&1; then
> + merge_tool="$i"
> + break
> + fi
> + done
> +
> + if test -z "$merge_tool" ; then
> + echo >&2 "No known merge resolution program available."
> + return 1
> + fi
> + echo "$merge_tool"
> +}
Looks good to me, after these last 2 issues are adjusted.
Maybe resend the whole series then, so that Junio can apply them easily?
Markus
next prev parent reply other threads:[~2009-04-08 5:34 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 23:00 [PATCH v4 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib David Aguilar
2009-04-08 5:33 ` Markus Heidelberg [this message]
2009-04-08 6:09 ` Junio C Hamano
2009-04-08 6:35 ` David Aguilar
2009-04-08 6:40 ` Charles Bailey
2009-04-08 6:56 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200904080733.01030.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).