509 orig(self, ui, fname, opener, missing, eolmode) |
509 orig(self, ui, fname, opener, missing, eolmode) |
510 # shrink keywords read from working dir |
510 # shrink keywords read from working dir |
511 self.lines = kwt.shrinklines(self.fname, self.lines) |
511 self.lines = kwt.shrinklines(self.fname, self.lines) |
512 |
512 |
513 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
513 def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, |
514 opts=None): |
514 opts=None, prefix=''): |
515 '''Monkeypatch patch.diff to avoid expansion except when |
515 '''Monkeypatch patch.diff to avoid expansion except when |
516 comparing against working dir.''' |
516 comparing against working dir.''' |
517 if node2 is not None: |
517 if node2 is not None: |
518 kwt.match = util.never |
518 kwt.match = util.never |
519 elif node1 is not None and node1 != repo['.'].node(): |
519 elif node1 is not None and node1 != repo['.'].node(): |
520 kwt.restrict = True |
520 kwt.restrict = True |
521 return orig(repo, node1, node2, match, changes, opts) |
521 return orig(repo, node1, node2, match, changes, opts, prefix) |
522 |
522 |
523 def kwweb_skip(orig, web, req, tmpl): |
523 def kwweb_skip(orig, web, req, tmpl): |
524 '''Wraps webcommands.x turning off keyword expansion.''' |
524 '''Wraps webcommands.x turning off keyword expansion.''' |
525 kwt.match = util.never |
525 kwt.match = util.never |
526 return orig(web, req, tmpl) |
526 return orig(web, req, tmpl) |