diff --git a/mercurial/hgweb.py b/mercurial/hgweb.py --- a/mercurial/hgweb.py +++ b/mercurial/hgweb.py @@ -270,18 +270,24 @@ class hgweb(object): modified, added, removed = map(lambda x: filterfiles(files, x), (modified, added, removed)) + diffopts = self.repo.ui.diffopts() + showfunc = diffopts['showfunc'] + ignorews = diffopts['ignorews'] for f in modified: to = r.file(f).read(mmap1[f]) tn = r.file(f).read(mmap2[f]) - yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) + yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, + showfunc=showfunc, ignorews=ignorews), f, tn) for f in added: to = None tn = r.file(f).read(mmap2[f]) - yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) + yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, + showfunc=showfunc, ignorews=ignorews), f, tn) for f in removed: to = r.file(f).read(mmap1[f]) tn = None - yield diffblock(mdiff.unidiff(to, date1, tn, date2, f), f, tn) + yield diffblock(mdiff.unidiff(to, date1, tn, date2, f, + showfunc=showfunc, ignorews=ignorews), f, tn) def changelog(self, pos): def changenav(**map):