This is an archive of the discontinued Mercurial Phabricator instance.

Differential D828

progress: remove progress.estimate config
ClosedPublic

Authored by quark on Sep 27 2017, 4:03 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGf428c347d32b: progress: remove progress.estimate config
Summary

It was introduced by 98e4d39 ("progress: add speed format" 2011-5-9) and was
intended to hide ETA information for the first few seconds.

Later 5d261fd ("progress: add a changedelay to prevent parallel topics from
flapping (issue2698)" 2011-6-23) introduced changedelay config which hides
the entire progress bar for the first few seconds. So progress.estimate seems
somehow duplicated feature-wise. Since it's experimental and duplicated, let's
just remove it. This makes the next patch simpler - it no longer needs to make
sure starttimes is the real start time.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Sep 27 2017, 4:03 PM
quark edited the summary of this revision. (Show Details)Sep 27 2017, 5:39 PM
durin42 accepted this revision.Sep 27 2017, 7:40 PM
This revision is now accepted and ready to land.Sep 27 2017, 7:40 PM
Closed by commit rHGf428c347d32b: progress: remove progress.estimate config (authored by quark). · Explain WhySep 27 2017, 7:48 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (3 lines)
Mmercurial/progress.py (10 lines)

Diff 2130

mercurial/configitems.py

default=False, default=False,
) )
coreconfigitem('progress', 'delay', coreconfigitem('progress', 'delay',
default=3, default=3,
) )
coreconfigitem('progress', 'disable', coreconfigitem('progress', 'disable',
default=False, default=False,
) )
coreconfigitem('progress', 'estimate',
default=2,
)
coreconfigitem('progress', 'refresh', coreconfigitem('progress', 'refresh',
default=0.1, default=0.1,
) )
coreconfigitem('progress', 'width', coreconfigitem('progress', 'width',
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('push', 'pushvars.server', coreconfigitem('push', 'pushvars.server',
default=False, default=False,

mercurial/progress.py

def estimate(self, topic, pos, total, now): def estimate(self, topic, pos, total, now):
if total is None: if total is None:
return '' return ''
initialpos = self.startvals[topic] initialpos = self.startvals[topic]
target = total - initialpos target = total - initialpos
delta = pos - initialpos delta = pos - initialpos
if delta > 0: if delta > 0:
elapsed = now - self.starttimes[topic] elapsed = now - self.starttimes[topic]
# experimental config: progress.estimate
if elapsed > float(
self.ui.config('progress', 'estimate')):
seconds = (elapsed * (target - delta)) // delta + 1 seconds = (elapsed * (target - delta)) // delta + 1
return fmtremaining(seconds) return fmtremaining(seconds)
return '' return ''
def speed(self, topic, pos, unit, now): def speed(self, topic, pos, unit, now):
initialpos = self.startvals[topic] initialpos = self.startvals[topic]
delta = pos - initialpos delta = pos - initialpos
elapsed = now - self.starttimes[topic] elapsed = now - self.starttimes[topic]
if elapsed > float( if elapsed > 0:
self.ui.config('progress', 'estimate')):
return _('%d %s/sec') % (delta / elapsed, unit) return _('%d %s/sec') % (delta / elapsed, unit)
return '' return ''
def _oktoprint(self, now): def _oktoprint(self, now):
'''Check if conditions are met to print - e.g. changedelay elapsed''' '''Check if conditions are met to print - e.g. changedelay elapsed'''
if (self.lasttopic is None # first time we printed if (self.lasttopic is None # first time we printed
# not a topic change # not a topic change
or self.curtopic == self.lasttopic or self.curtopic == self.lasttopic