comparison mercurial/hgweb/webcommands.py @ 23689:4fedf2a9b538

webcommands.annotate: explicitly only honor whitespace diffopts The whitespace ones are the only ones the annotate logic cares about anyway, so there's no visible impact.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 21 Nov 2014 16:16:03 -0800
parents a0ccb66f344d
children 9e1f4c65f5f5
comparison
equal deleted inserted replaced
23688:20932983d520 23689:4fedf2a9b538
751 751
752 def annotate(web, req, tmpl): 752 def annotate(web, req, tmpl):
753 fctx = webutil.filectx(web.repo, req) 753 fctx = webutil.filectx(web.repo, req)
754 f = fctx.path() 754 f = fctx.path()
755 parity = paritygen(web.stripecount) 755 parity = paritygen(web.stripecount)
756 diffopts = patch.diffopts(web.repo.ui, untrusted=True, section='annotate') 756 diffopts = patch.difffeatureopts(web.repo.ui, untrusted=True,
757 section='annotate', whitespace=True)
757 758
758 def annotate(**map): 759 def annotate(**map):
759 last = None 760 last = None
760 if util.binary(fctx.data()): 761 if util.binary(fctx.data()):
761 mt = (mimetypes.guess_type(fctx.path())[0] 762 mt = (mimetypes.guess_type(fctx.path())[0]