Git development
 help / color / mirror / Atom feed
From: Paul Mackerras <paulus@samba.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [RFD] Strange patch formats (aka tricks with unified diffs)..
Date: Fri, 13 Apr 2007 15:43:08 +1000	[thread overview]
Message-ID: <17951.6252.457936.428919@cargo.ozlabs.ibm.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0704121436050.4061@woody.linux-foundation.org>

Linus Torvalds writes:

>  - bug Paul about alternate diff viewing capabilities in gitk. He's cc'd 
>    here. A way to make the "diff" pane show just the new one, the old one, 
>    or even both side-by-side with some mousy interface?

Showing just the old lines, or just the new lines, would be dead easy,
since the Tk text widget has an "elide" option on tagged ranges of
text that effectively removes them from the display.  So I don't even
have to change the contents of the text widget, merely the display
options associated with the tags that I already have attached to the
old and new lines (that's how they get their color).

Side-by-side would be more challenging.

Alternatively I could provide a field where you can put in a filter
command to be put between the diff generator and the display parser.

Have you seen what dirdiff can do with displaying diffs?  You can
expose more context, move old and new lines up and down (but not in a
manner which changes the meaning of the diff), and split context lines
into old/new pairs, all with the mouse.  This lets me rearrange a diff
to make it more visually meaningful and understandable.  I could
import that stuff into gitk, since dirdiff is also written in Tcl/Tk.

Paul.

  parent reply	other threads:[~2007-04-13  5:44 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-04-12 21:58 [RFD] Strange patch formats (aka tricks with unified diffs) Linus Torvalds
2007-04-12 23:02 ` Junio C Hamano
2007-04-13  5:38 ` Marco Costalba
2007-04-17 18:02   ` Marco Costalba
2007-04-13  5:43 ` Paul Mackerras [this message]
2007-04-13  6:07   ` Martin Langhoff
2007-04-13  6:35     ` Junio C Hamano
2007-04-13  7:01       ` Martin Langhoff
2007-04-14  8:59       ` Johannes Schindelin
2007-04-14  9:55         ` Junio C Hamano
2007-04-14 10:09           ` Jeff King
2007-04-13 15:16   ` Linus Torvalds
2007-04-18  1:44     ` Paul Mackerras
2007-04-18  4:02       ` Linus Torvalds
2007-04-13  8:10 ` Matthias Lederhofer
2007-04-13 15:00   ` Linus Torvalds

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=17951.6252.457936.428919@cargo.ozlabs.ibm.com \
    --to=paulus@samba.org \
    --cc=git@vger.kernel.org \
    --cc=torvalds@linux-foundation.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox