# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1287095805 -7200
# Node ID 55e4ea6d1c01a3582463f84803bc8bb106f8f009
# Parent  df93d61a7790e535f47b4d9c53862a1ad13bae16# Parent  12f6e285e4e7f33b358d1ed2555ab3a454025308
Merge with default

diff -r df93d61a7790 -r 55e4ea6d1c01 hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Jul 27 23:07:30 2010 +0900
+++ b/hgkw/keyword.py	Fri Oct 15 00:36:45 2010 +0200
@@ -594,9 +594,14 @@
     def kwfilectx_cmp(orig, self, fctx):
         # keyword affects data size, comparing wdir and filelog size does
         # not make sense
-        return self._filelog.cmp(self._filenode, fctx.data())
+        if (fctx._filerev is None and
+            (self._repo._encodefilterpats or
+             kwt.match(fctx.path()) and not 'l' in fctx.flags()) or
+            self.size() == fctx.size()):
+            return self._filelog.cmp(self._filenode, fctx.data())
+        return True
+
     extensions.wrapfunction(context.filectx, 'cmp', kwfilectx_cmp)
-
     extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
     extensions.wrapfunction(patch, 'diff', kw_diff)
     extensions.wrapfunction(cmdutil, 'copy', kw_copy)