Do not monkeypatch diff when in restricted mode
authorChristian Ebert <blacktrash@gmx.net>
Wed, 23 Dec 2009 12:04:04 +0000
changeset 667 52b03aad673b
parent 666 dead519e4ec6
child 668 13a6a2c0440f
Do not monkeypatch diff when in restricted mode kw_diff actually disabled restricted mode when 2 revisions were given, because it effectively disables the extension in this case. But the commands working with diff and patch need restricted mode always enabled, i.e. expansion enabled when writing to the working directory and - crucial for these commands - no expansion when reading the filelog.
hgkw/keyword.py
--- a/hgkw/keyword.py	Sun Nov 29 11:27:33 2009 +0000
+++ b/hgkw/keyword.py	Wed Dec 23 12:04:04 2009 +0000
@@ -537,7 +537,8 @@
     repo.__class__ = kwrepo
 
     extensions.wrapfunction(patch.patchfile, '__init__', kwpatchfile_init)
-    extensions.wrapfunction(patch, 'diff', kw_diff)
+    if not kwt.restrict:
+        extensions.wrapfunction(patch, 'diff', kw_diff)
     for c in 'annotate changeset rev filediff diff'.split():
         extensions.wrapfunction(webcommands, c, kwweb_skip)