equal
deleted
inserted
replaced
493 return n |
493 return n |
494 finally: |
494 finally: |
495 release(lock, wlock) |
495 release(lock, wlock) |
496 |
496 |
497 # monkeypatches |
497 # monkeypatches |
498 def kwpatchfile_init(orig, self, ui, fname, opener, missing=False, eol=None): |
498 def kwpatchfile_init(orig, self, ui, fname, opener, |
|
499 missing=False, eol=None): |
499 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
500 '''Monkeypatch/wrap patch.patchfile.__init__ to avoid |
500 rejects or conflicts due to expanded keywords in working dir.''' |
501 rejects or conflicts due to expanded keywords in working dir.''' |
501 orig(self, ui, fname, opener, missing, eol) |
502 orig(self, ui, fname, opener, missing, eol) |
502 # shrink keywords read from working dir |
503 # shrink keywords read from working dir |
503 self.lines = kwt.shrinklines(self.fname, self.lines) |
504 self.lines = kwt.shrinklines(self.fname, self.lines) |