This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3821

progress: extract function for closing topic
ClosedPublic

Authored by martinvonz on Jun 20 2018, 1:44 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb34d0a6ef936: progress: extract function for closing topic
Summary

progress(None) had a completely different implementation from the
progress(<not None>) implementation. It very much feels like it should
be a separate method, so this patch makes it so. That also makes it
clear that only the topic parameter matters when closing a topic
(e.g. "total" does not matter).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 20 2018, 1:44 AM
Closed by commit rHGb34d0a6ef936: progress: extract function for closing topic (authored by martinvonz). · Explain WhyJun 21 2018, 8:44 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/progress.py (66 lines)

Diff 9237

mercurial/progress.py

# frequently. This is to avoid such dramatical change and make ETA # frequently. This is to avoid such dramatical change and make ETA
# smoother. # smoother.
if newdelta < 0.1: if newdelta < 0.1:
return return
self.startvals[topic] = pos - newdelta self.startvals[topic] = pos - newdelta
self.starttimes[topic] = now - interval self.starttimes[topic] = now - interval
def progress(self, topic, pos, item='', unit='', total=None): def progress(self, topic, pos, item='', unit='', total=None):
if pos is None:
self.closetopic(topic)
return
now = time.time() now = time.time()
with self._refreshlock: with self._refreshlock:
if pos is None: if topic not in self.topics:
self.starttimes[topic] = now
self.startvals[topic] = pos
self.topics.append(topic)
self.topicstates[topic] = pos, item, unit, total
self.curtopic = topic
self._calibrateestimate(topic, now, pos)
if now - self.lastprint >= self.refresh and self.topics:
if self._oktoprint(now):
self.lastprint = now
self.show(now, topic, *self.topicstates[topic])
def closetopic(self, topic):
with self._refreshlock:
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)
# reset the progress bar if this is the outermost topic # reset the progress bar if this is the outermost topic
if self.topics and self.topics[0] == topic and self.printed: if self.topics and self.topics[0] == topic and self.printed:
self.complete() self.complete()
self.resetstate() self.resetstate()
# truncate the list of topics assuming all topics within # truncate the list of topics assuming all topics within
# this one are also closed # this one are also closed
if topic in self.topics: if topic in self.topics:
self.topics = self.topics[:self.topics.index(topic)] self.topics = self.topics[:self.topics.index(topic)]
# reset the last topic to the one we just unwound to, # reset the last topic to the one we just unwound to,
# so that higher-level topics will be stickier than # so that higher-level topics will be stickier than
# lower-level topics # lower-level topics
if self.topics: if self.topics:
self.lasttopic = self.topics[-1] self.lasttopic = self.topics[-1]
else: else:
self.lasttopic = None self.lasttopic = None
else:
if topic not in self.topics:
self.starttimes[topic] = now
self.startvals[topic] = pos
self.topics.append(topic)
self.topicstates[topic] = pos, item, unit, total
self.curtopic = topic
self._calibrateestimate(topic, now, pos)
if now - self.lastprint >= self.refresh and self.topics:
if self._oktoprint(now):
self.lastprint = now
self.show(now, topic, *self.topicstates[topic])