# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 1283511531 -7200
# Node ID 1ae8e3a802982c3f5a5701b2c6455ef6b45d56d9
# Parent  5a41673d33fb3dbe1be82fc20689b40f5722e1c2
diff: recurse into subrepositories with --subrepos/-S flag

[ original upstream message ]

diff -r 5a41673d33fb -r 1ae8e3a80298 hgkw/keyword.py
--- a/hgkw/keyword.py	Mon Aug 30 13:15:30 2010 +0900
+++ b/hgkw/keyword.py	Fri Sep 03 12:58:51 2010 +0200
@@ -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.'''