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

PATCH Applied Pat Thoyts 2 participants 2 messages Jun 15, 2016

Share & tools

Pat Thoyts

author

2016-06-15 22:46 UTC #0 lore raw

PATCH 1/1 gitk: Handle blobs containing a DOS end-of-file marker.

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 <[email protected]>

---
 gitk |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

gitk +3 -2

index 1773ae6..d7de27e 100755
@@ -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"}]

Signature · 1 line

1.6.2.1217.gd7bc3

Paul Mackerras

Applied

2016-06-15 22:46 UTC #1 lore raw

Quoted 6 lines · Pat Thoyts

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 <[email protected]>

Thanks, applied.

Paul.