Mercurial > hg > mercurial-source
changeset 33424:49e1e5acb8ff
py3: convert bool variables to bytes before passing into ui.debug()
We can't pass unicodes to ui.debug() and hence we need to convert things to
bytes before passing them.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 01 Jun 2017 02:14:26 +0530 |
parents | aeac3cbcbbc1 |
children | c032e137e494 |
files | mercurial/merge.py |
diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -807,9 +807,12 @@ ret = copies.mergecopies(repo, wctx, p2, pa) copy, movewithdir, diverge, renamedelete, dirmove = ret + boolbm = pycompat.bytestr(bool(branchmerge)) + boolf = pycompat.bytestr(bool(force)) + boolm = pycompat.bytestr(bool(matcher)) repo.ui.note(_("resolving manifests\n")) repo.ui.debug(" branchmerge: %s, force: %s, partial: %s\n" - % (bool(branchmerge), bool(force), bool(matcher))) + % (boolbm, boolf, boolm)) repo.ui.debug(" ancestor: %s, local: %s, remote: %s\n" % (pa, wctx, p2)) m1, m2, ma = wctx.manifest(), p2.manifest(), pa.manifest()