git-gui: Don't display CR within console windows

spearce · spearce · commit bbbadf6e58f7 · 2007-10-20T20:42:01.000-04:00
Git progress bars from tools like git-push and git-fetch use CR
to skip back to the start of the current line and redraw it with
an updated progress.  We were doing this in our Tk widget but had
failed to skip the CR, which Tk doesn't draw well.

Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/lib/console.tcl b/lib/console.tcl
@@ -122,7 +122,7 @@ method _read {fd after} {
 			} else {
 				$w.m.t delete $console_cr end
 				$w.m.t insert end "\n"
-				$w.m.t insert end [string range $buf $c $cr]
+				$w.m.t insert end [string range $buf $c [expr {$cr - 1}]]
 				set c $cr
 				incr c
 			}

Original file line number	Diff line number	Diff line change
`@@ -122,7 +122,7 @@ method _read {fd after} {`
`122`	`122`	`} else {`
`123`	`123`	`$w.m.t delete $console_cr end`
`124`	`124`	`$w.m.t insert end "\n"`
`125`		`- $w.m.t insert end [string range $buf $c $cr]`
	`125`	`+ $w.m.t insert end [string range $buf $c [expr {$cr - 1}]]`
`126`	`126`	`set c $cr`
`127`	`127`	`incr c`
`128`	`128`	`}`