# HG changeset patch
# User Patrick Mezard <pmezard@gmail.com>
# Date 1305755293 -7200
# Node ID cf67cd5f683467d605ec3a851fa02edc2696f599
# Parent  0af8a73dfe14be3666cfb5e8c23646b6ba3d5bd6
patch: set desired mode when patching, not in updatedir()

This patch and the following aim at merging _updatedir() actions into
_applydiff().

[ original upstream message ]

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)