##// END OF EJS Templates
largefiles: remove confusing rev parameter for lfdirstatestatus...
Mads Kiilerich -
r23039:1350b917 default
parent child Browse files
Show More
@@ -134,13 +134,14 def openlfdirstate(ui, repo, create=True
134 lfdirstate.normallookup(lfile)
134 lfdirstate.normallookup(lfile)
135 return lfdirstate
135 return lfdirstate
136
136
137 def lfdirstatestatus(lfdirstate, repo, rev):
137 def lfdirstatestatus(lfdirstate, repo):
138 wctx = repo['.']
138 match = match_.always(repo.root, repo.getcwd())
139 match = match_.always(repo.root, repo.getcwd())
139 unsure, s = lfdirstate.status(match, [], False, False, False)
140 unsure, s = lfdirstate.status(match, [], False, False, False)
140 modified, clean = s.modified, s.clean
141 modified, clean = s.modified, s.clean
141 for lfile in unsure:
142 for lfile in unsure:
142 try:
143 try:
143 fctx = repo[rev][standin(lfile)]
144 fctx = wctx[standin(lfile)]
144 except LookupError:
145 except LookupError:
145 fctx = None
146 fctx = None
146 if not fctx or fctx.data().strip() != hashfile(repo.wjoin(lfile)):
147 if not fctx or fctx.data().strip() != hashfile(repo.wjoin(lfile)):
@@ -660,7 +660,7 def overriderevert(orig, ui, repo, *pats
660 wlock = repo.wlock()
660 wlock = repo.wlock()
661 try:
661 try:
662 lfdirstate = lfutil.openlfdirstate(ui, repo)
662 lfdirstate = lfutil.openlfdirstate(ui, repo)
663 s = lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev())
663 s = lfutil.lfdirstatestatus(lfdirstate, repo)
664 lfdirstate.write()
664 lfdirstate.write()
665 for lfile in s.modified:
665 for lfile in s.modified:
666 lfutil.updatestandin(repo, lfutil.standin(lfile))
666 lfutil.updatestandin(repo, lfutil.standin(lfile))
General Comments 0
You need to be logged in to leave comments. Login now