All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Ping Yin <pkufranky@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [POC PATCH] diff options: Introduce --interactive
Date: Mon, 30 Mar 2009 02:04:39 -0700	[thread overview]
Message-ID: <20090330090438.GA18953@gmail.com> (raw)
In-Reply-To: <1238391670-4421-1-git-send-email-pkufranky@gmail.com>

On  0, Ping Yin <pkufranky@gmail.com> wrote:
> The new option --interactive introduces an interactive diff mode. Now we
> can choose to see the diff for a selected file.

I just tried it out.  Very cool.
It's exactly the functionality users have asked me about.

I just sent a for-the-future patch that teaches difftool
to tell difftool-helper that it shouldn't prompt when
you're using --interactive.

I noticed git-diff doesn't have a -i flag yet,
perhaps it could be the shorthand for --interactive?

(I'd have to change that for-the-future patch I just sent
 too since it also only checks for the long form...)

I like it.

> 
> This is a preparation to introduce the --tool option to launch the
> external diff tool for a selected file.

With both of our latest patches:

	git difftool --interactive <revargs>

does exactly what one would expect it to.


How are you envisioning --tool?  It'd be great if we didn't
need the perl wrapper, though something does need to set
GIT_EXTERNAL_DIFF/GIT_PAGER/etc... (that is, unless you have a
better way =))


> >> When the user types a number,  git-difftool-helper is launched to show
> >> the diff for the corresponding file.
> >
> > Cool.
> > I had two patches that I sent to the list for
> > git-difftool.perl.  If you're going to patch it then you might
> > want to base it on top of those.
> >
> When i try to code on git-difftool.perl, i find it is more appropriate to add
> the --interactive and then --tool options to git-diff itself. So here is a
> proof of concept patch based on next. What we should do next is to try to
> design a good UI.

I'll see if I can come up with any suggestions.
I liked it on the first test drive.


-- 

	David

       reply	other threads:[~2009-03-30  9:06 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1238391670-4421-1-git-send-email-pkufranky@gmail.com>
2009-03-30  9:04 ` David Aguilar [this message]
2009-03-30  9:38   ` [POC PATCH] diff options: Introduce --interactive Ping Yin

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=20090330090438.GA18953@gmail.com \
    --to=davvid@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=pkufranky@gmail.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.