From: Shawn O. Pearce <spearce@spearce.org>
Date: Sat, 20 Oct 2007 18:16:15 +0000 (-0400)
Subject: git-gui: Handle progress bars from newer gits
X-Git-Tag: gitgui-0.8.4~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bea6878be2fb73e50407f93f2bcd71b961510c19;p=git.git

git-gui: Handle progress bars from newer gits

Post Git 1.5.3 a new style progress bar has been introduced that
uses only one line rather than two.  The formatting of the completed
and total section is also slightly different so we must adjust our
regexp to match.  Unfortunately both styles are in active use by
different versions of Git so we need to look for both.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/lib/status_bar.tcl b/lib/status_bar.tcl
index 72a8fe1fd..3bf79eb6e 100644
--- a/lib/status_bar.tcl
+++ b/lib/status_bar.tcl
@@ -69,7 +69,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
 	}
 }