# HG changeset patch # User Pulkit Goyal # Date 2018-10-13 00:58:20 # Node ID 4d6019c0e0ef314ed9bacf1a70ffd7ddaadeb2e9 # Parent b456b2e0ad9f3fee29cc126d260c67c8a203f64d py3: use '%s' instead of %r in hgext/convert/subversion.py Using '%r' on bytes in python 3 adds b'' prefixes to output which is bad. I don't see a reason why we want to repr() the string here, so just switched to '%s'. This fixes some output failure in one of the subversion test. Differential Revision: https://phab.mercurial-scm.org/D5026 diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -1138,7 +1138,7 @@ class svn_sink(converter_sink, commandli path = os.path.realpath(path) if os.path.isdir(os.path.dirname(path)): if not os.path.exists(os.path.join(path, 'db', 'fs-type')): - ui.status(_('initializing svn repository %r\n') % + ui.status(_("initializing svn repository '%s'\n") % os.path.basename(path)) commandline(ui, 'svnadmin').run0('create', path) created = path @@ -1149,7 +1149,7 @@ class svn_sink(converter_sink, commandli wcpath = os.path.join(encoding.getcwd(), os.path.basename(path) + '-wc') - ui.status(_('initializing svn working copy %r\n') + ui.status(_("initializing svn working copy '%s'\n") % os.path.basename(wcpath)) self.run0('checkout', path, wcpath)