Mercurial > hg

changeset 23455:265034f4e27c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 Tue, 18 Nov 2014 22:16:46 -0800
parents 317ccfbd1a84
children e1086c7dd3c4
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Tue Nov 18 21:47:47 2014 -0800
+++ b/mercurial/commands.py	Tue Nov 18 22:16:46 2014 -0800
@@ -316,7 +316,8 @@
     m = scmutil.match(ctx, pats, opts)
     m.bad = bad
     follow = not opts.get('no_follow')
-    diffopts = patch.diffopts(ui, opts, section='annotate')
+    diffopts = patch.difffeatureopts(ui, opts, section='annotate',
+                                     whitespace=True)
     for abs in ctx.walk(m):
         fctx = ctx[abs]
         if not opts.get('text') and util.binary(fctx.data()):