equal
deleted
inserted
replaced
495 # Prefetch merge checkunknownfiles |
495 # Prefetch merge checkunknownfiles |
496 def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs): |
496 def checkunknownfiles(orig, repo, wctx, mctx, force, mresult, *args, **kwargs): |
497 if isenabled(repo): |
497 if isenabled(repo): |
498 files = [] |
498 files = [] |
499 sparsematch = repo.maybesparsematch(mctx.rev()) |
499 sparsematch = repo.maybesparsematch(mctx.rev()) |
500 for f, (m, actionargs, msg) in pycompat.iteritems(mresult.actions): |
500 for f, (m, actionargs, msg) in mresult.filemap(): |
501 if sparsematch and not sparsematch(f): |
501 if sparsematch and not sparsematch(f): |
502 continue |
502 continue |
503 if m in ( |
503 if m in ( |
504 mergestatemod.ACTION_CREATED, |
504 mergestatemod.ACTION_CREATED, |
505 mergestatemod.ACTION_DELETED_CHANGED, |
505 mergestatemod.ACTION_DELETED_CHANGED, |