Mercurial > hg

changeset 34891:6b77c13a1aab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configitems: make all regular expressions bytes and not native str Fixes many tests on Python 3. Differential Revision: https://phab.mercurial-scm.org/D1181
author Augie Fackler <augie@google.com>
date Wed, 18 Oct 2017 18:29:00 -0400
parents effae88bccdb
children e1458bce84db
files mercurial/configitems.py
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/configitems.py	Wed Oct 18 18:11:50 2017 -0400
+++ b/mercurial/configitems.py	Wed Oct 18 18:29:00 2017 -0400
@@ -584,52 +584,52 @@
     default=None,
     generic=True,
 )
-coreconfigitem('merge-tools', r'.*\.args$',
+coreconfigitem('merge-tools', br'.*\.args$',
     default="$local $base $other",
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.binary$',
+coreconfigitem('merge-tools', br'.*\.binary$',
     default=False,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.check$',
+coreconfigitem('merge-tools', br'.*\.check$',
     default=list,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.checkchanged$',
+coreconfigitem('merge-tools', br'.*\.checkchanged$',
     default=False,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.executable$',
+coreconfigitem('merge-tools', br'.*\.executable$',
     default=dynamicdefault,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.fixeol$',
+coreconfigitem('merge-tools', br'.*\.fixeol$',
     default=False,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.gui$',
+coreconfigitem('merge-tools', br'.*\.gui$',
     default=False,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.priority$',
+coreconfigitem('merge-tools', br'.*\.priority$',
     default=0,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.premerge$',
+coreconfigitem('merge-tools', br'.*\.premerge$',
     default=dynamicdefault,
     generic=True,
     priority=-1,
 )
-coreconfigitem('merge-tools', r'.*\.symlink$',
+coreconfigitem('merge-tools', br'.*\.symlink$',
     default=False,
     generic=True,
     priority=-1,