facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

largefiles: remove confusing rev parameter for lfdirstatestatus

Browse Source 
Dirstate only works on the repo wctx.
This commit is contained in:
Mads Kiilerich 2014-10-03 00:42:40 +02:00
parent 2518387f43
commit 3b22bfee79
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hgext/largefiles/lfutil.py
View File

@ -134,13 +134,14 @@ def openlfdirstate(ui, repo, create=True):
lfdirstate.normallookup(lfile)
return lfdirstate
def lfdirstatestatus(lfdirstate, repo, rev):
def lfdirstatestatus(lfdirstate, repo):
wctx = repo['.']
match = match_.always(repo.root, repo.getcwd())
unsure, s = lfdirstate.status(match, [], False, False, False)
modified, clean = s.modified, s.clean
for lfile in unsure:
try:
fctx = repo[rev][standin(lfile)]
fctx = wctx[standin(lfile)]
except LookupError:
fctx = None
if not fctx or fctx.data().strip() != hashfile(repo.wjoin(lfile)):

2
hgext/largefiles/overrides.py
View File

@ -660,7 +660,7 @@ def overriderevert(orig, ui, repo, *pats, **opts):
wlock = repo.wlock()
try:
lfdirstate = lfutil.openlfdirstate(ui, repo)
s = lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev())
s = lfutil.lfdirstatestatus(lfdirstate, repo)
lfdirstate.write()
for lfile in s.modified:
lfutil.updatestandin(repo, lfutil.standin(lfile))