Show More
@@ -594,9 +594,14 b' def reposetup(ui, repo):' | |||
|
594 | 594 | def kwfilectx_cmp(orig, self, fctx): |
|
595 | 595 | # keyword affects data size, comparing wdir and filelog size does |
|
596 | 596 | # not make sense |
|
597 | return self._filelog.cmp(self._filenode, fctx.data()) | |
|
597 | if (fctx._filerev is None and | |
|
598 | (self._repo._encodefilterpats or | |
|
599 | kwt.match(fctx.path()) and not 'l' in fctx.flags()) or | |
|
600 | self.size() == fctx.size()): | |
|
601 | return self._filelog.cmp(self._filenode, fctx.data()) | |
|
602 | return True | |
|
603 | ||
|
598 | 604 | extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp) |
|
599 | ||
|
600 | 605 | extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init) |
|
601 | 606 | extensions.wrapfunction(patch, 'diff', kw_diff) |
|
602 | 607 | extensions.wrapfunction(cmdutil, 'copy', kw_copy) |
General Comments 0
You need to be logged in to leave comments.
Login now