# HG changeset patch # User Raphaël Gomès # Date 1565083775 -7200 # Node ID 60e8cdce0e9cf159c0a9787f4c009bc41eb3846c # Parent 079dbf36e8841e398d33c8555f89919c91dc7cd2 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. diff -r 079dbf36e884 -r 60e8cdce0e9c hgext3rd/evolve/compat.py --- 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'): diff -r 079dbf36e884 -r 60e8cdce0e9c hgext3rd/evolve/evolvecmd.py --- 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']: