Patchwork [1,of,4] webcommands.annotate: explicitly only honor whitespace diffopts

login
register
mail settings
Submitter Siddharth Agarwal
Date Dec. 29, 2014, 11:57 p.m.
Message ID <76830247377d500779cb.1419897433@devbig136.prn2.facebook.com>
Download mbox | patch
Permalink /patch/7254/
State Accepted
Commit 4fedf2a9b538961d982836eec152562ae51e17c4
Headers show

Comments

Siddharth Agarwal - Dec. 29, 2014, 11:57 p.m.
# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 1416615363 28800
#      Fri Nov 21 16:16:03 2014 -0800
# Node ID 76830247377d500779cb94b0c0da569d2ddb3a07
# Parent  14ac0c1579cdc55763facfc81e8abffc63464c5f
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.

Patch

diff --git a/mercurial/hgweb/webcommands.py b/mercurial/hgweb/webcommands.py
--- a/mercurial/hgweb/webcommands.py
+++ b/mercurial/hgweb/webcommands.py
@@ -753,7 +753,8 @@ 
     fctx = webutil.filectx(web.repo, req)
     f = fctx.path()
     parity = paritygen(web.stripecount)
-    diffopts = patch.diffopts(web.repo.ui, untrusted=True, section='annotate')
+    diffopts = patch.difffeatureopts(web.repo.ui, untrusted=True,
+                                     section='annotate', whitespace=True)
 
     def annotate(**map):
         last = None