From patchwork Fri Oct 3 20:19:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: color: document the possibility to colourise tabs in diffs From: =?utf-8?q?Jordi_Guti=C3=A9rrez_Hermoso?= X-Patchwork-Id: 6096 Message-Id: <7b18366b12d6081bc78b.1412367573@Iris> To: mercurial-devel@selenic.com Date: Fri, 03 Oct 2014 16:19:33 -0400 # HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1408562377 14400 # Wed Aug 20 15:19:37 2014 -0400 # Node ID 7b18366b12d6081bc78bb2beb98bdcb71018ef69 # Parent 78c916f24dd99a56e4c29153a5df3bd7d1c40edd color: document the possibility to colourise tabs in diffs This is a no-op change that simply suggests that tabs can be colourised, but defaults to no colour effects for tabs. This complements cset c343557a8442. Like the similar effects for phases from f8e2aebbb24c, we set the default effects to '' instead of None, so that this is a true noop change. Otherwise, the diff.tab effect would override (i.e. neutralise) the effect of the surrounding label. diff --git a/hgext/color.py b/hgext/color.py --- a/hgext/color.py +++ b/hgext/color.py @@ -11,7 +11,7 @@ This extension modifies the status and r to their output to reflect file status, the qseries command to add color to reflect patch status (applied, unapplied, missing), and to diff-related commands to highlight additions, removals, diff headers, -and trailing whitespace. +tabs, and trailing whitespace. Other effects in addition to color, like bold and underlined text, are also available. By default, the terminfo database is used to find the @@ -61,6 +61,7 @@ effects may be overridden from your conf diff.deleted = red diff.inserted = green diff.changed = white + diff.tab = diff.trailingwhitespace = bold red_background # Blank so it inherits the style of the surrounding label @@ -279,6 +280,7 @@ except ImportError: 'diff.file_b': 'green bold', 'diff.hunk': 'magenta', 'diff.inserted': 'green', + 'diff.tab': '', 'diff.trailingwhitespace': 'bold red_background', 'changeset.public' : '', 'changeset.draft' : '',