{"thread":{"id":"19280","subject":"[PATCH] gitk: use --textconv to generate diff text","startedAt":"2009-05-11T07:18:56Z","lastAt":"2009-05-11T22:38:47Z","messageCount":6,"participants":["Johannes Sixt","Jeff King","Junio C Hamano","Paul Mackerras"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"113518","messageId":"4A07D160.9020709@viscovery.net","threadId":"19280","inReplyTo":null,"subject":"[PATCH] gitk: use --textconv to generate diff text","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-05-11T07:18:56Z","receivedAt":"2009-05-11T07:18:56Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"From: Johannes Sixt \nDate: Tue, 28 Apr 2009 14:03:54 +0200\n\nFor the most part gitk's focus is on showing history and changes in\na human readable form. For this reason, it makes sense to generate\nthe patch text in the diff view using --textconv so that textconv drivers\nare used if they are defined.\n\ngitk can also generate patches, but we do not use --textconv because\nsuch patches could not be applied.\n\nSigned-off-by: Johannes Sixt \n---\n gitk-git/gitk | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk-git/gitk b/gitk-git/gitk\nindex 09eac46..a8a6022 100644\n--- a/gitk-git/gitk\n+++ b/gitk-git/gitk\n@@ -7194,7 +7194,7 @@ proc getblobdiffs {ids} {\n global limitdiffs vfilelimit curview\n global diffencoding targetline diffnparents\n\n- set cmd [diffcmd $ids \"-p -C --cc --no-commit-id -U$diffcontext\"]\n+ set cmd [diffcmd $ids \"-p --textconv -C --cc --no-commit-id -U$diffcontext\"]\n if {$ignorespace} {\n \tappend cmd \" -w\"\n }\n-- \n1.6.3.1007.g03ec\n"},{"id":"113520","messageId":"4A07D51A.4090409@viscovery.net","threadId":"19280","inReplyTo":"4A07D160.9020709@viscovery.net","subject":"Re: [PATCH] gitk: use --textconv to generate diff text","fromName":"Johannes Sixt","fromEmail":"j.sixt@viscovery.net","sentAt":"2009-05-11T07:34:50Z","receivedAt":"2009-05-11T07:34:50Z","isPatch":true,"sender":{"key":"j6t@kdbg.org","avatar":"https://avatars.githubusercontent.com/u/14810926?v=4"},"body":"Johannes Sixt schrieb:\n> From: Johannes Sixt \n> Date: Tue, 28 Apr 2009 14:03:54 +0200\n> \n> For the most part gitk's focus is on showing history and changes in\n> a human readable form. For this reason, it makes sense to generate\n> the patch text in the diff view using --textconv so that textconv drivers\n> are used if they are defined.\n\nFWIW, I keep a few Word documents in git and use catdoc as textconv\ndriver. This works pretty well. Git-gui doesn't show any textual changes\n(it treats the Word files as binary, and it has to), with this patch I can\nuse gitk to preview the changes in the worktree and the index.\n\n-- Hannes\n"},{"id":"113526","messageId":"20090511091346.GA5685@coredump.intra.peff.net","threadId":"19280","inReplyTo":"4A07D160.9020709@viscovery.net","subject":"Re: [PATCH] gitk: use --textconv to generate diff text","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-05-11T09:13:47Z","receivedAt":"2009-05-11T09:13:47Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Mon, May 11, 2009 at 09:18:56AM +0200, Johannes Sixt wrote:\n\n> For the most part gitk's focus is on showing history and changes in\n> a human readable form. For this reason, it makes sense to generate\n> the patch text in the diff view using --textconv so that textconv drivers\n> are used if they are defined.\n> \n> gitk can also generate patches, but we do not use --textconv because\n> such patches could not be applied.\n> \n> Signed-off-by: Johannes Sixt \n\nAs the original author of the textconv code, I am in favor of this. So\nmuch so that I even posted basically the same patch before:\n\n http://article.gmane.org/gmane.comp.version-control.git/102523\n\nI had trouble finding much discussion in the archive, but I think it may\nnot have been taken because we were in release freeze (and textconv was\na brand new feature in the release at the time).\n\n-Peff\n"},{"id":"113591","messageId":"7vk54n9w1a.fsf@alter.siamese.dyndns.org","threadId":"19280","inReplyTo":"20090511091346.GA5685@coredump.intra.peff.net","subject":"Re: [PATCH] gitk: use --textconv to generate diff text","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-05-11T21:20:17Z","receivedAt":"2009-05-11T21:20:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> On Mon, May 11, 2009 at 09:18:56AM +0200, Johannes Sixt wrote:\n>\n>> For the most part gitk's focus is on showing history and changes in\n>> a human readable form. For this reason, it makes sense to generate\n>> the patch text in the diff view using --textconv so that textconv drivers\n>> are used if they are defined.\n>> \n>> gitk can also generate patches, but we do not use --textconv because\n>> such patches could not be applied.\n>> \n>> Signed-off-by: Johannes Sixt \n>\n> As the original author of the textconv code, I am in favor of this.\n\nI agree; I think textconv is meant for this kind of usage.\n"},{"id":"113594","messageId":"18952.40905.302916.243355@cargo.ozlabs.ibm.com","threadId":"19280","inReplyTo":"20090511091346.GA5685@coredump.intra.peff.net","subject":"Re: [PATCH] gitk: use --textconv to generate diff text","fromName":"Paul Mackerras","fromEmail":"paulus@samba.org","sentAt":"2009-05-11T21:59:37Z","receivedAt":"2009-05-11T21:59:37Z","isPatch":true,"sender":{"key":"paulus@samba.org","avatar":"https://avatars.githubusercontent.com/u/1606439?v=4"},"body":"Jeff King writes:\n\n> As the original author of the textconv code, I am in favor of this. So\n> much so that I even posted basically the same patch before:\n> \n> http://article.gmane.org/gmane.comp.version-control.git/102523\n> \n> I had trouble finding much discussion in the archive, but I think it may\n> not have been taken because we were in release freeze (and textconv was\n> a brand new feature in the release at the time).\n\nWhich release did --textconv first appear in?\n\nPaul.\n"},{"id":"113600","messageId":"20090511223847.GA22424@coredump.intra.peff.net","threadId":"19280","inReplyTo":"18952.40905.302916.243355@cargo.ozlabs.ibm.com","subject":"Re: [PATCH] gitk: use --textconv to generate diff text","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2009-05-11T22:38:47Z","receivedAt":"2009-05-11T22:38:47Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Tue, May 12, 2009 at 07:59:37AM +1000, Paul Mackerras wrote:\n\n> > I had trouble finding much discussion in the archive, but I think it may\n> > not have been taken because we were in release freeze (and textconv was\n> > a brand new feature in the release at the time).\n> \n> Which release did --textconv first appear in?\n\nv1.6.1\n\n-Peff\n"}]}