Mercurial Mercurial > test / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: set desired mode when patching, not in updatedir() stable
authorPatrick Mezard <pmezard@gmail.com>
Wed, 18 May 2011 23:48:13 +0200
branchstable
changeset 953 cf67cd5f6834
parent 951 0af8a73dfe14
child 954 12a2b9b99beb
child 955 85e0c572897f
patch: set desired mode when patching, not in updatedir() This patch and the following aim at merging _updatedir() actions into _applydiff(). [ original upstream message ]
hgkw/keyword.py file | annotate | diff | comparison | revisions 
--- 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)
test