Mercurial > public > mercurial-scm > hg-stable

diff mercurial/subrepoutil.py @ 37087:f0b6fbea00cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stringutil: bulk-replace call sites to point to new module This might conflict with other patches floating around, sorry.
author Yuya Nishihara <yuya@tcha.org>
date Thu, 22 Mar 2018 21:56:20 +0900
parents b529e640015d
children df4fd29c0854
line wrap: on
line diff
--- a/mercurial/subrepoutil.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/mercurial/subrepoutil.py	Thu Mar 22 21:56:20 2018 +0900
@@ -21,6 +21,9 @@
     phases,
     util,
 )
+from .utils import (
+    stringutil,
+)
 
 nullstate = ('', '', 'empty')
 
@@ -74,7 +77,7 @@
         for pattern, repl in p.items('subpaths'):
             # Turn r'C:\foo\bar' into r'C:\\foo\\bar' since re.sub
             # does a string decode.
-            repl = util.escapestr(repl)
+            repl = stringutil.escapestr(repl)
             # However, we still want to allow back references to go
             # through unharmed, so we turn r'\\1' into r'\1'. Again,
             # extra escapes are needed because re.sub string decodes.