From: David Aguilar <davvid@gmail.com>
To: Markus Heidelberg <markus.heidelberg@web.de>
Cc: gitster@pobox.com, git@vger.kernel.org, benji@silverinsanity.com,
charles@hashpling.org
Subject: Re: [PATCH v2 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib
Date: Tue, 7 Apr 2009 00:07:46 -0700 [thread overview]
Message-ID: <20090407070745.GA3684@gmail.com> (raw)
In-Reply-To: <200904070137.17716.markus.heidelberg@web.de>
On 0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> David Aguilar, 06.04.2009:
> > diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
>
> > +run_merge_tool () {
> > + base_present="$2"
> > + if diff_mode; then
> > + base_present="false"
> > + fi
> > + if test -z "$base_present"; then
> > + base_present="true"
> > + fi
>
> The second if is never true, so isn't necessary. run_merge_tool() is
> called with $2 = true or false in mergetool and $2 = "" in difftool.
>
> But I wonder, if it would be better to change the proceeding in the
> case-esac in the next hunk below:
>
> Currently it is:
> if $base_present
> mergetool with base
> else
> if $merge_mode
> mergetool without base
> else
> difftool
> fi
> fi
>
> Maybe better:
> if $merge_mode
> if $base_present
> mergetool with base
> else
> mergetool without base
> fi
> else
> difftool
> fi
>
> Then the first if can vanish as well and $base_present doesn't have to
> be set to false in diff_mode.
>
> And check_unchanged() doesn't have to be called in diff_mode any more,
> $status could be set to 0 by default and doesn't have to be touched when
> in diff_mode. Only in merge_mode git-mergetool has to know, whether the
> merge went fine.
>
> Then it will be:
> if $merge_mode
> touch $BACKUP
> if $base_present
> mergetool with base
> else
> mergetool without base
> fi
> check_unchanged
> else
> difftool
> fi
>
> or:
> if $merge_mode
> if $base_present
> mergetool with base
> else
> mergetool without base
> fi
> status=$?
> else
> difftool
> fi
>
> Sorry for coming so late with this.
>
Nah, I like your suggestion much better.
> > + if echo "${VISUAL:-$EDITOR}" | grep emacs > /dev/null 2>&1; then
> > + # $EDITOR is emacs so add emerge as a candidate
> > + tools="$tools emerge opendiff vimdiff"
> > + elif echo "${VISUAL:-$EDITOR}" | grep vim > /dev/null 2>&1; then
> > + # $EDITOR is vim so add vimdiff as a candidate
> > + tools="$tools vimdiff opendiff emerge"
> > + else
> > + tools="$tools opendiff emerge vimdiff"
> > + fi
>
> Why is opendiff here? I thought the graphical tools should go above.
> Doesn't have Mac OS $DISPLAY set?
Good catch..
Ahh.. shoot I broke the foo.<tool>.path test on Mac OS
(no tkdiff to override there).
I'll have to redo that to use test-tool.
--
David
prev parent reply other threads:[~2009-04-07 7:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 9:30 [PATCH v2 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib David Aguilar
2009-04-06 23:37 ` Markus Heidelberg
2009-04-07 7:07 ` David Aguilar [this message]
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=20090407070745.GA3684@gmail.com \
--to=davvid@gmail.com \
--cc=benji@silverinsanity.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.de \
/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).