This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3768

similar: use progress helper
ClosedPublic

Authored by martinvonz on Jun 17 2018, 12:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGcd196be26cb7: similar: use progress helper
Summary

Note that a functional change here is that we now show the progress
position *before* we start working on the item. This is consistent
with how we do it elsewhere.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 17 2018, 12:42 PM
Closed by commit rHGcd196be26cb7: similar: use progress helper (authored by martinvonz). · Explain WhyJun 17 2018, 2:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9131

mercurial/similar.py

) )
def _findexactmatches(repo, added, removed): def _findexactmatches(repo, added, removed):
'''find renamed files that have no changes '''find renamed files that have no changes
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) tuples of exact matches. (before, after) tuples of exact matches.
''' '''
numfiles = len(added) + len(removed)
# Build table of removed files: {hash(fctx.data()): [fctx, ...]}. # Build table of removed files: {hash(fctx.data()): [fctx, ...]}.
# We use hash() to discard fctx.data() from memory. # We use hash() to discard fctx.data() from memory.
hashes = {} hashes = {}
for i, fctx in enumerate(removed): progress = repo.ui.makeprogress(_('searching for exact renames'),
repo.ui.progress(_('searching for exact renames'), i, total=numfiles, total=(len(added) + len(removed)),
unit=_('files')) unit=_('files'))
for fctx in removed:
progress.increment()
h = hash(fctx.data()) h = hash(fctx.data())
if h not in hashes: if h not in hashes:
hashes[h] = [fctx] hashes[h] = [fctx]
else: else:
hashes[h].append(fctx) hashes[h].append(fctx)
# For each added file, see if it corresponds to a removed file. # For each added file, see if it corresponds to a removed file.
for i, fctx in enumerate(added): for fctx in added:
repo.ui.progress(_('searching for exact renames'), i + len(removed), progress.increment()
total=numfiles, unit=_('files'))
adata = fctx.data() adata = fctx.data()
h = hash(adata) h = hash(adata)
for rfctx in hashes.get(h, []): for rfctx in hashes.get(h, []):
# compare between actual file contents for exact identity # compare between actual file contents for exact identity
if adata == rfctx.data(): if adata == rfctx.data():
yield (rfctx, fctx) yield (rfctx, fctx)
break break
# Done # Done
repo.ui.progress(_('searching for exact renames'), None) progress.update(None)
def _ctxdata(fctx): def _ctxdata(fctx):
# lazily load text # lazily load text
orig = fctx.data() orig = fctx.data()
return orig, mdiff.splitnewlines(orig) return orig, mdiff.splitnewlines(orig)
def _score(fctx, otherdata): def _score(fctx, otherdata):
orig, lines = otherdata orig, lines = otherdata

tests/test-subrepo-deep-nested-change.t

$ rm sub1/sub2/test.txt $ rm sub1/sub2/test.txt
Test relative path printing + subrepos Test relative path printing + subrepos
$ mkdir -p foo/bar $ mkdir -p foo/bar
$ cd foo $ cd foo
$ touch bar/abc $ touch bar/abc
$ hg addremove -S .. $ hg addremove -S ..
\r (no-eol) (esc) \r (no-eol) (esc)
searching for exact renames [ ] 0/1\r (no-eol) (esc) searching for exact renames [========================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc) \r (no-eol) (esc)
adding ../sub1/sub2/folder/test.txt adding ../sub1/sub2/folder/test.txt
removing ../sub1/sub2/test.txt removing ../sub1/sub2/test.txt
adding ../sub1/foo adding ../sub1/foo
adding bar/abc adding bar/abc
$ cd .. $ cd ..
$ hg status -S $ hg status -S
A foo/bar/abc A foo/bar/abc