| indygreg |
| hg-reviewers |
This conceptually broke in 1541e1a8e87d when the filelog isa revlog relationship
was changed to containment of the revlog. It was made more obvious in
62a532045e71 and related API simplification.
It's resolved in favor of passing a revlog because the revlog verification code
doesn't have a reference to a filelog.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/lfs/wrapper.py (14 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| return (rawtext, False) | return (rawtext, False) | ||||
| def _islfs(rlog, node=None, rev=None): | def _islfs(rlog, node=None, rev=None): | ||||
| if rev is None: | if rev is None: | ||||
| if node is None: | if node is None: | ||||
| # both None - likely working copy content where node is not ready | # both None - likely working copy content where node is not ready | ||||
| return False | return False | ||||
| rev = rlog._revlog.rev(node) | rev = rlog.rev(node) | ||||
| else: | else: | ||||
| node = rlog._revlog.node(rev) | node = rlog.node(rev) | ||||
| if node == nullid: | if node == nullid: | ||||
| return False | return False | ||||
| flags = rlog._revlog.flags(rev) | flags = rlog.flags(rev) | ||||
| return bool(flags & revlog.REVIDX_EXTSTORED) | return bool(flags & revlog.REVIDX_EXTSTORED) | ||||
| # Wrapping may also be applied by remotefilelog | # Wrapping may also be applied by remotefilelog | ||||
| def filelogaddrevision( | def filelogaddrevision( | ||||
| orig, | orig, | ||||
| self, | self, | ||||
| text, | text, | ||||
| node=node, | node=node, | ||||
| flags=flags, | flags=flags, | ||||
| **kwds | **kwds | ||||
| ) | ) | ||||
| # Wrapping may also be applied by remotefilelog | # Wrapping may also be applied by remotefilelog | ||||
| def filelogrenamed(orig, self, node): | def filelogrenamed(orig, self, node): | ||||
| if _islfs(self, node): | if _islfs(self._revlog, node): | ||||
| rawtext = self._revlog.rawdata(node) | rawtext = self._revlog.rawdata(node) | ||||
| if not rawtext: | if not rawtext: | ||||
| return False | return False | ||||
| metadata = pointer.deserialize(rawtext) | metadata = pointer.deserialize(rawtext) | ||||
| if b'x-hg-copy' in metadata and b'x-hg-copyrev' in metadata: | if b'x-hg-copy' in metadata and b'x-hg-copyrev' in metadata: | ||||
| return metadata[b'x-hg-copy'], bin(metadata[b'x-hg-copyrev']) | return metadata[b'x-hg-copy'], bin(metadata[b'x-hg-copyrev']) | ||||
| else: | else: | ||||
| return False | return False | ||||
| return orig(self, node) | return orig(self, node) | ||||
| # Wrapping may also be applied by remotefilelog | # Wrapping may also be applied by remotefilelog | ||||
| def filelogsize(orig, self, rev): | def filelogsize(orig, self, rev): | ||||
| if _islfs(self, rev=rev): | if _islfs(self._revlog, rev=rev): | ||||
| # fast path: use lfs metadata to answer size | # fast path: use lfs metadata to answer size | ||||
| rawtext = self._revlog.rawdata(rev) | rawtext = self._revlog.rawdata(rev) | ||||
| metadata = pointer.deserialize(rawtext) | metadata = pointer.deserialize(rawtext) | ||||
| return int(metadata[b'size']) | return int(metadata[b'size']) | ||||
| return orig(self, rev) | return orig(self, rev) | ||||
| @eh.wrapfunction(context.basefilectx, b'cmp') | @eh.wrapfunction(context.basefilectx, b'cmp') | ||||
| # fast path: use lfs metadata to answer isbinary | # fast path: use lfs metadata to answer isbinary | ||||
| metadata = pointer.deserialize(self.rawdata()) | metadata = pointer.deserialize(self.rawdata()) | ||||
| # if lfs metadata says nothing, assume it's binary by default | # if lfs metadata says nothing, assume it's binary by default | ||||
| return bool(int(metadata.get(b'x-is-binary', 1))) | return bool(int(metadata.get(b'x-is-binary', 1))) | ||||
| return orig(self) | return orig(self) | ||||
| def filectxislfs(self): | def filectxislfs(self): | ||||
| return _islfs(self.filelog(), self.filenode()) | return _islfs(self.filelog()._revlog, self.filenode()) | ||||
| @eh.wrapfunction(cmdutil, b'_updatecatformatter') | @eh.wrapfunction(cmdutil, b'_updatecatformatter') | ||||
| def _updatecatformatter(orig, fm, ctx, matcher, path, decode): | def _updatecatformatter(orig, fm, ctx, matcher, path, decode): | ||||
| orig(fm, ctx, matcher, path, decode) | orig(fm, ctx, matcher, path, decode) | ||||
| fm.data(rawdata=ctx[path].rawdata()) | fm.data(rawdata=ctx[path].rawdata()) | ||||
| return None | return None | ||||
| if f in ctx.p1(): | if f in ctx.p1(): | ||||
| _ctx = ctx.p1() | _ctx = ctx.p1() | ||||
| elif f in ctx.p2(): | elif f in ctx.p2(): | ||||
| _ctx = ctx.p2() | _ctx = ctx.p2() | ||||
| else: | else: | ||||
| return None | return None | ||||
| fctx = _ctx[f] | fctx = _ctx[f] | ||||
| if not _islfs(fctx.filelog(), fctx.filenode()): | if not _islfs(fctx.filelog()._revlog, fctx.filenode()): | ||||
| return None | return None | ||||
| try: | try: | ||||
| p = pointer.deserialize(fctx.rawdata()) | p = pointer.deserialize(fctx.rawdata()) | ||||
| if ctx == _ctx: | if ctx == _ctx: | ||||
| return p | return p | ||||
| return {} | return {} | ||||
| except pointer.InvalidPointer as ex: | except pointer.InvalidPointer as ex: | ||||
| raise error.Abort( | raise error.Abort( | ||||