context: error out if basefilectx.cmp() is called without self._filenode The base implementation can't handle such cases because the filelog has no knowledge about the working directory. Loading self._filenode should have no extra cost since self.size() would load it anyway.

context: collapse complex condition to see if filelog have to be compared It's hard to read. I'd rather make the return statement duplicated.

merge with stable