This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5374

fastannotate: use progress helper
ClosedPublic

Authored by martinvonz on Dec 5 2018, 12:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGdd1006874a5a: fastannotate: use progress helper
Summary

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.

Event Timeline

martinvonz created this revision.Dec 5 2018, 12:39 PM
yuja added a subscriber: yuja.Dec 6 2018, 6:38 AM
if ismainbranch: # need to write to linelog
  • if not self.ui.quiet:
  • progress += 1
  • self.ui.progress(_('building cache'), progress,
  • total=len(newmainbranch))

+ progress.increment()

This one is BC, but I think that's okay.

Closed by commit rHGdd1006874a5a: fastannotate: use progress helper (authored by martinvonz). · Explain WhyDec 6 2018, 6:40 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fastannotate/context.py (11 lines)

Diff 12735

hgext/fastannotate/context.py

self.ui.debug('fastannotate: %s: linelog cannot help in ' self.ui.debug('fastannotate: %s: linelog cannot help in '
'annotating this revision\n' % self.path) 'annotating this revision\n' % self.path)
# prepare annotateresult so we can update linelog incrementally # prepare annotateresult so we can update linelog incrementally
self.linelog.annotate(self.linelog.maxrev) self.linelog.annotate(self.linelog.maxrev)
# 3rd DFS does the actual annotate # 3rd DFS does the actual annotate
visit = initvisit[:] visit = initvisit[:]
progress = 0 progress = self.ui.makeprogress(('building cache'),
total=len(newmainbranch))
while visit: while visit:
f = visit[-1] f = visit[-1]
if f in hist: if f in hist:
visit.pop() visit.pop()
continue continue
ready = True ready = True
pl = pcache[f] pl = pcache[f]
del needed[p] del needed[p]
else: else:
needed[p] -= 1 needed[p] -= 1
hist[f] = curr hist[f] = curr
del pcache[f] del pcache[f]
if ismainbranch: # need to write to linelog if ismainbranch: # need to write to linelog
if not self.ui.quiet: progress.increment()
progress += 1
self.ui.progress(_('building cache'), progress,
total=len(newmainbranch))
bannotated = None bannotated = None
if len(pl) == 2 and self.opts.followmerge: # merge if len(pl) == 2 and self.opts.followmerge: # merge
bannotated = curr[0] bannotated = curr[0]
if blocks is None: # no parents, add an empty one if blocks is None: # no parents, add an empty one
blocks = list(self._diffblocks('', curr[1])) blocks = list(self._diffblocks('', curr[1]))
self._appendrev(f, blocks, bannotated) self._appendrev(f, blocks, bannotated)
elif showpath: # not append linelog, but we need to record path elif showpath: # not append linelog, but we need to record path
self._node2path[f.node()] = f.path() self._node2path[f.node()] = f.path()
if progress: # clean progress bar progress.complete()
self.ui.write()
result = [ result = [
((self.revmap.rev2hsh(fr) if isinstance(fr, int) else fr.node()), l) ((self.revmap.rev2hsh(fr) if isinstance(fr, int) else fr.node()), l)
for fr, l in hist[revfctx][0]] # [(node, linenumber)] for fr, l in hist[revfctx][0]] # [(node, linenumber)]
return self._refineannotateresult(result, revfctx, showpath, showlines) return self._refineannotateresult(result, revfctx, showpath, showlines)
def canannotatedirectly(self, rev): def canannotatedirectly(self, rev):
"""(str) -> bool, fctx or node. """(str) -> bool, fctx or node.