[PATCH 6 of 7] annotate: explicitly only honor whitespace diffopts

Siddharth Agarwal sid0 at fb.com
Tue Dec 2 12:30:17 CST 2014


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1416377806 28800
#      Tue Nov 18 22:16:46 2014 -0800
# Node ID 59ce174f5a6af8ed82baa4f7da0ede3329547c1d
# Parent  33afcb7f2d0800545ebddda286d5ddd6a057f85d
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.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -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()):


More information about the Mercurial-devel mailing list