Patchwork D2544: bookmarks: fix a repr in a message on Python 3

login
register
mail settings
Submitter phabricator
Date March 2, 2018, 4:18 p.m.
Message ID <71978d0967f9d9aae7795d92c3b78b95@localhost.localdomain>
Download mbox | patch
Permalink /patch/28693/
State Not Applicable
Headers show

Comments

phabricator - March 2, 2018, 4:18 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa5eefc9cccc5: bookmarks: fix a repr in a message on Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2544?vs=6337&id=6357

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

AFFECTED FILES
  mercurial/bookmarks.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
--- a/mercurial/bookmarks.py
+++ b/mercurial/bookmarks.py
@@ -84,7 +84,7 @@ 
                         # - node in nm, for non-20-bytes entry
                         # - split(...), for string without ' '
                         repo.ui.warn(_('malformed line in .hg/bookmarks: %r\n')
-                                     % line)
+                                     % pycompat.bytestr(line))
         except IOError as inst:
             if inst.errno != errno.ENOENT:
                 raise