changeset 37933:d4aad0dd69ed

cvsps: wrap bytes in bytestr before %r-ing it Differential Revision: https://phab.mercurial-scm.org/D3487
author Augie Fackler <augie@google.com>
date Fri, 27 Apr 2018 01:28:56 -0400
parents 73ca1c5e65f8
children cf76642cb2bb
files hgext/convert/cvsps.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/cvsps.py	Fri Apr 27 01:27:22 2018 -0400
+++ b/hgext/convert/cvsps.py	Fri Apr 27 01:28:56 2018 -0400
@@ -798,7 +798,7 @@
                 except KeyError:
                     ui.warn(_("warning: CVS commit message references "
                               "non-existent branch %r:\n%s\n")
-                            % (m, c.comment))
+                            % (pycompat.bytestr(m), c.comment))
                 if m in branches and c.branch != m and not candidate.synthetic:
                     c.parents.append(candidate)