593 return ret |
593 return ret |
594 finally: |
594 finally: |
595 wlock.release() |
595 wlock.release() |
596 |
596 |
597 # monkeypatches |
597 # monkeypatches |
598 def kwpatchfile_init(orig, self, ui, fname, backend, mode, create, remove, |
598 def kwpatchfile_init(orig, self, ui, fname, backend, store, mode, create, |
599 missing=False, eolmode=None): |
599 remove, eolmode=None, copysource=None): |
600 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
600 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
601 rejects or conflicts due to expanded keywords in working dir.''' |
601 rejects or conflicts due to expanded keywords in working dir.''' |
602 orig(self, ui, fname, backend, mode, create, remove, missing, eolmode) |
602 orig(self, ui, fname, backend, store, mode, create, remove, |
|
603 eolmode, copysource) |
603 # shrink keywords read from working dir |
604 # shrink keywords read from working dir |
604 self.lines = kwt.shrinklines(self.fname, self.lines) |
605 self.lines = kwt.shrinklines(self.fname, self.lines) |
605 |
606 |
606 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
607 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
607 opts=None, prefix=''): |
608 opts=None, prefix=''): |