From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Paul Mackerras <paulus@samba.org>,
peff@peff.net, sam@vilain.net, git@vger.kernel.org
Subject: Re: [PATCH] gitk: Use git-difftool for external diffs
Date: Fri, 20 Nov 2009 10:55:24 -0800 [thread overview]
Message-ID: <20091120185522.GC56351@gmail.com> (raw)
In-Reply-To: <7vhbsp7htq.fsf@alter.siamese.dyndns.org>
On Thu, Nov 19, 2009 at 11:53:37PM -0800, Junio C Hamano wrote:
> Paul Mackerras <paulus@samba.org> writes:
>
> > I have no problem with using git difftool if the underlying git is new
> > enough, I just don't want gitk to explode when it isn't.
>
> I somehow doubt there are many users who use pre 1.6.3 git but keep their
> gitk separately updated to very recent version, so personally I wouldn't
> worry too much about this.
>
> > Also, I don't think we should remove the ability for the user to
> > choose which external diff tool to use.
>
> This is a larger concern. Does "difftool" allow use of an arbitrary tool
> like how gitk does (I have a suspicion that it is not as flexible)?
difftool supports arbitrary tools through configuration.
For arbitrary tools we set difftool.$name.cmd and
diff.tool = $name.
If gitk were to have a difftool paradigm then it might
be nice to have a text field mapped to the diff.tool variable.
The patch didn't address the diff.tool configuration variable
so that's a concern if we are to pursue difftool further.
The argument in favor of difftool is one of user
expectations. From a user's POV it ~seems~ desirable for
gitk to honor difftool configurations. The easiest way for
gitk to do that is to use git-difftool and not worry about
the details of how arbitrary tools are setup.
Later work could be done to provide UI for setting up
arbitrary tools inside of gitk. My gut feeling
is that gitk isn't a git config editor.
This is why the difftool patch took the minimalist approach.
It trusts the user to have things configured to their
liking and trusts git-difftool to do the right thing
when no such configuration exists.
I think it's a question of whether this is something we'd
want to change. It certainly doesn't bother me either way.
I might be the only person who'd notice such small details
so my vote-in-code is with my v2 $TMPDIR patch until someone
else thinks that using difftool inside of gitk is a good idea.
At which point I would probably pursue it with the minimalist
approach first and then gradually add UI for the pertinent
git config variables.
Just my .02,
--
David
next prev parent reply other threads:[~2009-11-20 18:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-16 3:12 [PATCH] gitk: Use git-difftool for external diffs David Aguilar
2009-11-19 9:03 ` Paul Mackerras
2009-11-19 19:39 ` David Aguilar
2009-11-19 22:21 ` Paul Mackerras
2009-11-20 7:53 ` Junio C Hamano
2009-11-20 18:55 ` David Aguilar [this message]
2009-11-20 20:51 ` Junio C Hamano
2009-11-21 21:47 ` David Aguilar
2009-11-20 23:33 ` Markus Heidelberg
2009-12-30 3:13 ` Nanako Shiraishi
2009-12-30 7:49 ` Junio C Hamano
2009-12-31 7:16 ` David Aguilar
2009-12-31 20:37 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2010-03-27 21:45 David Aguilar
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091120185522.GC56351@gmail.com \
--to=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=paulus@samba.org \
--cc=peff@peff.net \
--cc=sam@vilain.net \
/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.
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 NNTP newsgroup(s).