threads / patch / 19280

patchgitk: use --textconv to generate diff text

Subject: [PATCH] gitk: use --textconv to generate diff text

## tl;dr

6 messages between May 11, 2009 and May 11, 2009. Diffs are folded; open one to read it.

replies: 5people: 4as markdown or json

Johannes Sixt· May 11, 2009, 07:18 UTC · lore

From: Johannes Sixt <j6t@kdbg.org>
Date: Tue, 28 Apr 2009 14:03:54 +0200

For the most part gitk's focus is on showing history and changes in a human readable form. For this reason, it makes sense to generate the patch text in the diff view using --textconv so that textconv drivers are used if they are defined.

gitk can also generate patches, but we do not use --textconv because such patches could not be applied.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 gitk-git/gitk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to gitk-git/gitk +1 −1

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 09eac46..a8a6022 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -7194,7 +7194,7 @@ proc getblobdiffs {ids} {
     global limitdiffs vfilelimit curview
     global diffencoding targetline diffnparents

-    set cmd [diffcmd $ids "-p -C --cc --no-commit-id -U$diffcontext"]
+    set cmd [diffcmd $ids "-p --textconv -C --cc --no-commit-id -U$diffcontext"]
     if {$ignorespace} {
 	append cmd " -w"
     }

-- 
1.6.3.1007.g03ec

Johannes Sixt· May 11, 2009, 07:34 UTC · re: Johannes Sixt · lore

Re: [PATCH] gitk: use --textconv to generate diff text

Johannes Sixt schrieb:

Show 7 quoted lines

> From: Johannes Sixt <j6t@kdbg.org>
> Date: Tue, 28 Apr 2009 14:03:54 +0200
> 
> For the most part gitk's focus is on showing history and changes in
> a human readable form. For this reason, it makes sense to generate
> the patch text in the diff view using --textconv so that textconv drivers
> are used if they are defined.

FWIW, I keep a few Word documents in git and use catdoc as textconv driver. This works pretty well. Git-gui doesn't show any textual changes (it treats the Word files as binary, and it has to), with this patch I can use gitk to preview the changes in the worktree and the index.

-- Hannes

Jeff King· May 11, 2009, 09:13 UTC · re: Johannes Sixt · lore

Re: [PATCH] gitk: use --textconv to generate diff text

On Mon, May 11, 2009 at 09:18:56AM +0200, Johannes Sixt wrote:

Show 9 quoted lines

> For the most part gitk's focus is on showing history and changes in
> a human readable form. For this reason, it makes sense to generate
> the patch text in the diff view using --textconv so that textconv drivers
> are used if they are defined.
> 
> gitk can also generate patches, but we do not use --textconv because
> such patches could not be applied.
> 
> Signed-off-by: Johannes Sixt <j6t@kdbg.org>

As the original author of the textconv code, I am in favor of this. So much so that I even posted basically the same patch before:

  http://article.gmane.org/gmane.comp.version-control.git/102523

I had trouble finding much discussion in the archive, but I think it may not have been taken because we were in release freeze (and textconv was a brand new feature in the release at the time).

-Peff

Junio C Hamano· May 11, 2009, 21:20 UTC · re: Jeff King · lore

Re: [PATCH] gitk: use --textconv to generate diff text

Jeff King <peff@peff.net> writes:

Show 13 quoted lines

> On Mon, May 11, 2009 at 09:18:56AM +0200, Johannes Sixt wrote:
>
>> For the most part gitk's focus is on showing history and changes in
>> a human readable form. For this reason, it makes sense to generate
>> the patch text in the diff view using --textconv so that textconv drivers
>> are used if they are defined.
>> 
>> gitk can also generate patches, but we do not use --textconv because
>> such patches could not be applied.
>> 
>> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
>
> As the original author of the textconv code, I am in favor of this.

I agree; I think textconv is meant for this kind of usage.

Paul Mackerras· May 11, 2009, 21:59 UTC · re: Jeff King · lore

Re: [PATCH] gitk: use --textconv to generate diff text

Jeff King writes:

Show 8 quoted lines

> As the original author of the textconv code, I am in favor of this. So
> much so that I even posted basically the same patch before:
> 
>   http://article.gmane.org/gmane.comp.version-control.git/102523
> 
> I had trouble finding much discussion in the archive, but I think it may
> not have been taken because we were in release freeze (and textconv was
> a brand new feature in the release at the time).

Which release did --textconv first appear in?

Paul.

Jeff King· May 11, 2009, 22:38 UTC · re: Paul Mackerras · lore

Re: [PATCH] gitk: use --textconv to generate diff text

On Tue, May 12, 2009 at 07:59:37AM +1000, Paul Mackerras wrote:

Show 5 quoted lines

> > I had trouble finding much discussion in the archive, but I think it may
> > not have been taken because we were in release freeze (and textconv was
> > a brand new feature in the release at the time).
> 
> Which release did --textconv first appear in?

v1.6.1

-Peff