# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1426631614 25200
# Node ID 3e8b06097d00b8e22918ba9e6daf9613dd3a8229
# Parent  109a2acc19ed7dc59335991d8f5038bbdc13b7dd
keyword: monkeypatch patch.diff more generically

This function doesn't need access to any of the args or kwargs, so make the
monkeypatching more robust. (In upcoming patches we'll introduce another
argument to patch.diff, and this function would break if it weren't for this
patch.)

diff -r 109a2acc19ed -r 3e8b06097d00 hgext/keyword.py
--- a/hgext/keyword.py	Tue Mar 17 15:52:28 2015 -0700
+++ b/hgext/keyword.py	Tue Mar 17 15:33:34 2015 -0700
@@ -643,11 +643,10 @@
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)
 
-    def kwdiff(orig, repo, node1=None, node2=None, match=None, changes=None,
-                opts=None, prefix=''):
+    def kwdiff(orig, *args, **kwargs):
         '''Monkeypatch patch.diff to avoid expansion.'''
         kwt.restrict = True
-        return orig(repo, node1, node2, match, changes, opts, prefix)
+        return orig(*args, **kwargs)
 
     def kwweb_skip(orig, web, req, tmpl):
         '''Wraps webcommands.x turning off keyword expansion.'''