Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Mon, 15 Jun 2009 11:10:15 +0100
changeset 578 b9b551e18502
parent 576 b21f76520d40 (current diff)
parent 577 0cdbdf79d5e9 (diff)
child 579 1dc66cff9dd5
Merge with stable
--- a/hgkw/keyword.py	Tue Jun 09 22:42:39 2009 +0200
+++ b/hgkw/keyword.py	Mon Jun 15 11:10:15 2009 +0100
@@ -485,10 +485,10 @@
                 release(lock, wlock)
 
     # monkeypatches
-    def kwpatchfile_init(orig, self, ui, fname, opener, missing=False):
+    def kwpatchfile_init(orig, self, ui, fname, opener, missing=False, eol=None):
         '''Monkeypatch/wrap patch.patchfile.__init__ to avoid
         rejects or conflicts due to expanded keywords in working dir.'''
-        orig(self, ui, fname, opener, missing)
+        orig(self, ui, fname, opener, missing, eol)
         # shrink keywords read from working dir
         self.lines = kwt.shrinklines(self.fname, self.lines)