diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-20 20:43:36 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-20 20:43:36 -0400 |
| commit | c9dcc7f865fb7891f4f6d068230663eb2cb586a7 (patch) | |
| tree | dda2dc1770bbc3115a4487f0b32e3323e899fd97 /lib/status_bar.tcl | |
| parent | a5bb31fb6323b53559b0d15ce2d02a7ba6d74bed (diff) | |
| parent | bbbadf6e58f72ac6bf739d2a1109cbd872eb1083 (diff) | |
| download | git-c9dcc7f865fb7891f4f6d068230663eb2cb586a7.tar.gz git-c9dcc7f865fb7891f4f6d068230663eb2cb586a7.tar.xz | |
Merge branch 'maint'
* 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
Diffstat (limited to 'lib/status_bar.tcl')
| -rw-r--r-- | lib/status_bar.tcl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/status_bar.tcl b/lib/status_bar.tcl index 5c5bf7c73..51d417755 100644 --- a/lib/status_bar.tcl +++ b/lib/status_bar.tcl @@ -97,7 +97,10 @@ method update_meter {buf} { set prior [string range $meter 0 $r] 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 } } |