[PATCH STABLE] keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Christian Ebert
blacktrash at gmx.net
Fri Jan 13 11:40:33 CST 2012
# HG changeset patch
# User Christian Ebert <blacktrash at gmx.net>
# Date 1326476429 -3600
# Branch stable
# Node ID 86d4ff4dce196a1b49c1aefa61fd8876ca0a7f2f
# Parent 012b285cf643db07c52c694db0df82f51d8e4d27
keyword: update filectx.cmp monkeypatch to handle '\1\n' at start of file
Analogous to 012b285cf643.
diff --git a/hgext/keyword.py b/hgext/keyword.py
--- a/hgext/keyword.py
+++ b/hgext/keyword.py
@@ -681,6 +681,7 @@
if (fctx._filerev is None and
(self._repo._encodefilterpats or
kwt.match(fctx.path()) and not 'l' in fctx.flags()) or
+ self.size() - 4 == fctx.size() or
self.size() == fctx.size()):
return self._filelog.cmp(self._filenode, fctx.data())
return True
More information about the Mercurial-devel
mailing list