This is an archive of the discontinued Mercurial Phabricator instance.

Differential D843

progress: back out changeset a667f0ca1d5f
AbandonedPublic

Authored by martinvonz on Sep 29 2017, 12:40 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Summary

Tests were failing on some combination of platform and library
versions (at least on my Linux machine and some Solaris machine), and
the proposed fix by Jun was instead failing on other platform/library
(the gcc112 build farm Augie uses to run tests).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Sep 29 2017, 12:40 PM
martinvonz retitled this revision from Backed out changeset a667f0ca1d5f to progress: back out changeset a667f0ca1d5f.Sep 29 2017, 12:43 PM
quark requested changes to this revision.EditedSep 29 2017, 1:32 PM
quark added a subscriber: quark.

It's passing on gcc112 as I tested:

[quark@gcc2-power8 hg-committed]$ hg id 
b1243afb61c9 tip
[quark@gcc2-power8 hg-committed]$ make local
python setup.py  \
  build_py -c -d . \
  build_ext  -i \
  build_hgexe  -i \
  build_mo
running build_py
byte-compiling ./mercurial/__modulepolicy__.py to __modulepolicy__.pyc
running build_ext
running build_hgexe
running build_mo
env HGRCPATH= python hg version
Mercurial Distributed SCM (version 4.3.2+650-b1243afb61c9)
(see https://mercurial-scm.org for more information)

Copyright (C) 2005-2017 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
[quark@gcc2-power8 hg-committed]$ cd tests/
[quark@gcc2-power8 tests]$ ./run-tests.py -l test-patchbomb.t 
.
# Ran 1 tests, 0 skipped, 0 failed.

@durin42 Could you double check?

This revision now requires changes to proceed.Sep 29 2017, 1:32 PM
quark added a subscriber: durin42.Sep 29 2017, 1:37 PM
martinvonz abandoned this revision.Sep 29 2017, 4:36 PM

Superseded by D844

Revision Contents
Changeset List

Diff 2154

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', 'estimateinterval',
default=60.0,
)
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/help/config.txt

``delay`` ``delay``
Number of seconds (float) before showing the progress bar. (default: 3) Number of seconds (float) before showing the progress bar. (default: 3)
``changedelay`` ``changedelay``
Minimum delay before showing a new topic. When set to less than 3 * refresh, Minimum delay before showing a new topic. When set to less than 3 * refresh,
that value will be used instead. (default: 1) that value will be used instead. (default: 1)
``estimateinterval``
Maximum sampling interval in seconds for speed and estimated time
calculation. (default: 60)
``refresh`` ``refresh``
Time in seconds between refreshes of the progress bar. (default: 0.1) Time in seconds between refreshes of the progress bar. (default: 0.1)
``format`` ``format``
Format of the progress bar. Format of the progress bar.
Valid entries for the format field are ``topic``, ``bar``, ``number``, Valid entries for the format field are ``topic``, ``bar``, ``number``,
``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the ``unit``, ``estimate``, ``speed``, and ``item``. ``item`` defaults to the

mercurial/progress.py

self.refresh = float(self.ui.config( self.refresh = float(self.ui.config(
'progress', 'refresh')) 'progress', 'refresh'))
self.changedelay = max(3 * self.refresh, self.changedelay = max(3 * self.refresh,
float(self.ui.config( float(self.ui.config(
'progress', 'changedelay'))) 'progress', 'changedelay')))
self.order = self.ui.configlist( self.order = self.ui.configlist(
'progress', 'format', 'progress', 'format',
default=['topic', 'bar', 'number', 'estimate']) default=['topic', 'bar', 'number', 'estimate'])
self.estimateinterval = self.ui.configwith(
float, 'progress', 'estimateinterval')
def show(self, now, topic, pos, item, unit, total): def show(self, now, topic, pos, item, unit, total):
if not shouldprint(self.ui): if not shouldprint(self.ui):
return return
termwidth = self.width() termwidth = self.width()
self.printed = True self.printed = True
head = '' head = ''
needprogress = False needprogress = False
# not a topic change # not a topic change
or self.curtopic == self.lasttopic or self.curtopic == self.lasttopic
# it's been long enough we should print anyway # it's been long enough we should print anyway
or now - self.lastprint >= self.changedelay): or now - self.lastprint >= self.changedelay):
return True return True
else: else:
return False return False
def _calibrateestimate(self, topic, now, pos):
'''Adjust starttimes and startvals for topic so ETA works better
If progress is non-linear (ex. get much slower in the last minute),
it's more friendly to only use a recent time span for ETA and speed
calculation.
[======================================> ]
^^^^^^^
estimateinterval, only use this for estimation
'''
interval = self.estimateinterval
if interval <= 0:
return
elapsed = now - self.starttimes[topic]
if elapsed > interval:
delta = pos - self.startvals[topic]
newdelta = delta * interval / elapsed
# If a stall happens temporarily, ETA could change dramatically
# frequently. This is to avoid such dramatical change and make ETA
# smoother.
if newdelta < 0.1:
return
self.startvals[topic] = pos - newdelta
self.starttimes[topic] = now - interval
def progress(self, topic, pos, item='', unit='', total=None): def progress(self, topic, pos, item='', unit='', total=None):
now = time.time() now = time.time()
self._refreshlock.acquire() self._refreshlock.acquire()
try: try:
if pos is None: if pos is None:
self.starttimes.pop(topic, None) self.starttimes.pop(topic, None)
self.startvals.pop(topic, None) self.startvals.pop(topic, None)
self.topicstates.pop(topic, None) self.topicstates.pop(topic, None)
self.lasttopic = None self.lasttopic = None
else: else:
if topic not in self.topics: if topic not in self.topics:
self.starttimes[topic] = now self.starttimes[topic] = now
self.startvals[topic] = pos self.startvals[topic] = pos
self.topics.append(topic) self.topics.append(topic)
self.topicstates[topic] = pos, item, unit, total self.topicstates[topic] = pos, item, unit, total
self.curtopic = topic self.curtopic = topic
self._calibrateestimate(topic, now, pos)
if now - self.lastprint >= self.refresh and self.topics: if now - self.lastprint >= self.refresh and self.topics:
if self._oktoprint(now): if self._oktoprint(now):
self.lastprint = now self.lastprint = now
self.show(now, topic, *self.topicstates[topic]) self.show(now, topic, *self.topicstates[topic])
finally: finally:
self._refreshlock.release() self._refreshlock.release()

tests/test-progress.t

loop [=> ] 1/20 6m21s\r (no-eol) (esc) loop [=> ] 1/20 6m21s\r (no-eol) (esc)
loop [===> ] 2/20 6m01s\r (no-eol) (esc) loop [===> ] 2/20 6m01s\r (no-eol) (esc)
loop [=====> ] 3/20 5m41s\r (no-eol) (esc) loop [=====> ] 3/20 5m41s\r (no-eol) (esc)
loop [=======> ] 4/20 5m21s\r (no-eol) (esc) loop [=======> ] 4/20 5m21s\r (no-eol) (esc)
loop [=========> ] 5/20 5m01s\r (no-eol) (esc) loop [=========> ] 5/20 5m01s\r (no-eol) (esc)
loop [===========> ] 6/20 4m41s\r (no-eol) (esc) loop [===========> ] 6/20 4m41s\r (no-eol) (esc)
loop [=============> ] 7/20 4m21s\r (no-eol) (esc) loop [=============> ] 7/20 4m21s\r (no-eol) (esc)
loop [===============> ] 8/20 4m01s\r (no-eol) (esc) loop [===============> ] 8/20 4m01s\r (no-eol) (esc)
loop [================> ] 9/20 25m40s\r (no-eol) (esc) loop [================> ] 9/20 13m27s\r (no-eol) (esc)
loop [===================> ] 10/20 1h06m\r (no-eol) (esc) loop [==================> ] 10/20 19m21s\r (no-eol) (esc)
loop [=====================> ] 11/20 1h13m\r (no-eol) (esc) loop [====================> ] 11/20 22m39s\r (no-eol) (esc)
loop [=======================> ] 12/20 1h07m\r (no-eol) (esc) loop [======================> ] 12/20 24m01s\r (no-eol) (esc)
loop [========================> ] 13/20 58m19s\r (no-eol) (esc) loop [========================> ] 13/20 23m53s\r (no-eol) (esc)
loop [===========================> ] 14/20 7m09s\r (no-eol) (esc) loop [==========================> ] 14/20 19m09s\r (no-eol) (esc)
loop [=============================> ] 15/20 3m38s\r (no-eol) (esc) loop [============================> ] 15/20 15m01s\r (no-eol) (esc)
loop [===============================> ] 16/20 2m15s\r (no-eol) (esc) loop [==============================> ] 16/20 11m21s\r (no-eol) (esc)
loop [=================================> ] 17/20 1m27s\r (no-eol) (esc) loop [=================================> ] 17/20 8m04s\r (no-eol) (esc)
loop [====================================> ] 18/20 52s\r (no-eol) (esc) loop [===================================> ] 18/20 5m07s\r (no-eol) (esc)
loop [======================================> ] 19/20 25s\r (no-eol) (esc) loop [=====================================> ] 19/20 2m27s\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
Time estimates should not fail when there's no end point: Time estimates should not fail when there's no end point:
$ hg -y loop -- -4 $ hg -y loop -- -4
\r (no-eol) (esc) \r (no-eol) (esc)
loop [ <=> ] 2\r (no-eol) (esc) loop [ <=> ] 2\r (no-eol) (esc)
loop [ <=> ] 3\r (no-eol) (esc) loop [ <=> ] 3\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)