Mercurial > public > mercurial-scm > hg-stable

diff mercurial/scmutil.py @ 36844:a00c38b33047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: drop b'' from debug message "moving bookmarks"
author Yuya Nishihara <yuya@tcha.org>
date Tue, 06 Mar 2018 07:24:12 -0600
parents c442c4a92ae8
children f0b6fbea00cf
line wrap: on
line diff
--- a/mercurial/scmutil.py	Sat Mar 10 15:57:16 2018 +0900
+++ b/mercurial/scmutil.py	Tue Mar 06 07:24:12 2018 -0600
@@ -689,7 +689,8 @@
                 continue
             from . import bookmarks # avoid import cycle
             repo.ui.debug('moving bookmarks %r from %s to %s\n' %
-                          (oldbmarks, hex(oldnode), hex(newnode)))
+                          (util.rapply(pycompat.maybebytestr, oldbmarks),
+                           hex(oldnode), hex(newnode)))
             # Delete divergent bookmarks being parents of related newnodes
             deleterevs = repo.revs('parents(roots(%ln & (::%n))) - parents(%n)',
                                    allnewnodes, newnode, oldnode)