This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5528

progress: move cached debug flag from progress.progbar to scmutil.progress
ClosedPublic

Authored by martinvonz on Jan 8 2019, 1:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7b80406b8271: progress: move cached debug flag from progress.progbar to scmutil.progress
Summary

It's simpler this way. One possible drawback (and a possisble
advantage) is that we now check the debug flag once per topic, so
processes that generate new topics all the time will still check the
flag frequently.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

Diff 13097

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('progress', 'format') self.order = self.ui.configlist('progress', 'format')
self.estimateinterval = self.ui.configwith( self.estimateinterval = self.ui.configwith(
float, 'progress', 'estimateinterval') float, 'progress', 'estimateinterval')
# developer config: progress.debug
self.debug = self.ui.configbool('progress', 'debug')
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

mercurial/scmutil.py

class progress(object): class progress(object):
def __init__(self, ui, topic, unit="", total=None): def __init__(self, ui, topic, unit="", total=None):
self.ui = ui self.ui = ui
self.pos = 0 self.pos = 0
self.topic = topic self.topic = topic
self.unit = unit self.unit = unit
self.total = total self.total = total
self.debug = ui.configbool('progress', 'debug')
def __enter__(self): def __enter__(self):
return self return self
def __exit__(self, exc_type, exc_value, exc_tb): def __exit__(self, exc_type, exc_value, exc_tb):
self.complete() self.complete()
def update(self, pos, item="", total=None): def update(self, pos, item="", total=None):
# reduce the cost of transferring progress messages. # reduce the cost of transferring progress messages.
self.ui._fmsgerr.write(None, type=b'progress', topic=self.topic, self.ui._fmsgerr.write(None, type=b'progress', topic=self.topic,
pos=self.pos, item=item, unit=self.unit, pos=self.pos, item=item, unit=self.unit,
total=self.total) total=self.total)
elif self.ui._progbar is not None: elif self.ui._progbar is not None:
self.ui._progbar.progress(self.topic, self.pos, item=item, self.ui._progbar.progress(self.topic, self.pos, item=item,
unit=self.unit, total=self.total) unit=self.unit, total=self.total)
# Looking up progress.debug in tight loops is expensive. The value if self.pos is None or not self.debug:
# is cached on the progbar object and we can avoid the lookup in
# the common case where a progbar is active.
if self.pos is None or not self.ui._progbar.debug:
return
# Keep this logic in sync with above.
if self.pos is None or not self.ui.configbool('progress', 'debug'):
return return
if self.unit: if self.unit:
unit = ' ' + self.unit unit = ' ' + self.unit
if item: if item:
item = ' ' + item item = ' ' + item
if self.total: if self.total: