undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-gui: Don't display CR within console windows
  git-gui: Handle progress bars from newer gits
  git-gui: Correctly report failures from git-write-tree

Conflicts:

	lib/commit.tcl
	lib/console.tcl
This commit is contained in:
Shawn O. Pearce 2007-10-20 20:43:36 -04:00
commit c9dcc7f865
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commit.tcl
View File

@ -253,7 +253,7 @@ proc commit_committree {fd_wt curHEAD msg} {
global repo_config global repo_config
gets $fd_wt tree_id gets $fd_wt tree_id
if {$tree_id eq {} || [catch {close $fd_wt} err]} { if {[catch {close $fd_wt} err]} {
error_popup [strcat [mc "write-tree failed:"] "\n\n$err"] error_popup [strcat [mc "write-tree failed:"] "\n\n$err"]
ui_status {Commit failed.} ui_status {Commit failed.}
unlock_index unlock_index

2
lib/console.tcl
View File

@ -120,7 +120,7 @@ method _read {fd after} {
} else { } else {
$w_t delete $console_cr end $w_t delete $console_cr end
$w_t insert end "\n" $w_t insert end "\n"
$w_t insert end [string range $buf $c $cr] $w_t insert end [string range $buf $c [expr {$cr - 1}]]
set c $cr set c $cr
incr c incr c
} }

5
lib/status_bar.tcl
View File

@ -97,7 +97,10 @@ method update_meter {buf} {
set prior [string range $meter 0 $r] set prior [string range $meter 0 $r]
set meter [string range $meter [expr {$r + 1}] end] set meter [string range $meter [expr {$r + 1}] end]
if {[regexp "\\((\\d+)/(\\d+)\\)\\s+done\r\$" $prior _j a b]} { set p "\\((\\d+)/(\\d+)\\)"
if {[regexp ":\\s*\\d+% $p\(?:, done.\\s*\n|\\s*\r)\$" $prior _j a b]} {
update $this $a $b
} elseif {[regexp "$p\\s+done\r\$" $prior _j a b]} {
update $this $a $b update $this $a $b
} }
} }