This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6194

remotefilelog: fix crash on `hg addremove` of added-but-deleted file
ClosedPublic

Authored by martinvonz on Apr 3 2019, 8:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG91cc8dc866ed: remotefilelog: fix crash on `hg addremove` of added-but-deleted file
Summary

If you hg add a file and then delete it from disk, and then run `hg
addremove`, the file ends up in the "removed" set that gets passed to
the findrenames() override. We then crash because the file is not in
the working copy parent. This patch fixes that.

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.Apr 3 2019, 8:47 PM
Closed by commit rHG91cc8dc866ed: remotefilelog: fix crash on `hg addremove` of added-but-deleted file (authored by martinvonz). · Explain WhyApr 8 2019, 2:50 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 14697

hgext/remotefilelog/__init__.py

repo.fileservice.prefetch(prefetchfiles) repo.fileservice.prefetch(prefetchfiles)
return orig(self, files) return orig(self, files)
extensions.wrapfunction(context.workingctx, '_checklookup', checklookup) extensions.wrapfunction(context.workingctx, '_checklookup', checklookup)
# Prefetch the logic that compares added and removed files for renames # Prefetch the logic that compares added and removed files for renames
def findrenames(orig, repo, matcher, added, removed, *args, **kwargs): def findrenames(orig, repo, matcher, added, removed, *args, **kwargs):
if isenabled(repo): if isenabled(repo):
files = [] files = []
parentctx = repo['.'] pmf = repo['.'].manifest()
for f in removed: for f in removed:
files.append((f, hex(parentctx.filenode(f)))) if f in pmf:
files.append((f, hex(pmf[f])))
# batch fetch the needed files from the server # batch fetch the needed files from the server
repo.fileservice.prefetch(files) repo.fileservice.prefetch(files)
return orig(repo, matcher, added, removed, *args, **kwargs) return orig(repo, matcher, added, removed, *args, **kwargs)
extensions.wrapfunction(scmutil, '_findrenames', findrenames) extensions.wrapfunction(scmutil, '_findrenames', findrenames)
# prefetch files before mergecopies check # prefetch files before mergecopies check
def computenonoverlap(orig, repo, c1, c2, *args, **kwargs): def computenonoverlap(orig, repo, c1, c2, *args, **kwargs):
u1, u2 = orig(repo, c1, c2, *args, **kwargs) u1, u2 = orig(repo, c1, c2, *args, **kwargs)

tests/test-remotefilelog-prefetch.t

3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob) 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
# Prefetch during addrename detection # Prefetch during addrename detection
$ hg up -q --clean tip $ hg up -q --clean tip
$ hg revert --all $ hg revert --all
$ mv x x2 $ mv x x2
$ mv y y2 $ mv y y2
$ mv z z2 $ mv z z2
$ echo a > a
$ hg add a
$ rm a
$ clearcache $ clearcache
$ hg addremove -s 50 > /dev/null $ hg addremove -s 50 > /dev/null
3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob) 3 files fetched over 1 fetches - (3 misses, 0.00% hit ratio) over * (glob)
$ hg revert --all $ hg revert --all
forgetting x2 forgetting x2
forgetting y2 forgetting y2
forgetting z2 forgetting z2
undeleting x undeleting x