Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
python3: add raw prefix to "troubles"-related dicts
authorRaphaël Gomès <rgomes@octobus.net>
Tue, 06 Aug 2019 11:29:35 +0200
changeset 4805 60e8cdce0e9c
parent 4804 079dbf36e884
child 4806 44629ae21b84
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.
hgext3rd/evolve/compat.py file | annotate | diff | comparison | revisions
hgext3rd/evolve/evolvecmd.py file | annotate | diff | comparison | revisions 
--- 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']:
evolve