Fixes many tests on Python 3.
Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D1181
configitems: make all regular expressions bytes and not native strClosedPublic
configitems: make all regular expressions bytes and not native str
ClosedPublic
Authored by durin42 on Oct 18 2017, 6:30 PM.
Revision Contents
Revision Contents
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/configitems.py (20 lines) |
Diff 3018
Diff 3018
mercurial/configitems.py
| ) | ) | ||||
| coreconfigitem('merge', 'preferancestor', | coreconfigitem('merge', 'preferancestor', | ||||
| default=lambda: ['*'], | default=lambda: ['*'], | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', '.*', | coreconfigitem('merge-tools', '.*', | ||||
| default=None, | default=None, | ||||
| generic=True, | generic=True, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.args$', | coreconfigitem('merge-tools', br'.*\.args$', | ||||
| default="$local $base $other", | default="$local $base $other", | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.binary$', | coreconfigitem('merge-tools', br'.*\.binary$', | ||||
| default=False, | default=False, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.check$', | coreconfigitem('merge-tools', br'.*\.check$', | ||||
| default=list, | default=list, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.checkchanged$', | coreconfigitem('merge-tools', br'.*\.checkchanged$', | ||||
| default=False, | default=False, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.executable$', | coreconfigitem('merge-tools', br'.*\.executable$', | ||||
| default=dynamicdefault, | default=dynamicdefault, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.fixeol$', | coreconfigitem('merge-tools', br'.*\.fixeol$', | ||||
| default=False, | default=False, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.gui$', | coreconfigitem('merge-tools', br'.*\.gui$', | ||||
| default=False, | default=False, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.priority$', | coreconfigitem('merge-tools', br'.*\.priority$', | ||||
| default=0, | default=0, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.premerge$', | coreconfigitem('merge-tools', br'.*\.premerge$', | ||||
| default=dynamicdefault, | default=dynamicdefault, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('merge-tools', r'.*\.symlink$', | coreconfigitem('merge-tools', br'.*\.symlink$', | ||||
| default=False, | default=False, | ||||
| generic=True, | generic=True, | ||||
| priority=-1, | priority=-1, | ||||
| ) | ) | ||||
| coreconfigitem('pager', 'attend-.*', | coreconfigitem('pager', 'attend-.*', | ||||
| default=dynamicdefault, | default=dynamicdefault, | ||||
| generic=True, | generic=True, | ||||
| ) | ) | ||||