Mercurial > public > mercurial-scm > hg-stable

diff mercurial/debugcommands.py @ 37322:a67fd1fe5109

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stringutil: drop escapedata() in favor of escapestr() They are quite similar. Let's choose one that uses standard Python escape.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 04 Apr 2018 23:26:49 +0900
parents 2f859ad7ed8c
children e32dfff71529
line wrap: on
line diff
--- a/mercurial/debugcommands.py	Fri Mar 30 18:57:13 2018 -0700
+++ b/mercurial/debugcommands.py	Wed Apr 04 23:26:49 2018 +0900
@@ -2964,9 +2964,9 @@
                     del args['PUSHFILE']
                     res, output = peer._callpush(command, fh,
                                                  **pycompat.strkwargs(args))
-                    ui.status(_('result: %s\n') % stringutil.escapedata(res))
+                    ui.status(_('result: %s\n') % stringutil.escapestr(res))
                     ui.status(_('remote output: %s\n') %
-                              stringutil.escapedata(output))
+                              stringutil.escapestr(output))
             else:
                 res = peer._call(command, **pycompat.strkwargs(args))
                 ui.status(_('response: %s\n') % stringutil.pprint(res))
@@ -2984,7 +2984,7 @@
                       len(batchedcommands))
             for i, chunk in enumerate(peer._submitbatch(batchedcommands)):
                 ui.status(_('response #%d: %s\n') %
-                          (i, stringutil.escapedata(chunk)))
+                          (i, stringutil.escapestr(chunk)))
 
             batchedcommands = None