# HG changeset patch # User Patrick Mezard # Date 1227097677 -3600 # Node ID 1dc08efd8e81f9a9e84e6808f3e06cc73ebf6352 # Parent 20abfd844367be8f00fef29146fd8fbb0f509834 patch: pass an opener to patchfile [ original upstream description ] diff -r 20abfd844367 -r 1dc08efd8e81 hgkw/keyword.py --- a/hgkw/keyword.py Wed Mar 04 13:06:16 2009 -0600 +++ b/hgkw/keyword.py Wed Nov 19 13:27:57 2008 +0100 @@ -485,10 +485,10 @@ del wlock, lock # monkeypatches - def kwpatchfile_init(orig, self, ui, fname, missing=False): + def kwpatchfile_init(orig, self, ui, fname, opener, missing=False): '''Monkeypatch/wrap patch.patchfile.__init__ to avoid rejects or conflicts due to expanded keywords in working dir.''' - orig(self, ui, fname, missing) + orig(self, ui, fname, opener, missing) # shrink keywords read from working dir self.lines = kwt.shrinklines(self.fname, self.lines)