Mercurial > evolve
changeset 4805:60e8cdce0e9c
python3: add raw prefix to "troubles"-related dicts
The `byteify-strings.py` script cannot know that these will be used in a way
that requires to use a system string without some pretty hardcore hardcoding.
| author | Raphaël Gomès <rgomes@octobus.net> |
|---|---|
| date | Tue, 06 Aug 2019 11:29:35 +0200 |
| parents | 079dbf36e884 |
| children | 44629ae21b84 |
| files | hgext3rd/evolve/compat.py hgext3rd/evolve/evolvecmd.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/compat.py Tue Aug 06 11:26:29 2019 +0200 +++ b/hgext3rd/evolve/compat.py Tue Aug 06 11:29:35 2019 +0200 @@ -62,9 +62,9 @@ # Evolution renaming compat TROUBLES = { - 'ORPHAN': 'orphan', - 'CONTENTDIVERGENT': 'content-divergent', - 'PHASEDIVERGENT': 'phase-divergent', + r'ORPHAN': 'orphan', + r'CONTENTDIVERGENT': 'content-divergent', + r'PHASEDIVERGENT': 'phase-divergent', } if util.safehasattr(uimod.ui, 'makeprogress'):
--- a/hgext3rd/evolve/evolvecmd.py Tue Aug 06 11:26:29 2019 +0200 +++ b/hgext3rd/evolve/evolvecmd.py Tue Aug 06 11:29:35 2019 +0200 @@ -1627,9 +1627,9 @@ shouldupdate = opts['update'] troublecategories = { - 'phasedivergent': 'phase_divergent', - 'contentdivergent': 'content_divergent', - 'orphan': 'orphan', + 'phasedivergent': r'phase_divergent', + 'contentdivergent': r'content_divergent', + 'orphan': r'orphan', } specifiedcategories = [k for k, v in troublecategories.items() if opts[v]] if opts['list']: