# HG changeset patch # User Augie Fackler # Date 1271529522 18000 # Node ID bd17227407989d0993294735e7f085686d12d1c2 # Parent 5df6643c39e9e9327f05eec9a9a2678315d95139 keyword: monkeypatch patch so that optional args can be passed as kwargs [ original upstream message ] diff -r 5df6643c39e9 -r bd1722740798 hgkw/keyword.py --- a/hgkw/keyword.py Thu Apr 15 20:25:07 2010 +0200 +++ b/hgkw/keyword.py Sat Apr 17 13:38:42 2010 -0500 @@ -471,10 +471,10 @@ # monkeypatches def kwpatchfile_init(orig, self, ui, fname, opener, - missing=False, eol=None): + 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, eol) + orig(self, ui, fname, opener, missing, eolmode) # shrink keywords read from working dir self.lines = kwt.shrinklines(self.fname, self.lines)