Patchwork D3487: cvsps: wrap bytes in bytestr before %r-ing it

login
register
mail settings
Submitter phabricator
Date May 8, 2018, 1:37 p.m.
Message ID <differential-rev-PHID-DREV-5ll6725imrb5jmpqb3xv-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/31365/
State Superseded
Headers show

Comments

phabricator - May 8, 2018, 1:37 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3487

AFFECTED FILES
  hgext/convert/cvsps.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py
--- a/hgext/convert/cvsps.py
+++ b/hgext/convert/cvsps.py
@@ -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)