Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Wed, 18 May 2011 00:44:15 +0200
changeset 950 d93ca857e4bb
parent 948 65b0318770d1 (current diff)
parent 949 dd81191ffac3 (diff)
child 952 eb6ebe425bf6
Merge with stable
--- a/hgkw/keyword.py	Tue May 17 13:45:25 2011 +0200
+++ b/hgkw/keyword.py	Wed May 18 00:44:15 2011 +0200
@@ -595,11 +595,11 @@
                 wlock.release()
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, opener,
+    def kwpatchfile_init(orig, self, ui, fname, backend,
                          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, opener, missing, eolmode)
+        orig(self, ui, fname, backend, missing, eolmode)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)