summaryrefslogtreecommitdiff
path: root/git-gui/lib/status_bar.tcl
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-10-21 03:19:22 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-10-21 03:19:22 (GMT)
commit7468c297fa88f0035dc719e996b93b1404eee6e3 (patch)
tree2e255537e9a61d7b8f7642fcecb757b299a65db3 /git-gui/lib/status_bar.tcl
parent0b8293f6776a7fc600c924ca71e4bba81d396409 (diff)
parentbbbadf6e58f72ac6bf739d2a1109cbd872eb1083 (diff)
downloadgit-7468c297fa88f0035dc719e996b93b1404eee6e3.zip
git-7468c297fa88f0035dc719e996b93b1404eee6e3.tar.gz
git-7468c297fa88f0035dc719e996b93b1404eee6e3.tar.bz2
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui: 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 git-gui: accept versions containing text annotations, like 1.5.3.mingw.1 git-gui: Don't crash when starting gitk from a browser session git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs git-gui: Handle starting on mapped shares under Cygwin git-gui: Display message box when we cannot find git in $PATH git-gui: Avoid using bold text in entire gui for some fonts
Diffstat (limited to 'git-gui/lib/status_bar.tcl')
-rw-r--r--git-gui/lib/status_bar.tcl5
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/lib/status_bar.tcl b/git-gui/lib/status_bar.tcl
index 72a8fe1..3bf79eb 100644
--- a/git-gui/lib/status_bar.tcl
+++ b/git-gui/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
}
}