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

login
register
mail settings
Submitter phabricator
Date May 8, 2018, 6:23 p.m.
Message ID <776e14700fdf4754e293e4991ad2feb4@localhost.localdomain>
Download mbox | patch
Permalink /patch/31394/
State Not Applicable
Headers show

Comments

phabricator - May 8, 2018, 6:23 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGd4aad0dd69ed: cvsps: wrap bytes in bytestr before %r-ing it (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3487?vs=8539&id=8562

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

AFFECTED FILES
  hgext/convert/cvsps.py

CHANGE DETAILS




To: durin42, #hg-reviewers, indygreg
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)