[PATCH] progress: don't compute estimate without a total

Augie Fackler durin42 at gmail.com
Thu Dec 16 07:46:45 CST 2010


# HG changeset patch
# User Augie Fackler <durin42 at gmail.com>
# Date 1292507122 21600
# Node ID e3f0f250fd8735ea7c946f1d04b9750860bbced6
# Parent  94507fd06ebc1516d4141a411cb27ec7534fa3a9
progress: don't compute estimate without a total

Without this, computing an estimate crashes. Test included.

diff --git a/hgext/progress.py b/hgext/progress.py
--- a/hgext/progress.py
+++ b/hgext/progress.py
@@ -183,6 +183,8 @@
         return min(int(self.ui.config('progress', 'width', default=tw)), tw)
 
     def estimate(self, topic, pos, total, now):
+        if total is None:
+            return ''
         initialpos = self.startvals[topic]
         target = total - initialpos
         delta = pos - initialpos
diff --git a/tests/test-progress.t b/tests/test-progress.t
--- a/tests/test-progress.t
+++ b/tests/test-progress.t
@@ -141,3 +141,9 @@
   loop [==============================>           ] 3/4 2h47m
                                                               \r (esc)
 
+Time estimates should not fail when there's no end point:
+  $ hg -y loop -- -4 2>&1 | python $TESTDIR/filtercr.py
+  
+  loop [ <=>                                              ] 2
+  loop [  <=>                                             ] 3
+                                                              \r (esc)


More information about the Mercurial-devel mailing list