Show More
@@ -747,11 +747,15 b' class basefilectx(object):' | |||||
747 | def islink(self): |
|
747 | def islink(self): | |
748 | return 'l' in self.flags() |
|
748 | return 'l' in self.flags() | |
749 |
|
749 | |||
|
750 | _customcmp = False | |||
750 | def cmp(self, fctx): |
|
751 | def cmp(self, fctx): | |
751 | """compare with other file context |
|
752 | """compare with other file context | |
752 |
|
753 | |||
753 | returns True if different than fctx. |
|
754 | returns True if different than fctx. | |
754 | """ |
|
755 | """ | |
|
756 | if fctx._customcmp: | |||
|
757 | return fctx.cmp(self) | |||
|
758 | ||||
755 | if (fctx._filerev is None |
|
759 | if (fctx._filerev is None | |
756 | and (self._repo._encodefilterpats |
|
760 | and (self._repo._encodefilterpats | |
757 | # if file data starts with '\1\n', empty metadata block is |
|
761 | # if file data starts with '\1\n', empty metadata block is |
General Comments 0
You need to be logged in to leave comments.
Login now