diff -r 197aeca9108a -r 0cdbdf79d5e9 hgkw/keyword.py --- a/hgkw/keyword.py Tue Jun 09 09:25:34 2009 -0400 +++ b/hgkw/keyword.py Mon Jun 15 00:03:26 2009 +0200 @@ -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)