503 rejects or conflicts due to expanded keywords in working dir.''' |
503 rejects or conflicts due to expanded keywords in working dir.''' |
504 patchfile_init(self, ui, fname, missing) |
504 patchfile_init(self, ui, fname, missing) |
505 # shrink keywords read from working dir |
505 # shrink keywords read from working dir |
506 self.lines = kwt.shrinklines(self.fname, self.lines) |
506 self.lines = kwt.shrinklines(self.fname, self.lines) |
507 |
507 |
508 def kw_diff(repo, node1=None, node2=None, files=None, match=util.always, |
508 def kw_diff(repo, node1=None, node2=None, match=None, |
509 fp=None, changes=None, opts=None): |
509 fp=None, changes=None, opts=None): |
510 '''Monkeypatch patch.diff to avoid expansion except when |
510 '''Monkeypatch patch.diff to avoid expansion except when |
511 comparing against working dir.''' |
511 comparing against working dir.''' |
512 if node2 is not None: |
512 if node2 is not None: |
513 kwt.matcher = util.never |
513 kwt.matcher = util.never |