##// END OF EJS Templates
lfs: fix a discrepancy with a function wanting a filelog, but calling it rlog...
Matt Harbison -
r44410:26cf356a default
parent child Browse files
Show More
@@ -151,12 +151,12 b' def _islfs(rlog, node=None, rev=None):'
151 151 if node is None:
152 152 # both None - likely working copy content where node is not ready
153 153 return False
154 rev = rlog._revlog.rev(node)
154 rev = rlog.rev(node)
155 155 else:
156 node = rlog._revlog.node(rev)
156 node = rlog.node(rev)
157 157 if node == nullid:
158 158 return False
159 flags = rlog._revlog.flags(rev)
159 flags = rlog.flags(rev)
160 160 return bool(flags & revlog.REVIDX_EXTSTORED)
161 161
162 162
@@ -203,7 +203,7 b' def filelogaddrevision('
203 203
204 204 # Wrapping may also be applied by remotefilelog
205 205 def filelogrenamed(orig, self, node):
206 if _islfs(self, node):
206 if _islfs(self._revlog, node):
207 207 rawtext = self._revlog.rawdata(node)
208 208 if not rawtext:
209 209 return False
@@ -217,7 +217,7 b' def filelogrenamed(orig, self, node):'
217 217
218 218 # Wrapping may also be applied by remotefilelog
219 219 def filelogsize(orig, self, rev):
220 if _islfs(self, rev=rev):
220 if _islfs(self._revlog, rev=rev):
221 221 # fast path: use lfs metadata to answer size
222 222 rawtext = self._revlog.rawdata(rev)
223 223 metadata = pointer.deserialize(rawtext)
@@ -248,7 +248,7 b' def filectxisbinary(orig, self):'
248 248
249 249
250 250 def filectxislfs(self):
251 return _islfs(self.filelog(), self.filenode())
251 return _islfs(self.filelog()._revlog, self.filenode())
252 252
253 253
254 254 @eh.wrapfunction(cmdutil, b'_updatecatformatter')
@@ -459,7 +459,7 b' def pointerfromctx(ctx, f, removed=False'
459 459 else:
460 460 return None
461 461 fctx = _ctx[f]
462 if not _islfs(fctx.filelog(), fctx.filenode()):
462 if not _islfs(fctx.filelog()._revlog, fctx.filenode()):
463 463 return None
464 464 try:
465 465 p = pointer.deserialize(fctx.rawdata())
General Comments 0
You need to be logged in to leave comments. Login now