Fix dirstate wrapping to match upstream

Upstream Mercurial commit f447144c8ada changed the dirstate.status output. This
updates remotefilelog to match that new output.
This commit is contained in:
Durham Goode 2014-10-22 12:36:53 -07:00
parent 37798a0827
commit f9730cd521

View File

@ -111,8 +111,7 @@ def wraprepo(repo):
# Wrap dirstate.status here so we can prefetch all file nodes in
# the lookup set before localrepo.status uses them.
def status(orig, match, subrepos, ignored, clean, unknown):
lookup, modified, added, removed, deleted, unknown, ignored, \
clean = orig(match, subrepos, ignored, clean, unknown)
lookup, status = orig(match, subrepos, ignored, clean, unknown)
if lookup:
files = []
@ -125,8 +124,7 @@ def wraprepo(repo):
repo.fileservice.prefetch(files)
return (lookup, modified, added, removed, deleted, unknown, \
ignored, clean)
return lookup, status
wrapfunction(repo.dirstate, 'status', status)