# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1283525948 -3600
# Node ID f236a384d23e5571df8e4ad39e222255a9576faf
# Parent  a9331f9561dd15d211f22562526b36b38e9dc0f9# Parent  1ae8e3a802982c3f5a5701b2c6455ef6b45d56d9
Merge with stable

diff -r a9331f9561dd -r f236a384d23e hgkw/keyword.py
--- a/hgkw/keyword.py	Tue Aug 31 18:18:28 2010 +0100
+++ b/hgkw/keyword.py	Fri Sep 03 15:59:08 2010 +0100
@@ -511,14 +511,14 @@
         self.lines = kwt.shrinklines(self.fname, self.lines)
 
     def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None,
-                opts=None):
+                opts=None, prefix=''):
         '''Monkeypatch patch.diff to avoid expansion except when
         comparing against working dir.'''
         if node2 is not None:
             kwt.match = util.never
         elif node1 is not None and node1 != repo['.'].node():
             kwt.restrict = True
-        return orig(repo, node1, node2, match, changes, opts)
+        return orig(repo, node1, node2, match, changes, opts, prefix)
 
     def kwweb_skip(orig, web, req, tmpl):
         '''Wraps webcommands.x turning off keyword expansion.'''