Patchwork [2,of,5] py3: drop b'' from debug message "moving bookmarks"

login
register
mail settings
Submitter Yuya Nishihara
Date March 10, 2018, 11:28 a.m.
Message ID <6c476e5b05b821b9e6b8.1520681284@mimosa>
Download mbox | patch
Permalink /patch/29249/
State Accepted
Headers show

Comments

Yuya Nishihara - March 10, 2018, 11:28 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1520342652 21600
#      Tue Mar 06 07:24:12 2018 -0600
# Node ID 6c476e5b05b821b9e6b8da9de807ca45940b6fad
# Parent  fca950cc0de8a69d23bf37521e43cc5310009aad
py3: drop b'' from debug message "moving bookmarks"

Patch

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -25,6 +25,7 @@  test-bookmarks-merge.t
 test-bookmarks-rebase.t
 test-bookmarks-strip.t
 test-bookmarks.t
+test-branch-change.t
 test-branch-option.t
 test-branch-tag-confict.t
 test-branches.t
diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -689,7 +689,8 @@  def cleanupnodes(repo, replacements, ope
                 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)