# HG changeset patch # User Augie Fackler # Date 1292507122 21600 # Node ID e11c14f1449185ffe00a433fa2b657abb0cd376c # Parent dca5488f0e4fde240feae077f195522f33049caf progress: don't compute estimate without a total Without this, computing an estimate crashes. Test included. diff -r dca5488f0e4f -r e11c14f14491 hgext/progress.py --- a/hgext/progress.py Tue Dec 14 21:58:13 2010 -0500 +++ b/hgext/progress.py Thu Dec 16 07:45:22 2010 -0600 @@ -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 -r dca5488f0e4f -r e11c14f14491 tests/test-progress.t --- a/tests/test-progress.t Tue Dec 14 21:58:13 2010 -0500 +++ b/tests/test-progress.t Thu Dec 16 07:45:22 2010 -0600 @@ -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)