diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -359,9 +359,6 @@ coreconfigitem('progress', 'delay', coreconfigitem('progress', 'disable', default=False, ) -coreconfigitem('progress', 'estimate', - default=2, -) coreconfigitem('progress', 'refresh', default=0.1, ) diff --git a/mercurial/progress.py b/mercurial/progress.py --- a/mercurial/progress.py +++ b/mercurial/progress.py @@ -215,19 +215,15 @@ class progbar(object): delta = pos - initialpos if delta > 0: elapsed = now - self.starttimes[topic] - # experimental config: progress.estimate - if elapsed > float( - self.ui.config('progress', 'estimate')): - seconds = (elapsed * (target - delta)) // delta + 1 - return fmtremaining(seconds) + seconds = (elapsed * (target - delta)) // delta + 1 + return fmtremaining(seconds) return '' def speed(self, topic, pos, unit, now): initialpos = self.startvals[topic] delta = pos - initialpos elapsed = now - self.starttimes[topic] - if elapsed > float( - self.ui.config('progress', 'estimate')): + if elapsed > 0: return _('%d %s/sec') % (delta / elapsed, unit) return ''