Mercurial > public > mercurial-scm > hg-stable
diff hgext/keyword.py @ 12167:d2c5b0927c28
diff: recurse into subrepositories with --subrepos/-S flag
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 03 Sep 2010 12:58:51 +0200 |
parents | c5e555e064d0 |
children | 97e37994a6c3 |
line wrap: on
line diff
--- a/hgext/keyword.py Fri Sep 03 12:58:51 2010 +0200 +++ b/hgext/keyword.py Fri Sep 03 12:58:51 2010 +0200 @@ -511,14 +511,14 @@ self.lines = kwt.shrinklines(self.fname, self.lines) def kw_diff(orig, repo, node1=None, node2=None, match=None, changes=None, - opts=None): + opts=None, prefix=''): '''Monkeypatch patch.diff to avoid expansion except when comparing against working dir.''' if node2 is not None: kwt.match = util.never elif node1 is not None and node1 != repo['.'].node(): kwt.restrict = True - return orig(repo, node1, node2, match, changes, opts) + return orig(repo, node1, node2, match, changes, opts, prefix) def kwweb_skip(orig, web, req, tmpl): '''Wraps webcommands.x turning off keyword expansion.'''