Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
annotate: explicitly only honor whitespace diffopts
authorSiddharth Agarwal <sid0@fb.com>
Tue, 18 Nov 2014 22:16:46 -0800
changeset 23455 265034f4e27c
parent 23454 317ccfbd1a84
child 23456 e1086c7dd3c4
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.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- 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()):
Mercurial