git-gui: Elide CRs appearing in diff output from display.
If we are displaying a diff for a DOS-style (CRLF) formatted file then the Tk text widget would normally show the CR at the end of every line; in most fonts this will come out as a square box. Rather than showing this character we'll tag it with a tag which forces the character to be elided away, so its not displayed. However since the character is still within the text buffer we can still obtain it and supply it over to `git apply` when staging or unstaging an individual hunk, ensuring that the file contents is always fully preserved as-is. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Shawn O. Pearce committed
Jan 24, 2007 at 21:30 UTC
30b14ed390f543e52665c8fc4f626aab78e3dcab
1 file changed
+4
git-gui.sh
+4
@@ -793,6 +793,9 @@ proc read_diff {fd} {
793
}
794
}
795
$ui_diff insert end $line $tags
796
+ if {[string index $line end] eq "\r"} {
797
+ $ui_diff tag add d_cr {end - 2c}
798
+ }
799
$ui_diff insert end "\n" $tags
800
}
801
$ui_diff conf -state disabled
@@ -4304,6 +4307,7 @@ pack $ui_diff -side left -fill both -expand 1
4307
pack .vpane.lower.diff.header -side top -fill x
4308
pack .vpane.lower.diff.body -side bottom -fill both -expand 1
4309
4310
+$ui_diff tag conf d_cr -elide true
4311
$ui_diff tag conf d_@ -foreground blue -font font_diffbold
4312
$ui_diff tag conf d_+ -foreground {#00a000}
4313
$ui_diff tag conf d_- -foreground red