diff -r 9926aab3d0b5 -r a84698badf0b mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Sun Nov 20 19:14:36 2011 +0100 +++ b/mercurial/hgweb/webcommands.py Fri Nov 18 12:04:31 2011 +0100 @@ -12,7 +12,7 @@ from mercurial.util import binary from common import paritygen, staticfile, get_contact, ErrorResponse from common import HTTP_OK, HTTP_FORBIDDEN, HTTP_NOT_FOUND -from mercurial import graphmod +from mercurial import graphmod, patch from mercurial import help as helpmod from mercurial.i18n import _ @@ -576,6 +576,7 @@ fctx = webutil.filectx(web.repo, req) f = fctx.path() parity = paritygen(web.stripecount) + diffopts = patch.diffopts(web.repo.ui, untrusted=True, section='annotate') def annotate(**map): last = None @@ -585,7 +586,8 @@ lines = enumerate([((fctx.filectx(fctx.filerev()), 1), '(binary:%s)' % mt)]) else: - lines = enumerate(fctx.annotate(follow=True, linenumber=True)) + lines = enumerate(fctx.annotate(follow=True, linenumber=True, + diffopts=diffopts)) for lineno, ((f, targetline), l) in lines: fnode = f.filenode()