All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Baumann <waste.manager@gmx.de>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Tom Tobin <korpios@korpios.com>, Dan Zwell <dzwell@gmail.com>,
	Jonathan del Strother <maillist@steelskies.com>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Add color to git-add--interactive diffs (Total different idea to solve the problem)
Date: Tue, 23 Oct 2007 07:34:01 +0200	[thread overview]
Message-ID: <20071023053401.GB9330@xp.machine.xx> (raw)
In-Reply-To: <Pine.LNX.4.64.0710230054130.25221@racer.site>

On Tue, Oct 23, 2007 at 12:55:44AM +0100, Johannes Schindelin wrote:
> Hi,
> 
> On Mon, 22 Oct 2007, Peter Baumann wrote:
> 
> > Wouldn't it make more sense to implement the diff coloring inside git 
> > apply so that you could use something like
> > 
> >         diff file1 file2|git apply --color
> > 
> > to make the generated diff with colors [1]? It already implements the
> > same semantic for generating a diffstat, using
> > 
> >         diff file1 file2|git apply --stat
> 
> No.  In both cases, "git diff" realises that the output is no terminal, 
> and switches off color generation.  (Just try with diff.color=true instead 
> of =auto.)
> 

I didn't mean git-diff here, instead I meant diff, so no coloring involved
on the diff side. The git-apply would be enhanced to do the coloring on
every diff it gets on its STDIN.

In the git-add -i case, the perl script whould do something along these
lines:

	foreach my $file (@files) {
		# read in the diff of a file *WITHOUT* using color
		@diff = `git-diff-files $file`;

		# ... store it away for later use in hunk selection ...


		# print out a nice colored diff for the user
		`echo @diff | git apply --color`
	}

Instead of handcoding the colorization in the git-add--interactive perl
script, just enhance git-apply to do the colorization *after the fact* for
you on _any_ patch you throw at it in its STDIN.

-Peter

  reply	other threads:[~2007-10-23  5:34 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-10-14  8:44 [PATCH] Add color to git-add--interactive diffs (Take 2: now without spurious line break!) Tom Tobin
2007-10-14 11:36 ` Wincent Colaiuta
2007-10-14 17:15   ` Johannes Schindelin
2007-10-14 17:55     ` Andreas Ericsson
2007-10-14 21:01     ` Wincent Colaiuta
2007-10-22 20:47 ` [PATCH] Add color to git-add--interactive diffs (Total different idea to solve the problem) Peter Baumann
2007-10-22 23:55   ` Johannes Schindelin
2007-10-23  5:34     ` Peter Baumann [this message]
2007-10-23 11:13       ` Johannes Schindelin

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=20071023053401.GB9330@xp.machine.xx \
    --to=waste.manager@gmx.de \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=dzwell@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=korpios@korpios.com \
    --cc=maillist@steelskies.com \
    --cc=spearce@spearce.org \
    /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.