diff --git a/hgext/lfs/wrapper.py b/hgext/lfs/wrapper.py --- a/hgext/lfs/wrapper.py +++ b/hgext/lfs/wrapper.py @@ -115,19 +115,19 @@ if node is None: # both None - likely working copy content where node is not ready return False - rev = rlog.rev(node) + rev = rlog._revlog.rev(node) else: - node = rlog.node(rev) + node = rlog._revlog.node(rev) if node == nullid: return False - flags = rlog.flags(rev) + flags = rlog._revlog.flags(rev) return bool(flags & revlog.REVIDX_EXTSTORED) def filelogaddrevision(orig, self, text, transaction, link, p1, p2, cachedelta=None, node=None, flags=revlog.REVIDX_DEFAULT_FLAGS, **kwds): # The matcher isn't available if reposetup() wasn't called. - lfstrack = self.opener.options.get('lfstrack') + lfstrack = self._revlog.opener.options.get('lfstrack') if lfstrack: textlen = len(text) @@ -144,7 +144,7 @@ def filelogrenamed(orig, self, node): if _islfs(self, node): - rawtext = self.revision(node, raw=True) + rawtext = self._revlog.revision(node, raw=True) if not rawtext: return False metadata = pointer.deserialize(rawtext) @@ -157,7 +157,7 @@ def filelogsize(orig, self, rev): if _islfs(self, rev=rev): # fast path: use lfs metadata to answer size - rawtext = self.revision(rev, raw=True) + rawtext = self._revlog.revision(rev, raw=True) metadata = pointer.deserialize(rawtext) return int(metadata['size']) return orig(self, rev) diff --git a/mercurial/filelog.py b/mercurial/filelog.py --- a/mercurial/filelog.py +++ b/mercurial/filelog.py @@ -57,7 +57,7 @@ def linkrev(self, rev): return self._revlog.linkrev(rev) - # Used by LFS, verify. + # Used by verify. def flags(self, rev): return self._revlog.flags(rev) @@ -207,7 +207,7 @@ def indexfile(self, value): self._revlog.indexfile = value - # Used by LFS, repo upgrade. + # Used by repo upgrade. @property def opener(self): return self._revlog.opener diff --git a/tests/test-lfs.t b/tests/test-lfs.t --- a/tests/test-lfs.t +++ b/tests/test-lfs.t @@ -692,7 +692,7 @@ > continue > sizes = [fl.rawsize(i) for i in fl] > texts = [fl.revision(i, raw=True) for i in fl] - > flags = [int(fl.flags(i)) for i in fl] + > flags = [int(fl._revlog.flags(i)) for i in fl] > hashes = [hash(t) for t in texts] > print(' %s: rawsizes=%r flags=%r hashes=%r' > % (name, sizes, flags, hashes))