From patchwork Thu Apr 19 11:25:08 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [STABLE] diff: restore original color scheme for worddiff
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 31198
Message-Id: <8cde3d58cdc88707dd61.1524137108@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Thu, 19 Apr 2018 20:25:08 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1524134784 -32400
#      Thu Apr 19 19:46:24 2018 +0900
# Branch stable
# Node ID 8cde3d58cdc88707dd61a24fdccf229e2ac83610
# Parent  68748c2c761bf6e94c0c683fff32bd551f27a1b3
diff: restore original color scheme for worddiff

I'm not young. "red dim" is nearly invisible, and "red" vs "red dim" is
too subtle to see difference. And, "underline" is necessary to highlight
whitespace changes.

diff --git a/mercurial/color.py b/mercurial/color.py
--- a/mercurial/color.py
+++ b/mercurial/color.py
@@ -90,16 +90,16 @@ except ImportError:
     'branches.inactive': 'none',
     'diff.changed': 'white',
     'diff.deleted': 'red',
-    'diff.deleted.changed': 'red',
-    'diff.deleted.unchanged': 'red dim',
+    'diff.deleted.changed': 'red bold underline',
+    'diff.deleted.unchanged': 'red',
     'diff.diffline': 'bold',
     'diff.extended': 'cyan bold',
     'diff.file_a': 'red bold',
     'diff.file_b': 'green bold',
     'diff.hunk': 'magenta',
     'diff.inserted': 'green',
-    'diff.inserted.changed': 'green',
-    'diff.inserted.unchanged': 'green dim',
+    'diff.inserted.changed': 'green bold underline',
+    'diff.inserted.unchanged': 'green',
     'diff.tab': '',
     'diff.trailingwhitespace': 'bold red_background',
     'changeset.public': '',