patch: pass an opener to patchfile stable
authorPatrick Mezard <pmezard@gmail.com>
Wed, 19 Nov 2008 13:27:57 +0100
branchstable
changeset 522 1dc08efd8e81
parent 521 20abfd844367
child 523 062ce3b9c962
patch: pass an opener to patchfile [ original upstream description ]
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)