Mercurial > hg
comparison hgext/keyword.py @ 6602:a57a27b12965
match: remove files argument from patch.diff
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Mon, 12 May 2008 11:37:08 -0500 |
| parents | 5acbdd3941c4 |
| children | 41eb20cc1c02 |
comparison
equal
deleted
inserted
replaced
| 6601:cab3ad865444 | 6602:a57a27b12965 |
|---|---|
| 501 rejects or conflicts due to expanded keywords in working dir.''' | 501 rejects or conflicts due to expanded keywords in working dir.''' |
| 502 patchfile_init(self, ui, fname, missing) | 502 patchfile_init(self, ui, fname, missing) |
| 503 # shrink keywords read from working dir | 503 # shrink keywords read from working dir |
| 504 self.lines = kwt.shrinklines(self.fname, self.lines) | 504 self.lines = kwt.shrinklines(self.fname, self.lines) |
| 505 | 505 |
| 506 def kw_diff(repo, node1=None, node2=None, files=None, match=util.always, | 506 def kw_diff(repo, node1=None, node2=None, match=None, |
| 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.changectx().node(): |
| 513 kwt.restrict = True | 513 kwt.restrict = True |
| 514 patch_diff(repo, node1, node2, files, 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.''' |
| 518 kwt.matcher = util.never | 518 kwt.matcher = util.never |
| 519 return webcommands_changeset(web, req, tmpl) | 519 return webcommands_changeset(web, req, tmpl) |