# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1307797438 -7200
# Node ID d64b0798075554032dc9b429f6cf5a9dd31db3ac
# Parent  b95f15ba1b1b5057fa40b9a0a9ee749627615096# Parent  aaafe06aaa5f3d1fe75746c8813853d1a3ed0f34
Merge with stable

diff -r b95f15ba1b1b -r d64b07980755 hgkw/keyword.py
--- a/hgkw/keyword.py	Thu Jun 02 00:12:10 2011 +0100
+++ b/hgkw/keyword.py	Sat Jun 11 15:03:58 2011 +0200
@@ -595,12 +595,10 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, backend, store, mode, create,
-                         remove, eolmode=None, copysource=None):
+    def kwpatchfile_init(orig, self, ui, gp, backend, store, eolmode=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, backend, store, mode, create, remove,
-             eolmode, copysource)
+        orig(self, ui, gp, backend, store, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)