Mercurial > public > mercurial-scm > hg-stable

diff hgext/extdiff.py @ 36301:be5a6fe3643a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: make test-extdiff.t pass on Python 3
author Yuya Nishihara <yuya@tcha.org>
date Sat, 17 Feb 2018 18:20:15 +0900
parents 08f061a48a8f
children ffa3026d4196
line wrap: on
line diff
--- a/hgext/extdiff.py	Sat Feb 17 18:15:37 2018 +0900
+++ b/hgext/extdiff.py	Sat Feb 17 18:20:15 2018 +0900
@@ -285,7 +285,7 @@
             cmdline += ' $parent1 $child'
         cmdline = re.sub(regex, quote, cmdline)
 
-        ui.debug('running %r in %s\n' % (cmdline, tmproot))
+        ui.debug('running %r in %s\n' % (pycompat.bytestr(cmdline), tmproot))
         ui.system(cmdline, cwd=tmproot, blockedtag='extdiff')
 
         for copy_fn, working_fn, st in fnsandstat: