changeset 37470:d658cbef8041

py3: do not try to byte-stringify None in cmdutil.tryimportone() It's a debug message, so just use '' instead.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 08 Apr 2018 15:32:09 +0900
parents 7edf68862fe3
children 51d5e1ff0613
files mercurial/cmdutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun Apr 08 15:22:30 2018 +0900
+++ b/mercurial/cmdutil.py	Sun Apr 08 15:32:09 2018 +0900
@@ -1398,7 +1398,7 @@
         else:
             # launch the editor
             message = None
-        ui.debug('message:\n%s\n' % message)
+        ui.debug('message:\n%s\n' % (message or ''))
 
         if len(parents) == 1:
             parents.append(repo[nullid])