diff hglib/merge.py @ 142:fe74d5599539

hglib: wrap all application string literals in util.b() (issue4520)

Conversion also included changing use of string interpolation to
string concatenation as bytes interpolation does not exist in Python
3. Indexing related to bytes was also changed to length-1 bytes
through slicing as Python 3 returns an int in this instance.

Tests have not been switched to using util.b() so that the change to
application code can be independently verified as not being broken.

--- a/hglib/merge.py	Sat Mar 07 10:08:52 2015 -0500
+++ b/hglib/merge.py	Sun Mar 08 13:08:37 2015 -0400
@@ -1,3 +1,5 @@
+from hglib.util import b
+
 class handlers(object):
     """
     These can be used as the cb argument to hgclient.merge() to control the
@@ -10,7 +12,7 @@
         """
         Abort the merge if a prompt appears.
         """
-        return ''
+        return b('')
 
     """
     This corresponds to Mercurial's -y/--noninteractive global option, which