diff -r 0af8a73dfe14 -r cf67cd5f6834 hgkw/keyword.py --- a/hgkw/keyword.py Wed May 18 15:45:57 2011 +0200 +++ b/hgkw/keyword.py Wed May 18 23:48:13 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)