This is an archive of the discontinued Mercurial Phabricator instance.

	Status	Author	Revision
	Closed	Alphare	D10217 rust-status: fix issue6456 for the Rust implementation also
	Closed	cschuhen	D10146 enclink: check contents of symlinks not just size in case of fcrypt

Diff 26366

	if self._repo._encodefilterpats:			if self._repo._encodefilterpats:
	# can't rely on size() because wdir content may be decoded			# can't rely on size() because wdir content may be decoded
	return self._filelog.cmp(self._filenode, fctx.data())			return self._filelog.cmp(self._filenode, fctx.data())
	if self.size() - 4 == fctx.size():			if self.size() - 4 == fctx.size():
	# size() can match:			# size() can match:
	# if file data starts with '\1\n', empty metadata block is			# if file data starts with '\1\n', empty metadata block is
	# prepended, which adds 4 bytes to filelog.size().			# prepended, which adds 4 bytes to filelog.size().
	return self._filelog.cmp(self._filenode, fctx.data())			return self._filelog.cmp(self._filenode, fctx.data())
	if self.size() == fctx.size():			if self.size() == fctx.size() or self.flags() == b'l':
	# size() matches: need to compare content			# 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())			return self._filelog.cmp(self._filenode, fctx.data())

	# size() differs			# size() differs
	return True			return True

	def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None):			def _adjustlinkrev(self, srcrev, inclusive=False, stoprev=None):
	"""return the first ancestor of <srcrev> introducing <fnode>			"""return the first ancestor of <srcrev> introducing <fnode>

	size >= 0			size >= 0
	and (			and (
	(size != st.st_size and size != st.st_size & _rangemask)			(size != st.st_size and size != st.st_size & _rangemask)
	or ((mode ^ st.st_mode) & 0o100 and checkexec)			or ((mode ^ st.st_mode) & 0o100 and checkexec)
	)			)
	or size == -2 # other parent			or size == -2 # other parent
	or fn in copymap			or fn in copymap
	):			):
				if (stat.S_ISLNK(st.st_mode) and size != st.st_size):
				# issue6456: Size returned may be longer due to
				# encryption on EXT-4 fscrypt, undecided.
				ladd(fn)
				else:
	madd(fn)			madd(fn)
	elif (			elif (
	time != st[stat.ST_MTIME]			time != st[stat.ST_MTIME]
	and time != st[stat.ST_MTIME] & _rangemask			and time != st[stat.ST_MTIME] & _rangemask
	):			):
	ladd(fn)			ladd(fn)
	elif st[stat.ST_MTIME] == lastnormaltime:			elif st[stat.ST_MTIME] == lastnormaltime:
	# fn may have just been marked as normal and it may have			# fn may have just been marked as normal and it may have
	# changed in the same second without changing its size.			# changed in the same second without changing its size.