Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Thu, 19 May 2011 00:51:06 +0200
changeset 954 12a2b9b99beb
parent 952 eb6ebe425bf6 (current diff)
parent 953 cf67cd5f6834 (diff)
child 959 fee93dd51b18
Merge with stable
--- a/hgkw/keyword.py	Wed May 18 23:30:45 2011 +0200
+++ b/hgkw/keyword.py	Thu May 19 00:51:06 2011 +0200
@@ -595,11 +595,11 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, backend,
+    def kwpatchfile_init(orig, self, ui, fname, backend, mode,
                          missing=False, eolmode=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, backend, missing, eolmode)
+        orig(self, ui, fname, backend, mode, missing, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)