equal
deleted
inserted
replaced
500 # Prefetch merge checkunknownfiles |
500 # Prefetch merge checkunknownfiles |
501 def checkunknownfiles(orig, repo, wctx, mctx, force, actions, *args, **kwargs): |
501 def checkunknownfiles(orig, repo, wctx, mctx, force, actions, *args, **kwargs): |
502 if isenabled(repo): |
502 if isenabled(repo): |
503 files = [] |
503 files = [] |
504 sparsematch = repo.maybesparsematch(mctx.rev()) |
504 sparsematch = repo.maybesparsematch(mctx.rev()) |
505 for f, (m, actionargs, msg) in actions.iteritems(): |
505 for f, (m, actionargs, msg) in pycompat.iteritems(actions): |
506 if sparsematch and not sparsematch(f): |
506 if sparsematch and not sparsematch(f): |
507 continue |
507 continue |
508 if m in (b'c', b'dc', b'cm'): |
508 if m in (b'c', b'dc', b'cm'): |
509 files.append((f, hex(mctx.filenode(f)))) |
509 files.append((f, hex(mctx.filenode(f)))) |
510 elif m == b'dg': |
510 elif m == b'dg': |