469 kwt.overwrite(n, True, None) |
469 kwt.overwrite(n, True, None) |
470 return n |
470 return n |
471 |
471 |
472 # monkeypatches |
472 # monkeypatches |
473 def kwpatchfile_init(orig, self, ui, fname, opener, |
473 def kwpatchfile_init(orig, self, ui, fname, opener, |
474 missing=False, eol=None): |
474 missing=False, eolmode=None): |
475 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
475 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
476 rejects or conflicts due to expanded keywords in working dir.''' |
476 rejects or conflicts due to expanded keywords in working dir.''' |
477 orig(self, ui, fname, opener, missing, eol) |
477 orig(self, ui, fname, opener, missing, eolmode) |
478 # shrink keywords read from working dir |
478 # shrink keywords read from working dir |
479 self.lines = kwt.shrinklines(self.fname, self.lines) |
479 self.lines = kwt.shrinklines(self.fname, self.lines) |
480 |
480 |
481 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
481 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
482 opts=None): |
482 opts=None): |