Mercurial > public > mercurial-scm > hg
diff 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 |
line wrap: on
line diff
--- a/hgext/keyword.py Mon May 12 11:37:08 2008 -0500 +++ b/hgext/keyword.py Mon May 12 11:37:08 2008 -0500 @@ -503,7 +503,7 @@ # shrink keywords read from working dir self.lines = kwt.shrinklines(self.fname, self.lines) - def kw_diff(repo, node1=None, node2=None, files=None, match=util.always, + def kw_diff(repo, node1=None, node2=None, match=None, fp=None, changes=None, opts=None): '''Monkeypatch patch.diff to avoid expansion except when comparing against working dir.''' @@ -511,7 +511,7 @@ kwt.matcher = util.never elif node1 is not None and node1 != repo.changectx().node(): kwt.restrict = True - patch_diff(repo, node1, node2, files, match, fp, changes, opts) + patch_diff(repo, node1, node2, match, fp, changes, opts) def kwweb_changeset(web, req, tmpl): '''Wraps webcommands.changeset turning off keyword expansion.'''