comparison mercurial/context.py @ 46794:e2f7b2695ba1

merge with stable

46782:6b52cffd8d0a

            if self.size() - 4 == fctx.size():
                # size() can match:
                # if file data starts with '\1\n', empty metadata block is
                # prepended, which adds 4 bytes to filelog.size().
                return self._filelog.cmp(self._filenode, fctx.data())
        if self.size() == fctx.size():
            # size() matches: need to compare content
            return self._filelog.cmp(self._filenode, fctx.data())

        # size() differs
        return True

46794:e2f7b2695ba1

            if self.size() - 4 == fctx.size():
                # size() can match:
                # if file data starts with '\1\n', empty metadata block is
                # prepended, which adds 4 bytes to filelog.size().
                return self._filelog.cmp(self._filenode, fctx.data())
        if self.size() == fctx.size() or self.flags() == b'l':
            # size() matches: need to compare content
            # issue6456: Always compare symlinks because size can represent
            # encrypted string for EXT-4 encryption(fscrypt).
            return self._filelog.cmp(self._filenode, fctx.data())

        # size() differs
        return True