Mercurial > hg-stable
changeset 36844:a00c38b33047
py3: drop b'' from debug message "moving bookmarks"
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Tue, 06 Mar 2018 07:24:12 -0600 |
| parents | 5bc7ff103081 |
| children | 472c68cda3f8 |
| files | contrib/python3-whitelist mercurial/scmutil.py |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/python3-whitelist Sat Mar 10 15:57:16 2018 +0900 +++ b/contrib/python3-whitelist Tue Mar 06 07:24:12 2018 -0600 @@ -25,6 +25,7 @@ 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
--- 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)