Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext/keyword.py
changeset 14367 468d7d1744b4
parent 14348 c1c719103392
child 14451 c78d41db6f88 
--- a/hgext/keyword.py	Wed May 18 23:48:13 2011 +0200
+++ b/hgext/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)
mercurial