equal
deleted
inserted
replaced
507 fp=None, changes=None, opts=None): |
507 fp=None, changes=None, opts=None): |
508 '''Monkeypatch patch.diff to avoid expansion except when |
508 '''Monkeypatch patch.diff to avoid expansion except when |
509 comparing against working dir.''' |
509 comparing against working dir.''' |
510 if node2 is not None: |
510 if node2 is not None: |
511 kwt.matcher = util.never |
511 kwt.matcher = util.never |
512 elif node1 is not None and node1 != repo.changectx().node(): |
512 elif node1 is not None and node1 != repo.dirstate.parents()[0]: |
513 kwt.restrict = True |
513 kwt.restrict = True |
514 patch_diff(repo, node1, node2, match, fp, changes, opts) |
514 patch_diff(repo, node1, node2, match, fp, changes, opts) |
515 |
515 |
516 def kwweb_changeset(web, req, tmpl): |
516 def kwweb_changeset(web, req, tmpl): |
517 '''Wraps webcommands.changeset turning off keyword expansion.''' |
517 '''Wraps webcommands.changeset turning off keyword expansion.''' |