Skip to content
Snippets Groups Projects
Commit 6b77c13a authored by Augie Fackler's avatar Augie Fackler
Browse files

configitems: make all regular expressions bytes and not native str

Fixes many tests on Python 3.

Differential Revision: https://phab.mercurial-scm.org/D1181
parent effae88b
No related branches found
No related tags found
No related merge requests found
......@@ -584,8 +584,8 @@
default=None,
generic=True,
)
coreconfigitem('merge-tools', r'.*\.args$',
coreconfigitem('merge-tools', br'.*\.args$',
default="$local $base $other",
generic=True,
priority=-1,
)
......@@ -588,9 +588,9 @@
default="$local $base $other",
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.binary$',
coreconfigitem('merge-tools', br'.*\.binary$',
default=False,
generic=True,
priority=-1,
)
......@@ -593,9 +593,9 @@
default=False,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.check$',
coreconfigitem('merge-tools', br'.*\.check$',
default=list,
generic=True,
priority=-1,
)
......@@ -598,9 +598,9 @@
default=list,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.checkchanged$',
coreconfigitem('merge-tools', br'.*\.checkchanged$',
default=False,
generic=True,
priority=-1,
)
......@@ -603,9 +603,9 @@
default=False,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.executable$',
coreconfigitem('merge-tools', br'.*\.executable$',
default=dynamicdefault,
generic=True,
priority=-1,
)
......@@ -608,9 +608,9 @@
default=dynamicdefault,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.fixeol$',
coreconfigitem('merge-tools', br'.*\.fixeol$',
default=False,
generic=True,
priority=-1,
)
......@@ -613,9 +613,9 @@
default=False,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.gui$',
coreconfigitem('merge-tools', br'.*\.gui$',
default=False,
generic=True,
priority=-1,
)
......@@ -618,9 +618,9 @@
default=False,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.priority$',
coreconfigitem('merge-tools', br'.*\.priority$',
default=0,
generic=True,
priority=-1,
)
......@@ -623,9 +623,9 @@
default=0,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.premerge$',
coreconfigitem('merge-tools', br'.*\.premerge$',
default=dynamicdefault,
generic=True,
priority=-1,
)
......@@ -628,8 +628,8 @@
default=dynamicdefault,
generic=True,
priority=-1,
)
coreconfigitem('merge-tools', r'.*\.symlink$',
coreconfigitem('merge-tools', br'.*\.symlink$',
default=False,
generic=True,
priority=-1,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment