( )⚙ D3796 similar: use progress helper

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3796

similar: use progress helper
ClosedPublic

Authored by martinvonz on Jun 18 2018, 1:15 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG59c9d3cc810f: similar: use progress helper
Summary

A side-effect is that progress is now reported as 1 *before* we start
checking the first file. That seems to be how we do it in most places.

Also, the right topic is now closed.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 18 2018, 1:15 PM
pulkit accepted this revision.Jun 18 2018, 4:01 PM
Closed by commit rHG59c9d3cc810f: similar: use progress helper (authored by martinvonz). · Explain WhyJun 18 2018, 4:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/similar.py (10 lines)

Diff 9190

mercurial/similar.py

def _findsimilarmatches(repo, added, removed, threshold): def _findsimilarmatches(repo, added, removed, threshold):
'''find potentially renamed files based on similar file content '''find potentially renamed files based on similar file content
Takes a list of new filectxs and a list of removed filectxs, and yields Takes a list of new filectxs and a list of removed filectxs, and yields
(before, after, score) tuples of partial matches. (before, after, score) tuples of partial matches.
''' '''
copies = {} copies = {}
for i, r in enumerate(removed): progress = repo.ui.makeprogress(_('searching for similar files'),
repo.ui.progress(_('searching for similar files'), i, unit=_('files'), total=len(removed))
total=len(removed), unit=_('files')) for r in removed:
progress.increment()
data = None data = None
for a in added: for a in added:
bestscore = copies.get(a, (None, threshold))[1] bestscore = copies.get(a, (None, threshold))[1]
if data is None: if data is None:
data = _ctxdata(r) data = _ctxdata(r)
myscore = _score(a, data) myscore = _score(a, data)
if myscore > bestscore: if myscore > bestscore:
copies[a] = (r, myscore) copies[a] = (r, myscore)
repo.ui.progress(_('searching'), None) progress.complete()
for dest, v in copies.iteritems(): for dest, v in copies.iteritems():
source, bscore = v source, bscore = v
yield source, dest, bscore yield source, dest, bscore
def _dropempty(fctxs): def _dropempty(fctxs):
return [x for x in fctxs if x.size() > 0] return [x for x in fctxs if x.size() > 0]