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