diff -r f99d64e8a4e4 -r f0b6fbea00cf mercurial/dagparser.py
--- a/mercurial/dagparser.py	Thu Mar 22 21:19:31 2018 +0900
+++ b/mercurial/dagparser.py	Thu Mar 22 21:56:20 2018 +0900
@@ -14,7 +14,9 @@
 from . import (
     error,
     pycompat,
-    util,
+)
+from .utils import (
+    stringutil,
 )
 
 def parsedag(desc):
@@ -372,8 +374,8 @@
                 else:
                     raise error.Abort(_("invalid event type in dag: "
                                         "('%s', '%s')")
-                                      % (util.escapestr(kind),
-                                         util.escapestr(data)))
+                                      % (stringutil.escapestr(kind),
+                                         stringutil.escapestr(data)))
         if run:
             yield '+%d' % run