changeset 40282:e4f82db071a4

py3: fix test-diff-color.t Differential Revision: https://phab.mercurial-scm.org/D5095
author Mark Thomas <mbthomas@fb.com>
date Sun, 14 Oct 2018 09:24:36 +0000
parents 29b0e9cd02f4
children c7a363ca04b9
files contrib/python3-whitelist mercurial/patch.py
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/python3-whitelist	Sun Oct 14 09:07:43 2018 +0000
+++ b/contrib/python3-whitelist	Sun Oct 14 09:24:36 2018 +0000
@@ -124,6 +124,7 @@
 test-diff-antipatience.t
 test-diff-binary-file.t
 test-diff-change.t
+test-diff-color.t
 test-diff-copy-depth.t
 test-diff-hashes.t
 test-diff-ignore-whitespace.t
--- a/mercurial/patch.py	Sun Oct 14 09:07:43 2018 +0000
+++ b/mercurial/patch.py	Sun Oct 14 09:24:36 2018 +0000
@@ -2480,7 +2480,7 @@
                 endspaces = chomp[len(token):]
             # scan tabs
             for maybetab in tabsplitter.findall(token):
-                if '\t' == maybetab[0]:
+                if b'\t' == maybetab[0:1]:
                     currentlabel = 'diff.tab'
                 else:
                     if changed: