[PATCH] gitk: Handle blobs containing a DOS end-of-file marker.

Pat Thoyts· Mar 16, 2009, 10:24 UTC · lore

  If a patchset contains an EOF marker (Ctrl-Z) the blob diff terminates
  at that point. This patch permits gitk to ignore the eof and continue to
  display any subsequent blobs and also displays a sensible representation
  of the eof char.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---
 gitk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Show changes to gitk +3 −2

diff --git a/gitk b/gitk
index 1773ae6..d7de27e 100755
--- a/gitk
+++ b/gitk
@@ -7216,7 +7216,7 @@ proc getblobdiffs {ids} {
     set diffnparents 0
     set diffinhdr 0
     set diffencoding [get_path_encoding {}]
-    fconfigure $bdf -blocking 0 -encoding binary
+    fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
     set blobdifffd($ids) $bdf
     filerun $bdf [list getblobdiffline $bdf $diffids]
 }
@@ -7367,7 +7367,8 @@ proc getblobdiffline {bdf ids} {
 	    $ctext insert end "$line\n" filesep
 
 	} else {
-	    set line [encoding convertfrom $diffencoding $line]
+	    set line [string map {\x1A ^Z} \
+                          [encoding convertfrom $diffencoding $line]]
 	    # parse the prefix - one ' ', '-' or '+' for each parent
 	    set prefix [string range $line 0 [expr {$diffnparents - 1}]]
 	    set tag [expr {$diffnparents > 1? "m": "d"}]

-- 
1.6.2.1217.gd7bc3

Paul Mackerras· Mar 23, 2009, 10:33 UTC · re: Pat Thoyts · lore

Re: [PATCH] gitk: Handle blobs containing a DOS end-of-file marker.

Pat Thoyts writes:

Show 6 quoted lines

>   If a patchset contains an EOF marker (Ctrl-Z) the blob diff terminates
>   at that point. This patch permits gitk to ignore the eof and continue to
>   display any subsequent blobs and also displays a sensible representation
>   of the eof char.
> 
> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>

Thanks, applied.

Paul.

patchgitk: Handle blobs containing a DOS end-of-file marker.