Merge lp:~jelmer/brz/more-bees into lp:brz

[Jelmer Vernooij]

Add more bees. In particular:

* for file ids
* for revision ids
* for file contents in build_tree_contents()

[Martin Packman (gz)]

A few inlines comments, but lets land and go from her.e

review: Approve

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-dev/88/

[The Breezy Bot (the-breezy-bot)]

Merging failed
https://ci.breezy-vcs.org/job/brz-dev/89/

=== modified file '.bzrignore'
--- .bzrignore	2017-06-08 23:30:31 +0000
+++ .bzrignore	2018-03-25 11:39:57 +0000
@@ -71,3 +71,6 @@
 breezy/_*.pyd
 ./.ccache
 .testrepository
+python3.passing.old
+python3.passing.new
+selftest.log

=== modified file 'breezy/branch.py'
--- breezy/branch.py	2018-03-24 17:48:04 +0000
+++ breezy/branch.py	2018-03-25 11:39:57 +0000
@@ -53,6 +53,7 @@
 from .lock import LogicalLockResult
 from .sixish import (
     BytesIO,
+    text_type,
     viewitems,
     )
 from .trace import mutter, mutter_callsite, note, is_quiet
@@ -771,7 +772,7 @@
         # FIXUP this and get_parent in a future branch format bump:
         # read and rewrite the file. RBC 20060125
         if url is not None:
-            if isinstance(url, unicode):
+            if isinstance(url, text_type):
                 try:
                     url = url.encode('ascii')
                 except UnicodeEncodeError:

=== modified file 'breezy/branchbuilder.py'
--- breezy/branchbuilder.py	2018-03-14 02:53:33 +0000
+++ breezy/branchbuilder.py	2018-03-25 11:39:57 +0000
@@ -46,13 +46,13 @@
     >>> builder = BranchBuilder(MemoryTransport("memory:///"))
     >>> builder.start_series()
     >>> builder.build_snapshot(None, [
-    ...     ('add', ('', 'root-id', 'directory', '')),
-    ...     ('add', ('filename', 'f-id', 'file', 'content\n'))],
-    ...     revision_id='rev-id')
+    ...     ('add', ('', b'root-id', 'directory', '')),
+    ...     ('add', ('filename', b'f-id', 'file', 'content\n'))],
+    ...     revision_id=b'rev-id')
     'rev-id'
     >>> builder.build_snapshot(['rev-id'],
-    ...     [('modify', ('f-id', 'new-content\n'))],
-    ...     revision_id='rev2-id')
+    ...     [('modify', (b'f-id', 'new-content\n'))],
+    ...     revision_id=b'rev2-id')
     'rev2-id'
     >>> builder.finish_series()
     >>> branch = builder.get_branch()

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-03-24 10:24:48 +0000
+++ breezy/builtins.py	2018-03-25 11:39:57 +0000
@@ -3702,11 +3702,8 @@
         def get_message(commit_obj):
             """Callback to get commit message"""
             if file:
-                f = open(file)
-                try:
+                with open(file) as f:
                     my_message = f.read().decode(osutils.get_user_encoding())
-                finally:
-                    f.close()
             elif message is not None:
                 my_message = message
             else:

=== modified file 'breezy/bundle/bundle_data.py'
--- breezy/bundle/bundle_data.py	2017-11-24 09:25:13 +0000
+++ breezy/bundle/bundle_data.py	2018-03-25 11:39:57 +0000
@@ -286,11 +286,8 @@
         if rev.revision_id != revision_id:
             raise AssertionError()
         if sha1 != rev.inventory_sha1:
-            f = open(',,bogus-inv', 'wb')
-            try:
+            with open(',,bogus-inv', 'wb') as f:
                 f.write(s)
-            finally:
-                f.close()
             warning('Inventory sha hash mismatch for revision %s. %s'
                     ' != %s' % (revision_id, sha1, rev.inventory_sha1))
 

=== modified file 'breezy/bundle/serializer/__init__.py'
--- breezy/bundle/serializer/__init__.py	2018-02-17 02:02:38 +0000
+++ breezy/bundle/serializer/__init__.py	2018-03-25 11:39:57 +0000
@@ -36,7 +36,7 @@
 
 
 # New bundles should try to use this header format
-BUNDLE_HEADER = '# Bazaar revision bundle v'
+BUNDLE_HEADER = b'# Bazaar revision bundle v'
 BUNDLE_HEADER_RE = re.compile(
     br'^# Bazaar revision bundle v(?P<version>\d+[\w.]*)(?P<lineending>\r?)\n$')
 CHANGESET_OLD_HEADER_RE = re.compile(

=== modified file 'breezy/bzr/branch.py'
--- breezy/bzr/branch.py	2018-03-24 23:49:53 +0000
+++ breezy/bzr/branch.py	2018-03-25 11:39:57 +0000
@@ -348,7 +348,7 @@
         with self.lock_write():
             self._master_branch_cache = None
             if location:
-                self._transport.put_bytes('bound', location+b'\n',
+                self._transport.put_bytes('bound', location.encode('utf-8')+b'\n',
                     mode=self.controldir._get_file_mode())
             else:
                 try:
@@ -520,13 +520,10 @@
         with self.lock_read():
             if self._reference_info is not None:
                 return self._reference_info
-            rio_file = self._transport.get('references')
-            try:
+            with self._transport.get('references') as rio_file:
                 stanzas = rio.read_stanzas(rio_file)
                 info_dict = dict((s['file_id'], (s['tree_path'],
                                  s['branch_location'])) for s in stanzas)
-            finally:
-                rio_file.close()
             self._reference_info = info_dict
             return info_dict
 
@@ -969,8 +966,7 @@
         if name is None:
             name = a_controldir._get_selected_branch()
         branch_transport = a_controldir.get_branch_transport(self, name=name)
-        branch_transport.put_bytes('location',
-            target_branch.user_url)
+        branch_transport.put_bytes('location', target_branch.user_url)
         branch_transport.put_bytes('format', self.as_string())
         branch = self.open(a_controldir, name, _found=True,
             possible_transports=[target_branch.controldir.root_transport])

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2018-03-24 17:48:04 +0000
+++ breezy/bzr/bzrdir.py	2018-03-25 11:39:57 +0000
@@ -847,7 +847,7 @@
         ret = []
         try:
             for name in f:
-                ret.append(name.rstrip("\n"))
+                ret.append(name.rstrip(b"\n"))
         finally:
             f.close()
         return ret

=== modified file 'breezy/bzr/dirstate.py'
--- breezy/bzr/dirstate.py	2017-11-12 18:17:03 +0000
+++ breezy/bzr/dirstate.py	2018-03-25 11:39:57 +0000
@@ -301,12 +301,9 @@
 
     def stat_and_sha1(self, abspath):
         """Return the stat and sha1 of a file given its absolute path."""
-        file_obj = file(abspath, 'rb')
-        try:
+        with file(abspath, 'rb') as file_obj:
             statvalue = os.fstat(file_obj.fileno())
             sha1 = osutils.sha_file(file_obj)
-        finally:
-            file_obj.close()
         return statvalue, sha1
 
 

=== modified file 'breezy/bzr/inventory.py'
--- breezy/bzr/inventory.py	2018-03-25 02:13:54 +0000
+++ breezy/bzr/inventory.py	2018-03-25 11:39:57 +0000
@@ -123,7 +123,7 @@
     src/hello.c
     src/wibble
     src/wibble/wibble.c
-    >>> i.id2path('2326')
+    >>> i.id2path(b'2326')
     'src/wibble/wibble.c'
     """
 
@@ -655,9 +655,9 @@
         """Return as a string the path to file_id.
 
         >>> i = Inventory()
-        >>> e = i.add(InventoryDirectory('src-id', 'src', ROOT_ID))
-        >>> e = i.add(InventoryFile('foo-id', 'foo.c', parent_id='src-id'))
-        >>> print i.id2path('foo-id')
+        >>> e = i.add(InventoryDirectory(b'src-id', 'src', ROOT_ID))
+        >>> e = i.add(InventoryFile(b'foo-id', 'foo.c', parent_id='src-id'))
+        >>> print i.id2path(b'foo-id')
         src/foo.c
 
         :raises NoSuchId: If file_id is not present in the inventory.
@@ -679,7 +679,7 @@
                 return
             from_dir = self.root
             yield '', self.root
-        elif isinstance(from_dir, (str, text_type)):
+        elif isinstance(from_dir, bytes):
             from_dir = self.get_entry(from_dir)
 
         # unrolling the recursive called changed the time from

=== modified file 'breezy/bzr/knit.py'
--- breezy/bzr/knit.py	2018-02-17 02:55:34 +0000
+++ breezy/bzr/knit.py	2018-03-25 11:39:57 +0000
@@ -1044,7 +1044,7 @@
         # Note: line_bytes is not modified to add a newline, that is tracked
         #       via the no_eol flag. 'lines' *is* modified, because that is the
         #       general values needed by the Content code.
-        if line_bytes and line_bytes[-1] != '\n':
+        if line_bytes and not line_bytes.endswith(b'\n'):
             options.append('no-eol')
             no_eol = True
             # Copy the existing list, or create a new one
@@ -1053,7 +1053,7 @@
             else:
                 lines = lines[:]
             # Replace the last line with one that ends in a final newline
-            lines[-1] = lines[-1] + '\n'
+            lines[-1] = lines[-1] + b'\n'
         if lines is None:
             lines = osutils.split_lines(line_bytes)
 
@@ -1090,7 +1090,7 @@
                 # _record_to_data.
                 dense_lines = [line_bytes]
                 if no_eol:
-                    dense_lines.append('\n')
+                    dense_lines.append(b'\n')
                 size, data = self._record_to_data(key, digest,
                     lines, dense_lines)
             else:
@@ -1946,26 +1946,25 @@
         # 4168 calls in 2880 217 internal
         # 4168 calls to _parse_record_header in 2121
         # 4168 calls to readlines in 330
-        df = gzip.GzipFile(mode='rb', fileobj=BytesIO(data))
-        try:
-            record_contents = df.readlines()
-        except Exception as e:
-            raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
-                (data, e.__class__.__name__, str(e)))
-        header = record_contents.pop(0)
-        rec = self._split_header(header)
-        last_line = record_contents.pop()
-        if len(record_contents) != int(rec[2]):
-            raise KnitCorrupt(self,
-                              'incorrect number of lines %s != %s'
-                              ' for version {%s} %s'
-                              % (len(record_contents), int(rec[2]),
-                                 rec[1], record_contents))
-        if last_line != 'end %s\n' % rec[1]:
-            raise KnitCorrupt(self,
-                              'unexpected version end line %r, wanted %r'
-                              % (last_line, rec[1]))
-        df.close()
+        with gzip.GzipFile(mode='rb', fileobj=BytesIO(data)) as df:
+            try:
+                record_contents = df.readlines()
+            except Exception as e:
+                raise KnitCorrupt(self, "Corrupt compressed record %r, got %s(%s)" %
+                    (data, e.__class__.__name__, str(e)))
+            header = record_contents.pop(0)
+            rec = self._split_header(header)
+            last_line = record_contents.pop()
+            if len(record_contents) != int(rec[2]):
+                raise KnitCorrupt(self,
+                                  'incorrect number of lines %s != %s'
+                                  ' for version {%s} %s'
+                                  % (len(record_contents), int(rec[2]),
+                                     rec[1], record_contents))
+            if last_line != b'end %s\n' % rec[1]:
+                raise KnitCorrupt(self,
+                                  'unexpected version end line %r, wanted %r'
+                                  % (last_line, rec[1]))
         return rec, record_contents
 
     def _read_records_iter(self, records):
@@ -2044,14 +2043,14 @@
             this function spends less time resizing the final string.
         :return: (len, a BytesIO instance with the raw data ready to read.)
         """
-        chunks = ["version %s %d %s\n" % (key[-1], len(lines), digest)]
+        chunks = [b"version %s %d %s\n" % (key[-1], len(lines), digest)]
         chunks.extend(dense_lines or lines)
-        chunks.append("end %s\n" % key[-1])
+        chunks.append(b"end " + key[-1] + b"\n")
         for chunk in chunks:
-            if not isinstance(chunk, str):
+            if not isinstance(chunk, bytes):
                 raise AssertionError(
                     'data must be plain bytes was %s' % type(chunk))
-        if lines and lines[-1][-1] != '\n':
+        if lines and not lines[-1].endswith(b'\n'):
             raise ValueError('corrupt lines value %r' % lines)
         compressed_bytes = b''.join(tuned_gzip.chunks_to_gzip(chunks))
         return len(compressed_bytes), compressed_bytes
@@ -3215,7 +3214,7 @@
             opaque index memo. For _KnitKeyAccess the memo is (key, pos,
             length), where the key is the record key.
         """
-        if not isinstance(raw_data, str):
+        if not isinstance(raw_data, bytes):
             raise AssertionError(
                 'data must be plain bytes was %s' % type(raw_data))
         result = []

=== modified file 'breezy/bzr/smart/protocol.py'
--- breezy/bzr/smart/protocol.py	2018-02-17 02:02:38 +0000
+++ breezy/bzr/smart/protocol.py	2018-03-25 11:39:57 +0000
@@ -120,14 +120,14 @@
     # support multiple chunks?
     def _encode_bulk_data(self, body):
         """Encode body as a bulk data chunk."""
-        return ''.join(('%d\n' % len(body), body, 'done\n'))
+        return b''.join((b'%d\n' % len(body), body, b'done\n'))
 
     def _serialise_offsets(self, offsets):
         """Serialise a readv offset list."""
         txt = []
         for start, length in offsets:
-            txt.append('%d,%d' % (start, length))
-        return '\n'.join(txt)
+            txt.append(b'%d,%d' % (start, length))
+        return b'\n'.join(txt)
 
 
 class SmartServerRequestProtocolOne(SmartProtocolBase):
@@ -138,9 +138,9 @@
         self._backing_transport = backing_transport
         self._root_client_path = root_client_path
         self._jail_root = jail_root
-        self.unused_data = ''
+        self.unused_data = b''
         self._finished = False
-        self.in_buffer = ''
+        self.in_buffer = b''
         self._has_dispatched = False
         self.request = None
         self._body_decoder = None
@@ -171,7 +171,7 @@
                 if self.request.finished_reading:
                     # trivial request
                     self.unused_data = self.in_buffer
-                    self.in_buffer = ''
+                    self.in_buffer = b''
                     self._send_response(self.request.response)
             except KeyboardInterrupt:
                 raise
@@ -194,7 +194,7 @@
                 # nothing to do.XXX: this routine should be a single state
                 # machine too.
                 self.unused_data += self.in_buffer
-                self.in_buffer = ''
+                self.in_buffer = b''
                 return
             if self._body_decoder is None:
                 self._body_decoder = LengthPrefixedBodyDecoder()
@@ -209,7 +209,7 @@
             if self.request.response is not None:
                 self._send_response(self.request.response)
                 self.unused_data = self.in_buffer
-                self.in_buffer = ''
+                self.in_buffer = b''
             else:
                 if self.request.finished_reading:
                     raise AssertionError(
@@ -266,9 +266,9 @@
     def _write_success_or_failure_prefix(self, response):
         """Write the protocol specific success/failure prefix."""
         if response.is_successful():
-            self._write_func('success\n')
+            self._write_func(b'success\n')
         else:
-            self._write_func('failed\n')
+            self._write_func(b'failed\n')
 
     def _write_protocol_version(self):
         r"""Write any prefixes this protocol requires.
@@ -347,14 +347,14 @@
         self.finished_reading = False
         self._in_buffer_list = []
         self._in_buffer_len = 0
-        self.unused_data = ''
+        self.unused_data = b''
         self.bytes_left = None
         self._number_needed_bytes = None
 
     def _get_in_buffer(self):
         if len(self._in_buffer_list) == 1:
             return self._in_buffer_list[0]
-        in_buffer = ''.join(self._in_buffer_list)
+        in_buffer = b''.join(self._in_buffer_list)
         if len(in_buffer) != self._in_buffer_len:
             raise AssertionError(
                 "Length of buffer did not match expected value: %s != %s"
@@ -466,7 +466,7 @@
 
     def _extract_line(self):
         in_buf = self._get_in_buffer()
-        pos = in_buf.find('\n')
+        pos = in_buf.find(b'\n')
         if pos == -1:
             # We haven't read a complete line yet, so request more bytes before
             # we continue.
@@ -489,7 +489,7 @@
 
     def _state_accept_expecting_header(self):
         prefix = self._extract_line()
-        if prefix == 'chunked':
+        if prefix == b'chunked':
             self.state_accept = self._state_accept_expecting_length
         else:
             raise errors.SmartProtocolError(
@@ -497,12 +497,12 @@
 
     def _state_accept_expecting_length(self):
         prefix = self._extract_line()
-        if prefix == 'ERR':
+        if prefix == b'ERR':
             self.error = True
             self.error_in_progress = []
             self._state_accept_expecting_length()
             return
-        elif prefix == 'END':
+        elif prefix == b'END':
             # We've read the end-of-body marker.
             # Any further bytes are unused data, including the bytes left in
             # the _in_buffer.
@@ -510,7 +510,7 @@
             return
         else:
             self.bytes_left = int(prefix, 16)
-            self.chunk_in_progress = ''
+            self.chunk_in_progress = b''
             self.state_accept = self._state_accept_reading_chunk
 
     def _state_accept_reading_chunk(self):
@@ -541,8 +541,8 @@
         _StatefulDecoder.__init__(self)
         self.state_accept = self._state_accept_expecting_length
         self.state_read = self._state_read_no_data
-        self._body = ''
-        self._trailer_buffer = ''
+        self._body = b''
+        self._trailer_buffer = b''
 
     def next_read_size(self):
         if self.bytes_left is not None:
@@ -566,7 +566,7 @@
 
     def _state_accept_expecting_length(self):
         in_buf = self._get_in_buffer()
-        pos = in_buf.find('\n')
+        pos = in_buf.find(b'\n')
         if pos == -1:
             return
         self.bytes_left = int(in_buf[:pos])
@@ -592,8 +592,8 @@
         self._set_in_buffer(None)
         # TODO: what if the trailer does not match "done\n"?  Should this raise
         # a ProtocolViolation exception?
-        if self._trailer_buffer.startswith('done\n'):
-            self.unused_data = self._trailer_buffer[len('done\n'):]
+        if self._trailer_buffer.startswith(b'done\n'):
+            self.unused_data = self._trailer_buffer[len(b'done\n'):]
             self.state_accept = self._state_accept_reading_unused
             self.finished_reading = True
 
@@ -602,11 +602,11 @@
         self._set_in_buffer(None)
 
     def _state_read_no_data(self):
-        return ''
+        return b''
 
     def _state_read_body_buffer(self):
         result = self._body
-        self._body = ''
+        self._body = b''
         return result
 
 
@@ -777,7 +777,7 @@
 
         while not _body_decoder.finished_reading:
             bytes = self._request.read_bytes(_body_decoder.next_read_size())
-            if bytes == '':
+            if bytes == b'':
                 # end of file encountered reading from server
                 raise errors.ConnectionReset(
                     "Connection lost while reading response body.")
@@ -866,7 +866,7 @@
         _body_decoder = ChunkedBodyDecoder()
         while not _body_decoder.finished_reading:
             bytes = self._request.read_bytes(_body_decoder.next_read_size())
-            if bytes == '':
+            if bytes == b'':
                 # end of file encountered reading from server
                 raise errors.ConnectionReset(
                     "Connection lost while reading streamed body.")
@@ -1101,7 +1101,7 @@
 
     def flush(self):
         if self._buf:
-            self._real_write_func(''.join(self._buf))
+            self._real_write_func(b''.join(self._buf))
             del self._buf[:]
             self._buf_len = 0
 
@@ -1109,8 +1109,8 @@
         """Serialise a readv offset list."""
         txt = []
         for start, length in offsets:
-            txt.append('%d,%d' % (start, length))
-        return '\n'.join(txt)
+            txt.append(b'%d,%d' % (start, length))
+        return b'\n'.join(txt)
 
     def _write_protocol_version(self):
         self._write_func(MESSAGE_VERSION_THREE)
@@ -1124,7 +1124,7 @@
         self._write_prefixed_bencode(headers)
 
     def _write_structure(self, args):
-        self._write_func('s')
+        self._write_func(b's')
         utf8_args = []
         for arg in args:
             if isinstance(arg, text_type):
@@ -1134,22 +1134,22 @@
         self._write_prefixed_bencode(utf8_args)
 
     def _write_end(self):
-        self._write_func('e')
+        self._write_func(b'e')
         self.flush()
 
     def _write_prefixed_body(self, bytes):
-        self._write_func('b')
+        self._write_func(b'b')
         self._write_func(struct.pack('!L', len(bytes)))
         self._write_func(bytes)
 
     def _write_chunked_body_start(self):
-        self._write_func('oC')
+        self._write_func(b'oC')
 
     def _write_error_status(self):
-        self._write_func('oE')
+        self._write_func(b'oE')
 
     def _write_success_status(self):
-        self._write_func('oS')
+        self._write_func(b'oS')
 
 
 class ProtocolThreeResponder(_ProtocolThreeEncoder):

=== modified file 'breezy/bzr/smart/repository.py'
--- breezy/bzr/smart/repository.py	2018-02-24 15:50:23 +0000
+++ breezy/bzr/smart/repository.py	2018-03-25 11:39:57 +0000
@@ -834,16 +834,13 @@
         return tmp_dirname, tmp_repo
 
     def _tarfile_response(self, tmp_dirname, compression):
-        temp = tempfile.NamedTemporaryFile()
-        try:
+        with tempfile.NamedTemporaryFile() as temp:
             self._tarball_of_dir(tmp_dirname, compression, temp.file)
             # all finished; write the tempfile out to the network
             temp.seek(0)
             return SuccessfulSmartServerResponse(('ok',), temp.read())
             # FIXME: Don't read the whole thing into memory here; rather stream
             # it out from the file onto the network. mbp 20070411
-        finally:
-            temp.close()
 
     def _tarball_of_dir(self, dirname, compression, ofile):
         import tarfile

=== modified file 'breezy/bzr/smart/vfs.py'
--- breezy/bzr/smart/vfs.py	2017-07-21 13:51:15 +0000
+++ breezy/bzr/smart/vfs.py	2018-03-25 11:39:57 +0000
@@ -187,17 +187,17 @@
     def do_body(self, body_bytes):
         """accept offsets for a readv request."""
         offsets = self._deserialise_offsets(body_bytes)
-        backing_bytes = ''.join(bytes for offset, bytes in
+        backing_bytes = b''.join(bytes for offset, bytes in
             self._backing_transport.readv(self._relpath, offsets))
-        return request.SuccessfulSmartServerResponse(('readv',), backing_bytes)
+        return request.SuccessfulSmartServerResponse((b'readv',), backing_bytes)
 
     def _deserialise_offsets(self, text):
         # XXX: FIXME this should be on the protocol object.
         offsets = []
-        for line in text.split('\n'):
+        for line in text.split(b'\n'):
             if not line:
                 continue
-            start, length = line.split(',')
+            start, length = line.split(b',')
             offsets.append((int(start), int(length)))
         return offsets
 

=== modified file 'breezy/bzr/versionedfile.py'
--- breezy/bzr/versionedfile.py	2018-03-02 00:38:34 +0000
+++ breezy/bzr/versionedfile.py	2018-03-25 11:39:57 +0000
@@ -470,7 +470,7 @@
     def _check_lines_are_lines(self, lines):
         """Check that the lines really are full lines without inline EOL."""
         for line in lines:
-            if '\n' in line[:-1]:
+            if b'\n' in line[:-1]:
                 raise errors.BzrBadParameterContainsNewline("lines")
 
     def get_format_signature(self):

=== modified file 'breezy/bzr/weavefile.py'
--- breezy/bzr/weavefile.py	2018-02-17 02:02:38 +0000
+++ breezy/bzr/weavefile.py	2018-03-25 11:39:57 +0000
@@ -65,20 +65,20 @@
             f.write(b'i\n')
         f.write(b'1 ' + weave._sha1s[version] + b'\n')
         f.write(b'n ' + weave._names[version] + b'\n')
-        f.write('\n')
+        f.write(b'\n')
 
     f.write(b'w\n')
 
     for l in weave._weave:
         if isinstance(l, tuple):
-            if l[0] == '}':
+            if l[0] == b'}':
                 f.write(b'}\n')
             else:
-                f.write(b'%s %d\n' % l)
+                f.write(l[0] + b' %d\n' % l[1])
         else: # text line
             if not l:
                 f.write(b', \n')
-            elif l[-1] == '\n':
+            elif l[-1] == b'\n':
                 f.write(b'. ' + l)
             else:
                 f.write(b', ' + l + b'\n')

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2018-03-25 02:13:54 +0000
+++ breezy/bzr/workingtree.py	2018-03-25 11:39:57 +0000
@@ -276,11 +276,8 @@
     def _reset_data(self):
         """Reset transient data that cannot be revalidated."""
         self._inventory_is_modified = False
-        f = self._transport.get('inventory')
-        try:
+        with self._transport.get('inventory') as f:
             result = self._deserialize(f)
-        finally:
-            f.close()
         self._set_inventory(result, dirty=False)
 
     def store_uncommitted(self):
@@ -570,11 +567,8 @@
         ignore_globs.update(ignores.get_runtime_ignores())
         ignore_globs.update(ignores.get_user_ignores())
         if self.has_filename(self._format.ignore_filename):
-            f = self.get_file(self._format.ignore_filename)
-            try:
+            with self.get_file(self._format.ignore_filename) as f:
                 ignore_globs.update(ignores.parse_ignore_file(f))
-            finally:
-                f.close()
         self._ignoreset = ignore_globs
         return ignore_globs
 
@@ -619,11 +613,8 @@
         with self.lock_read():
             if self._inventory_is_modified:
                 raise errors.InventoryModified(self)
-            f = self._transport.get('inventory')
-            try:
+            with self._transport.get('inventory') as f:
                 result = self._deserialize(f)
-            finally:
-                f.close()
             self._set_inventory(result, dirty=False)
             return result
 

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2018-03-25 02:13:54 +0000
+++ breezy/bzr/workingtree_4.py	2018-03-25 11:39:57 +0000
@@ -1379,14 +1379,11 @@
         """See dirstate.SHA1Provider.stat_and_sha1()."""
         filters = self.tree._content_filter_stack(
             self.tree.relpath(osutils.safe_unicode(abspath)))
-        file_obj = file(abspath, 'rb', 65000)
-        try:
+        with file(abspath, 'rb', 65000) as file_obj:
             statvalue = os.fstat(file_obj.fileno())
             if filters:
                 file_obj = _mod_filters.filtered_input_file(file_obj, filters)
             sha1 = osutils.size_sha_file(file_obj)[1]
-        finally:
-            file_obj.close()
         return statvalue, sha1
 
 

=== modified file 'breezy/bzr/xml_serializer.py'
--- breezy/bzr/xml_serializer.py	2018-02-17 02:02:38 +0000
+++ breezy/bzr/xml_serializer.py	2018-03-25 11:39:57 +0000
@@ -47,7 +47,7 @@
     errors,
     lazy_regex,
     )
-from ..sixish import text_type
+from ..sixish import text_type, bytesintern
 from . import (
     inventory,
     serializer,
@@ -151,7 +151,7 @@
     if a_str.__class__ is text_type:
         return _encode_utf8(a_str)
     else:
-        return intern(a_str)
+        return bytesintern(a_str)
 
 
 _utf8_re = lazy_regex.lazy_compile(b'[&<>\'\"]|[\x80-\xff]+')

=== modified file 'breezy/cmd_test_script.py'
--- breezy/cmd_test_script.py	2017-05-22 00:56:52 +0000
+++ breezy/cmd_test_script.py	2018-03-25 11:39:57 +0000
@@ -46,11 +46,8 @@
         from breezy import tests
         from breezy.tests.script import TestCaseWithTransportAndScript
 
-        f = open(infile)
-        try:
+        with open(infile) as f:
             script = f.read()
-        finally:
-            f.close()
 
         class Test(TestCaseWithTransportAndScript):
 

=== modified file 'breezy/diff.py'
--- breezy/diff.py	2017-11-13 22:07:48 +0000
+++ breezy/diff.py	2018-03-25 11:39:57 +0000
@@ -816,11 +816,8 @@
                 raise
         source = tree.get_file(relpath, file_id)
         try:
-            target = open(full_path, 'wb')
-            try:
+            with open(full_path, 'wb') as target:
                 osutils.pumpfile(source, target)
-            finally:
-                target.close()
         finally:
             source.close()
         try:
@@ -871,11 +868,8 @@
                 file_id=file_id)
         command = self._get_command(old_abs_path, new_abs_path)
         subprocess.call(command, cwd=self._root)
-        new_file = open(new_abs_path, 'rb')
-        try:
+        with open(new_abs_path, 'rb') as new_file:
             return new_file.read()
-        finally:
-            new_file.close()
 
 
 class DiffTree(object):

=== modified file 'breezy/doc_generate/autodoc_rstx.py'
--- breezy/doc_generate/autodoc_rstx.py	2017-12-21 16:44:19 +0000
+++ breezy/doc_generate/autodoc_rstx.py	2018-03-25 11:39:57 +0000
@@ -130,9 +130,8 @@
     """Dump text for a topic to a file."""
     topic_id = "%s-%s" % (topic, "help")
     filename = breezy.osutils.pathjoin(output_dir, topic_id + ".txt")
-    f =  open(filename, "w")
-    f.write(text.encode('utf-8'))
-    f.close()
+    with open(filename, "w") as f:
+        f.write(text.encode('utf-8'))
     return topic_id
 
 

=== modified file 'breezy/export/dir_exporter.py'
--- breezy/export/dir_exporter.py	2018-03-04 15:59:37 +0000
+++ breezy/export/dir_exporter.py	2018-03-25 11:39:57 +0000
@@ -82,11 +82,8 @@
         mode = 0o666
         if tree.is_executable(treepath, file_id):
             mode = 0o777
-        out = os.fdopen(os.open(fullpath, flags, mode), 'wb')
-        try:
+        with os.fdopen(os.open(fullpath, flags, mode), 'wb') as out:
             out.writelines(chunks)
-        finally:
-            out.close()
         if force_mtime is not None:
             mtime = force_mtime
         else:

=== modified file 'breezy/generate_ids.py'
--- breezy/generate_ids.py	2017-07-21 13:20:17 +0000
+++ breezy/generate_ids.py	2018-03-25 11:39:57 +0000
@@ -35,8 +35,8 @@
 
 # the regex removes any weird characters; we don't escape them
 # but rather just pull them out
-_file_id_chars_re = lazy_regex.lazy_compile(r'[^\w.]')
-_rev_id_chars_re = lazy_regex.lazy_compile(r'[^-\w.+@]')
+_file_id_chars_re = lazy_regex.lazy_compile('[^\\w.]')
+_rev_id_chars_re = lazy_regex.lazy_compile('[^-\\w.+@]')
 _gen_file_id_suffix = None
 _gen_file_id_serial = 0
 

=== modified file 'breezy/iterablefile.py'
--- breezy/iterablefile.py	2017-06-10 01:57:00 +0000
+++ breezy/iterablefile.py	2018-03-25 11:39:57 +0000
@@ -132,6 +132,18 @@
 
     closed = property(lambda x: x._closed)
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        # If there was an error raised, prefer the original one
+        try:
+            self.close()
+        except:
+            if exc_type is None:
+                raise
+        return False
+
     def flush(self):
         """No-op for standard compliance.
         >>> f = IterableFile([])

=== modified file 'breezy/mutabletree.py'
--- breezy/mutabletree.py	2018-02-08 22:08:05 +0000
+++ breezy/mutabletree.py	2018-03-25 11:39:57 +0000
@@ -104,7 +104,7 @@
         if isinstance(files, (str, text_type)):
             # XXX: Passing a single string is inconsistent and should be
             # deprecated.
-            if not (ids is None or isinstance(ids, (str, text_type))):
+            if not (ids is None or isinstance(ids, bytes)):
                 raise AssertionError()
             if not (kinds is None or isinstance(kinds, (str, text_type))):
                 raise AssertionError()

=== modified file 'breezy/plugins/commitfromnews/tests/test_committemplate.py'
--- breezy/plugins/commitfromnews/tests/test_committemplate.py	2017-11-16 00:39:04 +0000
+++ breezy/plugins/commitfromnews/tests/test_committemplate.py	2018-03-25 11:39:57 +0000
@@ -67,10 +67,10 @@
         builder.start_series()
         builder.build_snapshot(None,
             [('add', ('', None, 'directory', None)),
-             ('add', ('foo', 'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
+             ('add', ('foo', b'foo-id', 'file', 'a\nb\nc\nd\ne\n')),
              ],
             message_callback=msgeditor.generate_commit_message_template,
-            revision_id='BASE-id')
+            revision_id=b'BASE-id')
         builder.finish_series()
         self.assertEqual([None], self.messages)
 
@@ -82,10 +82,10 @@
         content = INITIAL_NEWS_CONTENT
         builder.build_snapshot(None,
             [('add', ('', None, 'directory', None)),
-             ('add', ('NEWS', 'foo-id', 'file', content)),
+             ('add', ('NEWS', b'foo-id', 'file', content)),
              ],
             message_callback=msgeditor.generate_commit_message_template,
-            revision_id='BASE-id')
+            revision_id=b'BASE-id')
         builder.finish_series()
         self.assertEqual([content], self.messages)
 
@@ -115,10 +115,10 @@
 """
         builder.build_snapshot(None,
             [('add', ('', None, 'directory', None)),
-             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
-             ], revision_id='BASE-id')
+             ('add', ('NEWS', b'foo-id', 'file', orig_content)),
+             ], revision_id=b'BASE-id')
         builder.build_snapshot(None,
-            [('modify', ('foo-id', mod_content)),
+            [('modify', (b'foo-id', mod_content)),
              ],
             message_callback=msgeditor.generate_commit_message_template)
         builder.finish_series()
@@ -152,10 +152,10 @@
 """
         builder.build_snapshot(None,
             [('add', ('', None, 'directory', None)),
-             ('add', ('NEWS', 'foo-id', 'file', orig_content)),
-             ], revision_id='BASE-id')
+             ('add', ('NEWS', b'foo-id', 'file', orig_content)),
+             ], revision_id=b'BASE-id')
         builder.build_snapshot(None,
-            [('modify', ('foo-id', mod_content)),
+            [('modify', (b'foo-id', mod_content)),
              ],
             message_callback=msgeditor.generate_commit_message_template)
         builder.finish_series()

=== modified file 'breezy/plugins/email/tests/testemail.py'
--- breezy/plugins/email/tests/testemail.py	2017-06-10 16:40:42 +0000
+++ breezy/plugins/email/tests/testemail.py	2018-03-25 11:39:57 +0000
@@ -176,7 +176,7 @@
         my_config = config.MemoryStack(text)
         self.branch = BzrDir.create_branch_convenience('.')
         tree = self.branch.controldir.open_workingtree()
-        tree.commit('foo bar baz\nfuzzy\nwuzzy', rev_id='A',
+        tree.commit('foo bar baz\nfuzzy\nwuzzy', rev_id=b'A',
             allow_pointless=True,
             timestamp=1,
             timezone=0,

=== modified file 'breezy/plugins/fastimport/revision_store.py'
--- breezy/plugins/fastimport/revision_store.py	2018-03-24 23:36:29 +0000
+++ breezy/plugins/fastimport/revision_store.py	2018-03-25 11:39:57 +0000
@@ -17,7 +17,7 @@
 
 from __future__ import absolute_import
 
-from ...sixish import StringIO
+from io import BytesIO
 
 from ... import (
     errors,
@@ -68,7 +68,7 @@
 
     def get_file_with_stat(self, path, file_id=None):
         content = self.get_file_text(path, file_id)
-        sio = StringIO(content)
+        sio = BytesIO(content)
         return sio, None
 
     def get_file_text(self, path, file_id=None):

=== modified file 'breezy/plugins/fastimport/tests/test_commands.py'
--- breezy/plugins/fastimport/tests/test_commands.py	2017-05-23 23:37:18 +0000
+++ breezy/plugins/fastimport/tests/test_commands.py	2018-03-25 11:39:57 +0000
@@ -188,7 +188,7 @@
         data2 = self.run_bzr("fast-export bl")[0]
         self.assertEquals(data1, data2)
 
-simple_fast_import_stream = """commit refs/heads/master
+simple_fast_import_stream = b"""commit refs/heads/master
 mark :1
 committer Jelmer Vernooij <[e-mail]> 1299718135 +0100
 data 7
@@ -236,7 +236,7 @@
     _test_needs_features = [FastimportFeature]
 
     def test_empty(self):
-        self.build_tree_contents([('empty.fi', "")])
+        self.build_tree_contents([('empty.fi', b"")])
         self.make_branch_and_tree("br")
         self.assertEquals("", self.run_bzr("fast-import empty.fi br")[0])
 
@@ -247,7 +247,7 @@
         self.assertEquals(1, tree.branch.revno())
 
     def test_missing_bytes(self):
-        self.build_tree_contents([('empty.fi', """
+        self.build_tree_contents([('empty.fi', b"""
 commit refs/heads/master
 mark :1
 committer
@@ -262,11 +262,11 @@
     _test_needs_features = [FastimportFeature]
 
     def test_empty(self):
-        self.build_tree_contents([('empty.fi', "")])
+        self.build_tree_contents([('empty.fi', b"")])
         self.make_branch_and_tree("br")
         self.assertEquals("", self.run_bzr("fast-import-filter -")[0])
 
     def test_default_stdin(self):
-        self.build_tree_contents([('empty.fi', "")])
+        self.build_tree_contents([('empty.fi', b"")])
         self.make_branch_and_tree("br")
         self.assertEquals("", self.run_bzr("fast-import-filter")[0])

=== modified file 'breezy/plugins/fastimport/tests/test_revision_store.py'
--- breezy/plugins/fastimport/tests/test_revision_store.py	2017-11-13 12:09:54 +0000
+++ breezy/plugins/fastimport/tests/test_revision_store.py	2018-03-25 11:39:57 +0000
@@ -49,42 +49,42 @@
         inv.add(inventory.make_entry(kind, basename, parent_id, file_id))
 
     def make_trivial_basis_inv(self):
-        basis_inv = inventory.Inventory('TREE_ROOT')
-        self.invAddEntry(basis_inv, 'foo', 'foo-id')
-        self.invAddEntry(basis_inv, 'bar/', 'bar-id')
-        self.invAddEntry(basis_inv, 'bar/baz', 'baz-id')
+        basis_inv = inventory.Inventory(b'TREE_ROOT')
+        self.invAddEntry(basis_inv, 'foo', b'foo-id')
+        self.invAddEntry(basis_inv, 'bar/', b'bar-id')
+        self.invAddEntry(basis_inv, 'bar/baz', b'baz-id')
         return basis_inv
 
     def test_id2path_no_delta(self):
         basis_inv = self.make_trivial_basis_inv()
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=[], content_provider=None)
-        self.assertEqual('', shim.id2path('TREE_ROOT'))
-        self.assertEqual('foo', shim.id2path('foo-id'))
-        self.assertEqual('bar', shim.id2path('bar-id'))
-        self.assertEqual('bar/baz', shim.id2path('baz-id'))
-        self.assertRaises(errors.NoSuchId, shim.id2path, 'qux-id')
+        self.assertEqual('', shim.id2path(b'TREE_ROOT'))
+        self.assertEqual('foo', shim.id2path(b'foo-id'))
+        self.assertEqual('bar', shim.id2path(b'bar-id'))
+        self.assertEqual('bar/baz', shim.id2path(b'baz-id'))
+        self.assertRaises(errors.NoSuchId, shim.id2path, b'qux-id')
 
     def test_id2path_with_delta(self):
         basis_inv = self.make_trivial_basis_inv()
-        foo_entry = inventory.make_entry('file', 'foo2', 'TREE_ROOT', 'foo-id')
-        inv_delta = [('foo', 'foo2', 'foo-id', foo_entry),
-                     ('bar/baz', None, 'baz-id', None),
+        foo_entry = inventory.make_entry('file', 'foo2', b'TREE_ROOT', b'foo-id')
+        inv_delta = [('foo', 'foo2', b'foo-id', foo_entry),
+                     ('bar/baz', None, b'baz-id', None),
                     ]
 
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=inv_delta,
                                         content_provider=None)
-        self.assertEqual('', shim.id2path('TREE_ROOT'))
-        self.assertEqual('foo2', shim.id2path('foo-id'))
-        self.assertEqual('bar', shim.id2path('bar-id'))
-        self.assertRaises(errors.NoSuchId, shim.id2path, 'baz-id')
+        self.assertEqual('', shim.id2path(b'TREE_ROOT'))
+        self.assertEqual('foo2', shim.id2path(b'foo-id'))
+        self.assertEqual('bar', shim.id2path(b'bar-id'))
+        self.assertRaises(errors.NoSuchId, shim.id2path, b'baz-id')
 
     def test_path2id(self):
         basis_inv = self.make_trivial_basis_inv()
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=[], content_provider=None)
-        self.assertEqual('TREE_ROOT', shim.path2id(''))
+        self.assertEqual(b'TREE_ROOT', shim.path2id(''))
         # We don't want to ever give a wrong value, so for now we just raise
         # NotImplementedError
         self.assertRaises(NotImplementedError, shim.path2id, 'bar')
@@ -93,61 +93,61 @@
         basis_inv = self.make_trivial_basis_inv()
 
         def content_provider(file_id):
-            return 'content of\n' + file_id + '\n'
+            return b'content of\n' + file_id + b'\n'
 
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=[],
                                         content_provider=content_provider)
-        f_obj, stat_val = shim.get_file_with_stat('bar/baz', 'baz-id')
+        f_obj, stat_val = shim.get_file_with_stat('bar/baz', b'baz-id')
         self.assertIs(None, stat_val)
-        self.assertEqualDiff('content of\nbaz-id\n', f_obj.read())
+        self.assertEqualDiff(b'content of\nbaz-id\n', f_obj.read())
 
     # TODO: Test when the content isn't in the stream, and we fall back to the
     #       repository that was passed in
 
     def test_get_symlink_target(self):
         basis_inv = self.make_trivial_basis_inv()
-        ie = inventory.make_entry('symlink', 'link', 'TREE_ROOT', 'link-id')
+        ie = inventory.make_entry('symlink', 'link', b'TREE_ROOT', b'link-id')
         ie.symlink_target = u'link-target'
         basis_inv.add(ie)
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=[], content_provider=None)
         self.assertEqual(u'link-target',
-                         shim.get_symlink_target('link', 'link-id'))
+                         shim.get_symlink_target('link', b'link-id'))
 
     def test_get_symlink_target_from_delta(self):
         basis_inv = self.make_trivial_basis_inv()
-        ie = inventory.make_entry('symlink', 'link', 'TREE_ROOT', 'link-id')
+        ie = inventory.make_entry('symlink', 'link', 'TREE_ROOT', b'link-id')
         ie.symlink_target = u'link-target'
-        inv_delta = [(None, 'link', 'link-id', ie)]
+        inv_delta = [(None, 'link', b'link-id', ie)]
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=inv_delta,
                                         content_provider=None)
         self.assertEqual(u'link-target',
-                         shim.get_symlink_target('link', 'link-id'))
+                         shim.get_symlink_target('link', b'link-id'))
 
     def test__delta_to_iter_changes(self):
         basis_inv = self.make_trivial_basis_inv()
-        foo_entry = inventory.make_entry('file', 'foo2', 'bar-id', 'foo-id')
-        link_entry = inventory.make_entry('symlink', 'link', 'TREE_ROOT',
-                                          'link-id')
+        foo_entry = inventory.make_entry('file', 'foo2', b'bar-id', b'foo-id')
+        link_entry = inventory.make_entry('symlink', 'link', b'TREE_ROOT',
+                                          b'link-id')
         link_entry.symlink_target = u'link-target'
-        inv_delta = [('foo', 'bar/foo2', 'foo-id', foo_entry),
-                     ('bar/baz', None, 'baz-id', None),
-                     (None, 'link', 'link-id', link_entry),
+        inv_delta = [('foo', 'bar/foo2', b'foo-id', foo_entry),
+                     ('bar/baz', None, b'baz-id', None),
+                     (None, 'link', b'link-id', link_entry),
                     ]
         shim = revision_store._TreeShim(repo=None, basis_inv=basis_inv,
                                         inv_delta=inv_delta,
                                         content_provider=None)
         changes = list(shim._delta_to_iter_changes())
-        expected = [('foo-id', ('foo', 'bar/foo2'), False, (True, True),
-                     ('TREE_ROOT', 'bar-id'), ('foo', 'foo2'),
+        expected = [(b'foo-id', ('foo', 'bar/foo2'), False, (True, True),
+                     (b'TREE_ROOT', b'bar-id'), ('foo', 'foo2'),
                      ('file', 'file'), (False, False)),
-                    ('baz-id', ('bar/baz', None), True, (True, False),
-                     ('bar-id', None), ('baz', None),
+                    (b'baz-id', ('bar/baz', None), True, (True, False),
+                     (b'bar-id', None), ('baz', None),
                      ('file', None), (False, None)),
-                    ('link-id', (None, 'link'), True, (False, True),
-                     (None, 'TREE_ROOT'), (None, 'link'),
+                    (b'link-id', (None, 'link'), True, (False, True),
+                     (None, b'TREE_ROOT'), (None, 'link'),
                      (None, 'symlink'), (None, False)),
                    ]
         # from pprint import pformat

=== modified file 'breezy/plugins/grep/test_grep.py'
--- breezy/plugins/grep/test_grep.py	2017-10-27 00:18:42 +0000
+++ breezy/plugins/grep/test_grep.py	2018-03-25 11:39:57 +0000
@@ -2155,8 +2155,8 @@
     def make_example_branch(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents([
-            ('hello', 'foo\n'),
-            ('goodbye', 'baz\n')])
+            ('hello', b'foo\n'),
+            ('goodbye', b'baz\n')])
         tree.add(['hello'])
         tree.commit('setup')
         tree.add(['goodbye'])
@@ -2166,7 +2166,7 @@
     def test_grep_diff_basic(self):
         """grep -p basic test."""
         tree = self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         tree.commit('updated hello')
         out, err = self.run_bzr(['grep', '-p', 'hello'])
         self.assertEqual(err, '')
@@ -2185,7 +2185,7 @@
     def test_grep_diff_revision(self):
         """grep -p specific revision."""
         tree = self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         tree.commit('updated hello')
         out, err = self.run_bzr(['grep', '-p', '-r', '3', 'hello'])
         self.assertEqual(err, '')
@@ -2200,9 +2200,9 @@
     def test_grep_diff_revision_range(self):
         """grep -p revision range."""
         tree = self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!1\n')]) # rev 3
+        self.build_tree_contents([('hello', b'hello world!1\n')]) # rev 3
         tree.commit('rev3')
-        self.build_tree_contents([('blah', 'hello world!2\n')]) # rev 4
+        self.build_tree_contents([('blah', b'hello world!2\n')]) # rev 4
         tree.add('blah')
         tree.commit('rev4')
         open('hello', 'a').write('hello world!3\n')
@@ -2229,7 +2229,7 @@
     def test_grep_diff_color(self):
         """grep -p color test."""
         tree = self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         tree.commit('updated hello')
         out, err = self.run_bzr(['grep', '--diff', '-r', '3',
             '--color', 'always', 'hello'])

=== modified file 'breezy/plugins/launchpad/test_lp_api_lite.py'
--- breezy/plugins/launchpad/test_lp_api_lite.py	2017-11-16 00:39:04 +0000
+++ breezy/plugins/launchpad/test_lp_api_lite.py	2018-03-25 11:39:57 +0000
@@ -354,9 +354,9 @@
         builder = self.make_branch_builder('tip')
         builder.build_snapshot([], [
             ('add', ('', 'root-id', 'directory', None))],
-            revision_id='A')
+            revision_id=b'A')
         b = builder.get_branch()
-        b.tags.set_tag('tip-1.0', 'A')
+        b.tags.set_tag('tip-1.0', b'A')
         return builder, b, b.tags.get_tag_dict()
 
     def test_get_most_recent_tag_tip(self):
@@ -366,7 +366,7 @@
 
     def test_get_most_recent_tag_older(self):
         builder, b, tag_dict = self.make_simple_builder()
-        builder.build_snapshot(['A'], [], revision_id='B')
+        builder.build_snapshot(['A'], [], revision_id=b'B')
         self.assertEqual('B', b.last_revision())
         self.assertEqual('tip-1.0',
                          lp_api_lite.get_most_recent_tag(tag_dict, b))
@@ -392,8 +392,8 @@
         super(TestReportFreshness, self).setUp()
         builder = self.make_branch_builder('tip')
         builder.build_snapshot([], [
-            ('add', ('', 'root-id', 'directory', None))],
-            revision_id='A')
+            ('add', ('', b'root-id', 'directory', None))],
+            revision_id=b'A')
         self.branch = builder.get_branch()
 
     def assertFreshnessReports(self, verbosity, latest_version, content):
@@ -454,8 +454,8 @@
         super(Test_GetNewestVersions, self).setUp()
         builder = self.make_branch_builder('tip')
         builder.build_snapshot([], [
-            ('add', ('', 'root-id', 'directory', None))],
-            revision_id='A')
+            ('add', ('', b'root-id', 'directory', None))],
+            revision_id=b'A')
         self.branch = builder.get_branch()
 
     def assertLatestVersions(self, latest_branch_version, pub_version):

=== modified file 'breezy/plugins/po_merge/tests/test_po_merge.py'
--- breezy/plugins/po_merge/tests/test_po_merge.py	2017-11-16 00:39:04 +0000
+++ breezy/plugins/po_merge/tests/test_po_merge.py	2018-03-25 11:39:57 +0000
@@ -93,26 +93,26 @@
     builder = test.make_branch_builder(relpath)
     builder.start_series()
     builder.build_snapshot(None,
-                           [('add', ('', 'root-id', 'directory', '')),
+                           [('add', ('', b'root-id', 'directory', '')),
                             # Create empty files
-                            ('add', ('po', 'dir-id', 'directory', None),),
-                            ('add', ('po/adduser.pot', 'pot-id', 'file',
+                            ('add', ('po', b'dir-id', 'directory', None),),
+                            ('add', ('po/adduser.pot', b'pot-id', 'file',
                                      _Adduser['base_pot'])),
-                            ('add', ('po/fr.po', 'po-id', 'file',
+                            ('add', ('po/fr.po', b'po-id', 'file',
                                      _Adduser['base_po'])),
-            ], revision_id='base')
+            ], revision_id=b'base')
     # The 'other' branch
     builder.build_snapshot(['base'],
-                           [('modify', ('pot-id',
+                           [('modify', (b'pot-id',
                                         _Adduser['other_pot'])),
-                            ('modify', ('po-id',
+                            ('modify', (b'po-id',
                                         _Adduser['other_po'])),
-                            ], revision_id='other')
+                            ], revision_id=b'other')
     # The 'this' branch
     builder.build_snapshot(['base'],
-                           [('modify', ('pot-id', _Adduser['this_pot'])),
-                            ('modify', ('po-id', _Adduser['this_po'])),
-                            ], revision_id='this')
+                           [('modify', (b'pot-id', _Adduser['this_pot'])),
+                            ('modify', (b'po-id', _Adduser['this_po'])),
+                            ], revision_id=b'this')
     # builder.get_branch() tip is now 'this'
     builder.finish_series()
     return builder

=== modified file 'breezy/plugins/stats/test_stats.py'
--- breezy/plugins/stats/test_stats.py	2018-03-24 00:31:49 +0000
+++ breezy/plugins/stats/test_stats.py	2018-03-25 11:39:57 +0000
@@ -9,12 +9,12 @@
 
     def test_simple(self):
         wt = self.make_branch_and_tree('.')
-        wt.commit(message='1', committer='Fero <[e-mail]>', rev_id='1')
-        wt.commit(message='2', committer='Fero <[e-mail]>', rev_id='2')
-        wt.commit(message='3', committer='Jano <[e-mail]>', rev_id='3')
+        wt.commit(message='1', committer='Fero <[e-mail]>', rev_id=b'1')
+        wt.commit(message='2', committer='Fero <[e-mail]>', rev_id=b'2')
+        wt.commit(message='3', committer='Jano <[e-mail]>', rev_id=b'3')
         wt.commit(message='4', committer='Jano <[e-mail]>',
-                  authors=['Vinco <[e-mail]>'], rev_id='4')
-        wt.commit(message='5', committer='Ferko <[e-mail]>', rev_id='5')
+                  authors=['Vinco <[e-mail]>'], rev_id=b'4')
+        wt.commit(message='5', committer='Ferko <[e-mail]>', rev_id=b'5')
         revs, committers = get_revisions_and_committers(wt.branch.repository,
                                                         ['1', '2', '3', '4', '5'])
         fero = ('Fero', '[e-mail]')
@@ -26,9 +26,9 @@
 
     def test_empty_email(self):
         wt = self.make_branch_and_tree('.')
-        wt.commit(message='1', committer='Fero', rev_id='1')
-        wt.commit(message='2', committer='Fero', rev_id='2')
-        wt.commit(message='3', committer='Jano', rev_id='3')
+        wt.commit(message='1', committer='Fero', rev_id=b'1')
+        wt.commit(message='2', committer='Fero', rev_id=b'2')
+        wt.commit(message='3', committer='Jano', rev_id=b'3')
         revs, committers = get_revisions_and_committers(wt.branch.repository,
                                                         ['1', '2', '3'])
         self.assertEqual({('Fero', ''): ('Fero', ''),
@@ -37,9 +37,9 @@
 
     def test_different_case(self):
         wt = self.make_branch_and_tree('.')
-        wt.commit(message='1', committer='Fero', rev_id='1')
-        wt.commit(message='2', committer='Fero', rev_id='2')
-        wt.commit(message='3', committer='FERO', rev_id='3')
+        wt.commit(message='1', committer='Fero', rev_id=b'1')
+        wt.commit(message='2', committer='Fero', rev_id=b'2')
+        wt.commit(message='3', committer='FERO', rev_id=b'3')
         revs, committers = get_revisions_and_committers(wt.branch.repository,
                                                         ['1', '2', '3'])
         self.assertEqual({('Fero', ''): ('Fero', ''),

=== modified file 'breezy/plugins/upload/tests/test_upload.py'
--- breezy/plugins/upload/tests/test_upload.py	2017-11-12 19:40:53 +0000
+++ breezy/plugins/upload/tests/test_upload.py	2018-03-25 11:39:57 +0000
@@ -825,11 +825,11 @@
 
     def make_diverged_tree_and_upload_location(self):
         tree_a = self.make_branch_and_tree('tree_a')
-        tree_a.commit('message 1', rev_id='rev1')
-        tree_a.commit('message 2', rev_id='rev2a')
+        tree_a.commit('message 1', rev_id=b'rev1')
+        tree_a.commit('message 2', rev_id=b'rev2a')
         tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
         uncommit.uncommit(tree_b.branch, tree=tree_b)
-        tree_b.commit('message 2', rev_id='rev2b')
+        tree_b.commit('message 2', rev_id=b'rev2b')
         # upload tree a
         self.do_full_upload(directory=tree_a.basedir)
         return tree_b
@@ -843,12 +843,12 @@
         self.assertRaises(cmds.DivergedUploadedTree,
                           self.do_incremental_upload,
                           directory=self.diverged_tree.basedir)
-        self.assertRevidUploaded('rev2a')
+        self.assertRevidUploaded(b'rev2a')
 
     def test_upload_diverged_with_overwrite(self):
         self.do_incremental_upload(directory=self.diverged_tree.basedir,
                                    overwrite=True)
-        self.assertRevidUploaded('rev2b')
+        self.assertRevidUploaded(b'rev2b')
 
 
 class TestUploadBadRemoteReivd(tests.TestCaseWithTransport, UploadUtilsMixin):

=== modified file 'breezy/plugins/weave_fmt/repository.py'
--- breezy/plugins/weave_fmt/repository.py	2018-03-24 17:48:04 +0000
+++ breezy/plugins/weave_fmt/repository.py	2018-03-25 11:39:57 +0000
@@ -796,7 +796,7 @@
             # weave specific optimised path:
             try:
                 self.target.set_make_working_trees(self.source.make_working_trees())
-            except (errors.RepositoryUpgradeRequired, NotImplemented):
+            except (errors.RepositoryUpgradeRequired, NotImplementedError):
                 pass
             # FIXME do not peek!
             if self.source._transport.listable():

=== modified file 'breezy/plugins/weave_fmt/test_bzrdir.py'
--- breezy/plugins/weave_fmt/test_bzrdir.py	2017-11-12 17:53:47 +0000
+++ breezy/plugins/weave_fmt/test_bzrdir.py	2018-03-25 11:39:57 +0000
@@ -130,162 +130,162 @@
 
 _upgrade1_template = \
      [
-     ('foo', 'new contents\n'),
+     ('foo', b'new contents\n'),
      ('.bzr/',),
      ('.bzr/README',
-      'This is a Bazaar control directory.\n'
-      'Do not change any files in this directory.\n'
-      'See http://bazaar.canonical.com/ for more information about Bazaar.\n'),
-     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
+      b'This is a Bazaar control directory.\n'
+      b'Do not change any files in this directory.\n'
+      b'See http://bazaar.canonical.com/ for more information about Bazaar.\n'),
+     ('.bzr/branch-format', b'Bazaar-NG branch, format 0.0.4\n'),
      ('.bzr/revision-history',
-      '[e-mail]-20051004035611-176b16534b086b3c\n'
-      '[e-mail]-20051004035756-235f2b7dcdddd8dd\n'),
-     ('.bzr/merged-patches', ''),
-     ('.bzr/pending-merged-patches', ''),
-     ('.bzr/branch-name', ''),
-     ('.bzr/branch-lock', ''),
-     ('.bzr/pending-merges', ''),
+      b'[e-mail]-20051004035611-176b16534b086b3c\n'
+      b'[e-mail]-20051004035756-235f2b7dcdddd8dd\n'),
+     ('.bzr/merged-patches', b''),
+     ('.bzr/pending-merged-patches', b''),
+     ('.bzr/branch-name', b''),
+     ('.bzr/branch-lock', b''),
+     ('.bzr/pending-merges', b''),
      ('.bzr/inventory',
-      '<inventory>\n'
-      '<entry file_id="foo-20051004035605-91e788d1875603ae" kind="file" name="foo" />\n'
-      '</inventory>\n'),
+      b'<inventory>\n'
+      b'<entry file_id="foo-20051004035605-91e788d1875603ae" kind="file" name="foo" />\n'
+      b'</inventory>\n'),
      ('.bzr/stat-cache',
-      '### bzr hashcache v5\n'
-      'foo// be9f309239729f69a6309e970ef24941d31e042c 13 1128398176 1128398176 303464 770\n'),
+      b'### bzr hashcache v5\n'
+      b'foo// be9f309239729f69a6309e970ef24941d31e042c 13 1128398176 1128398176 303464 770\n'),
      ('.bzr/text-store/',),
      ('.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz',
-      '\x1f\x8b\x08\x00[\xfdAC\x02\xff\xcb\xcc\xcb,\xc9L\xccQH\xce\xcf+I\xcd+)\xe6\x02\x00\xdd\xcc\xf90\x11\x00\x00\x00'),
+      b'\x1f\x8b\x08\x00[\xfdAC\x02\xff\xcb\xcc\xcb,\xc9L\xccQH\xce\xcf+I\xcd+)\xe6\x02\x00\xdd\xcc\xf90\x11\x00\x00\x00'),
      ('.bzr/text-store/foo-20051004035756-4081373d897c3453.gz',
-      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\xcbK-WH\xce\xcf+I\xcd+)\xe6\x02\x00g\xc3\xdf\xc9\r\x00\x00\x00'),
+      b'\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\xcbK-WH\xce\xcf+I\xcd+)\xe6\x02\x00g\xc3\xdf\xc9\r\x00\x00\x00'),
      ('.bzr/inventory-store/',),
      ('.bzr/inventory-store/[e-mail]',
-      '\x1f\x8b\x08\x00[\xfdAC\x02\xffm\x8f\xcd\n\xc20\x10\x84\xef>E\xc8\xbdt7?M\x02\xad\xaf"\xa1\x99`P[\xa8E\xacOo\x14\x05\x0f\xdef\xe1\xfbv\x98\xbeL7L\xeb\xbcl\xfb]_\xc3\xb2\x89\\\xce8\x944\xc8<\xcf\x8d"\xb2LdH\xdb\x8el\x13\x18\xce\xfb\xc4\xde\xd5SGHq*\xd3\x0b\xad\x8e\x14S\xbc\xe0\xadI\xb1\xe2\xbe\xfe}\xc2\xdc\xb0\rL\xc6#\xa4\xd1\x8d*\x99\x0f}=F\x1e$8G\x9d\xa0\x02\xa1rP9\x01c`FV\xda1qg\x98"\x02}\xa5\xf2\xa8\x95\xec\xa4h\xeb\x80\xf6g\xcd\x13\xb3\x01\xcc\x98\xda\x00\x00\x00'),
+      b'\x1f\x8b\x08\x00[\xfdAC\x02\xffm\x8f\xcd\n\xc20\x10\x84\xef>E\xc8\xbdt7?M\x02\xad\xaf"\xa1\x99`P[\xa8E\xacOo\x14\x05\x0f\xdef\xe1\xfbv\x98\xbeL7L\xeb\xbcl\xfb]_\xc3\xb2\x89\\\xce8\x944\xc8<\xcf\x8d"\xb2LdH\xdb\x8el\x13\x18\xce\xfb\xc4\xde\xd5SGHq*\xd3\x0b\xad\x8e\x14S\xbc\xe0\xadI\xb1\xe2\xbe\xfe}\xc2\xdc\xb0\rL\xc6#\xa4\xd1\x8d*\x99\x0f}=F\x1e$8G\x9d\xa0\x02\xa1rP9\x01c`FV\xda1qg\x98"\x02}\xa5\xf2\xa8\x95\xec\xa4h\xeb\x80\xf6g\xcd\x13\xb3\x01\xcc\x98\xda\x00\x00\x00'),
      ('.bzr/inventory-store/[e-mail]',
-      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xffm\x8f\xc1\n\xc20\x10D\xef~E\xc8\xbd\xb8\x9bM\x9a,\xb4\xfe\x8a\xc4f\x83Am\xa1\x16\xb1~\xbdQ\x14<x\x9b\x81y3LW\xc6\x9b\x8c\xcb4\xaf\xbbMW\xc5\xbc\xaa\\\xce\xb2/\xa9\xd7y\x9a\x1a\x03\xe0\x10\xc0\x02\xb9\x16\\\xc3(>\x84\x84\xc1WKQ\xb4:\x95\xf1\x15\xad\x8cVc\xbc\xc8\x1b\xd3j\x91\xfb\xf2\xaf\xa4r\x8d\x85\x80\xe4)\x05\xf6\x03YG\x9f\xf4\xf5\x18\xb1\xd7\x07\xe1L\xc0\x86\xd8\x1b\xce-\xc7\xb6:a\x0f\x92\x8de\x8b\x89P\xc0\x9a\xe1\x0b\x95G\x9d\xc4\xda\xb1\xad\x07\xb6?o\x9e\xb5\xff\xf0\xf9\xda\x00\x00\x00'),
+      b'\x1f\x8b\x08\x00\xc4\xfdAC\x02\xffm\x8f\xc1\n\xc20\x10D\xef~E\xc8\xbd\xb8\x9bM\x9a,\xb4\xfe\x8a\xc4f\x83Am\xa1\x16\xb1~\xbdQ\x14<x\x9b\x81y3LW\xc6\x9b\x8c\xcb4\xaf\xbbMW\xc5\xbc\xaa\\\xce\xb2/\xa9\xd7y\x9a\x1a\x03\xe0\x10\xc0\x02\xb9\x16\\\xc3(>\x84\x84\xc1WKQ\xb4:\x95\xf1\x15\xad\x8cVc\xbc\xc8\x1b\xd3j\x91\xfb\xf2\xaf\xa4r\x8d\x85\x80\xe4)\x05\xf6\x03YG\x9f\xf4\xf5\x18\xb1\xd7\x07\xe1L\xc0\x86\xd8\x1b\xce-\xc7\xb6:a\x0f\x92\x8de\x8b\x89P\xc0\x9a\xe1\x0b\x95G\x9d\xc4\xda\xb1\xad\x07\xb6?o\x9e\xb5\xff\xf0\xf9\xda\x00\x00\x00'),
      ('.bzr/revision-store/',),
      ('.bzr/revision-store/[e-mail]',
-      '\x1f\x8b\x08\x00[\xfdAC\x02\xff\x9d\x8eKj\xc30\x14E\xe7^\x85\xd0 \xb3$\xefI\xd1\x8f\xd8\xa6\x1b(t\x07E?\xbb\x82H\n\xb2\x1ahW\xdfB1\x14:\xeb\xf4r\xee\xbdgl\xf1\x91\xb6T\x0b\xf15\xe7\xd4{l\x13}\xb6\xad\xa7B^j\xbd\x91\xc3\xad_\xb3\xbb?m\xf5\xbd\xf9\xb8\xb4\xba\x9eJ\xec\x87\xb5_)I\xe5\x11K\xaf\xed\xe35\x85\x89\xfe\xa5\x8e\x0c@ \xc0\x05\xb8\x90\x88GT\xd2\xa1\x14\xfc\xe2@K\xc7\xfd\xef\x85\xed\xcd\xe2D\x95\x8d\x1a\xa47<\x02c2\xb0 \xbc\xd0\x8ay\xa3\xbcp\x8a\x83\x12A3\xb7XJv\xef\x7f_\xf7\x94\xe3\xd6m\xbeO\x14\x91in4*<\x812\x88\xc60\xfc\x01>k\x89\x13\xe5\x12\x00\xe8<\x8c\xdf\x8d\xcd\xaeq\xb6!\x90\xa5\xd6\xf1\xbc\x07\xc3x\xde\x85\xe6\xe1\x0b\xc8\x8a\x98\x03T\x01\x00\x00'),
+      b'\x1f\x8b\x08\x00[\xfdAC\x02\xff\x9d\x8eKj\xc30\x14E\xe7^\x85\xd0 \xb3$\xefI\xd1\x8f\xd8\xa6\x1b(t\x07E?\xbb\x82H\n\xb2\x1ahW\xdfB1\x14:\xeb\xf4r\xee\xbdgl\xf1\x91\xb6T\x0b\xf15\xe7\xd4{l\x13}\xb6\xad\xa7B^j\xbd\x91\xc3\xad_\xb3\xbb?m\xf5\xbd\xf9\xb8\xb4\xba\x9eJ\xec\x87\xb5_)I\xe5\x11K\xaf\xed\xe35\x85\x89\xfe\xa5\x8e\x0c@ \xc0\x05\xb8\x90\x88GT\xd2\xa1\x14\xfc\xe2@K\xc7\xfd\xef\x85\xed\xcd\xe2D\x95\x8d\x1a\xa47<\x02c2\xb0 \xbc\xd0\x8ay\xa3\xbcp\x8a\x83\x12A3\xb7XJv\xef\x7f_\xf7\x94\xe3\xd6m\xbeO\x14\x91in4*<\x812\x88\xc60\xfc\x01>k\x89\x13\xe5\x12\x00\xe8<\x8c\xdf\x8d\xcd\xaeq\xb6!\x90\xa5\xd6\xf1\xbc\x07\xc3x\xde\x85\xe6\xe1\x0b\xc8\x8a\x98\x03T\x01\x00\x00'),
      ('.bzr/revision-store/[e-mail]',
-      '\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\x9d\x90Kj\x031\x0c\x86\xf79\xc5\xe0Ev\xe9\xc8o\x9b\xcc\x84^\xa0\xd0\x1b\x14\xbf&5d\xec`\xbb\x81\xf6\xf45\x84\xa4\x81\xaeZ\xa1\x85\x84^\xdf\xaf\xa9\x84K\xac1\xa7\xc1\xe5u\x8d\xad\x852\xa3\x17SZL\xc3k\xce\xa7a{j\xfb\xd5\x9e\x9fk\xfe(.,%\x1f\x9fRh\xdbc\xdb\xa3!\xa6KH-\x97\xcf\xb7\xe8g\xf4\xbbkG\x008\x06`@\xb9\xe4bG(_\x88\x95\xde\xf9n\xca\xfb\xc7\r\xf5\xdd\xe0\x19\xa9\x85)\x81\xf5"\xbd\x04j\xb8\x02b\xa8W\\\x0b\xc9\x14\xf4\xbc\xbb\xd7\xd6H4\xdc\xb8\xff}\xba\xc55\xd4f\xd6\xf3\x8c0&\x8ajE\xa4x\xe2@\xa5\xa6\x9a\xf3k\xc3WNaFT\x00\x00:l\xa6>Q\xcd1\x1cjp9\xf9;\xc34\xde\n\x9b\xe9lJWT{t\',a\xf9\x0b\xae\xc0x\x87\xa5\xb0Xp\xca,(a\xa9{\xd0{}\xd4\x12\x04(\xc5\xbb$\xc5$V\xceaI\x19\x01\xa2\x1dh\xed\x82d\x8c.\xccr@\xc3\xd8Q\xc6\x1f\xaa\xf1\xb6\xe8\xb0\xf9\x06QR\r\xf9\xfc\x01\x00\x00')]
+      b'\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\x9d\x90Kj\x031\x0c\x86\xf79\xc5\xe0Ev\xe9\xc8o\x9b\xcc\x84^\xa0\xd0\x1b\x14\xbf&5d\xec`\xbb\x81\xf6\xf45\x84\xa4\x81\xaeZ\xa1\x85\x84^\xdf\xaf\xa9\x84K\xac1\xa7\xc1\xe5u\x8d\xad\x852\xa3\x17SZL\xc3k\xce\xa7a{j\xfb\xd5\x9e\x9fk\xfe(.,%\x1f\x9fRh\xdbc\xdb\xa3!\xa6KH-\x97\xcf\xb7\xe8g\xf4\xbbkG\x008\x06`@\xb9\xe4bG(_\x88\x95\xde\xf9n\xca\xfb\xc7\r\xf5\xdd\xe0\x19\xa9\x85)\x81\xf5"\xbd\x04j\xb8\x02b\xa8W\\\x0b\xc9\x14\xf4\xbc\xbb\xd7\xd6H4\xdc\xb8\xff}\xba\xc55\xd4f\xd6\xf3\x8c0&\x8ajE\xa4x\xe2@\xa5\xa6\x9a\xf3k\xc3WNaFT\x00\x00:l\xa6>Q\xcd1\x1cjp9\xf9;\xc34\xde\n\x9b\xe9lJWT{t\',a\xf9\x0b\xae\xc0x\x87\xa5\xb0Xp\xca,(a\xa9{\xd0{}\xd4\x12\x04(\xc5\xbb$\xc5$V\xceaI\x19\x01\xa2\x1dh\xed\x82d\x8c.\xccr@\xc3\xd8Q\xc6\x1f\xaa\xf1\xb6\xe8\xb0\xf9\x06QR\r\xf9\xfc\x01\x00\x00')]
 
 
 _ghost_template = [
     ( './foo',
-        'hello\n'
+        b'hello\n'
     ),
     ( './.bzr/', ),
     ( './.bzr/README',
-      'This is a Bazaar control directory.\n'
-      'Do not change any files in this directory.\n'
-      'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
+      b'This is a Bazaar control directory.\n'
+      b'Do not change any files in this directory.\n'
+      b'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
     ),
     ( './.bzr/branch-format',
-        'Bazaar-NG branch, format 0.0.4\n'
+        b'Bazaar-NG branch, format 0.0.4\n'
     ),
     ( './.bzr/branch-lock',
-        ''
+        b''
     ),
     ( './.bzr/branch-name',
-        ''
+        b''
     ),
     ( './.bzr/inventory',
-        '<inventory>\n'
-        '<entry file_id="foo-20051004104918-0379cb7c76354cde" kind="file" name="foo" />\n'
-        '</inventory>\n'
+        b'<inventory>\n'
+        b'<entry file_id="foo-20051004104918-0379cb7c76354cde" kind="file" name="foo" />\n'
+        b'</inventory>\n'
     ),
     ( './.bzr/merged-patches',
-        ''
+        b''
     ),
     ( './.bzr/pending-merged-patches',
-        ''
+        b''
     ),
     ( './.bzr/pending-merges',
-        ''
+        b''
     ),
     ( './.bzr/revision-history',
-        '[e-mail]-20051004104921-a98be2278dd30b7b\n'
-        '[e-mail]-20051004104937-c9b7a7bfcc0bb22d\n'
+        b'[e-mail]-20051004104921-a98be2278dd30b7b\n'
+        b'[e-mail]-20051004104937-c9b7a7bfcc0bb22d\n'
     ),
     ( './.bzr/stat-cache',
-        '### bzr hashcache v5\n'
-        'foo// f572d396fae9206628714fb2ce00f72e94f2258f 6 1128422956 1128422956 306900 770\n'
+        b'### bzr hashcache v5\n'
+        b'foo// f572d396fae9206628714fb2ce00f72e94f2258f 6 1128422956 1128422956 306900 770\n'
     ),
     ( './.bzr/text-store/', ),
     ( './.bzr/text-store/foo-20051004104921-8de8118a71be45ba.gz',
-        '\x1f\x8b\x08\x081^BC\x00\x03foo-20051004104921-8de8118a71be45ba\x00\xcbH\xcd\xc9\xc9\xe7\x02\x00 0:6\x06\x00\x00\x00'
+        b'\x1f\x8b\x08\x081^BC\x00\x03foo-20051004104921-8de8118a71be45ba\x00\xcbH\xcd\xc9\xc9\xe7\x02\x00 0:6\x06\x00\x00\x00'
     ),
     ( './.bzr/inventory-store/', ),
     ( './.bzr/inventory-store/[e-mail]',
-        '\x1f\x8b\x08\x081^BC\x00\[e-mail]-20051004104921-a98be2278dd30b7b\x00m\x8f\xcb\n'
-        '\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
-        'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
+        b'\x1f\x8b\x08\x081^BC\x00\[e-mail]-20051004104921-a98be2278dd30b7b\x00m\x8f\xcb\n'
+        b'\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
+        b'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
     ),
     ( './.bzr/inventory-store/[e-mail]',
-        '\x1f\x8b\x08\x08A^BC\x00\[e-mail]-20051004104937-c9b7a7bfcc0bb22d\x00m\x8f\xcb\n'
-        '\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
-        'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
+        b'\x1f\x8b\x08\x08A^BC\x00\[e-mail]-20051004104937-c9b7a7bfcc0bb22d\x00m\x8f\xcb\n'
+        b'\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
+        b'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
     ),
     ( './.bzr/revision-store/', ),
     ( './.bzr/revision-store/[e-mail]',
-        '\x1f\x8b\x08\x081^BC\x00\[e-mail]-20051004104921-a98be2278dd30b7b\x00\x9d\x8eMj\xc30\x14\x84\xf7>\x85\xd0"\xbb$\xef\xc9\xb6,\x11\xdb\xf4\x02\x85\xde\xa0\xe8\xe7\xd9\x11\xc4R\x90\xd4@{\xfa\x06\x8a\xa1\xd0]\x97\x03\xdf\xcc|c\xa6G(!E\xe6\xd2\xb6\x85Z)O\xfc\xd5\xe4\x1a"{K\xe9\xc6\x0e\xb7z\xd9\xec\xfd\xa5\xa4\x8f\xech\xc9i=E\xaa\x87\xb5^8\x0b\xf1A\xb1\xa6\xfc\xf9\x1e\xfc\xc4\xffRG\x01\xd0#@\x87\xd0i\x81G\xa3\x95%!\x06\xe5}\x0bv\xb0\xbf\x17\xca\xd5\xe0\xc4-\xa0\xb1\x8b\xb6`\xc0I\xa4\xc5\xf4\x9el\xef\x95v [\x94\xcf\x8e\xd5\xcay\xe4l\xf7\xfe\xf7u\r'
-        '\x1b\x95j\xb6\xfb\xc4\x11\x85\xea\x84\xd0\x12O\x03t\x83D\xad\xc4\x0f\xf0\x95"M\xbc\x95\x00\xc0\xe7f|6\x8aYi^B.u<\xef\xb1\x19\xcf\xbb\xce\xdc|\x038=\xc7\xe6R\x01\x00\x00'
+        b'\x1f\x8b\x08\x081^BC\x00\[e-mail]-20051004104921-a98be2278dd30b7b\x00\x9d\x8eMj\xc30\x14\x84\xf7>\x85\xd0"\xbb$\xef\xc9\xb6,\x11\xdb\xf4\x02\x85\xde\xa0\xe8\xe7\xd9\x11\xc4R\x90\xd4@{\xfa\x06\x8a\xa1\xd0]\x97\x03\xdf\xcc|c\xa6G(!E\xe6\xd2\xb6\x85Z)O\xfc\xd5\xe4\x1a"{K\xe9\xc6\x0e\xb7z\xd9\xec\xfd\xa5\xa4\x8f\xech\xc9i=E\xaa\x87\xb5^8\x0b\xf1A\xb1\xa6\xfc\xf9\x1e\xfc\xc4\xffRG\x01\xd0#@\x87\xd0i\x81G\xa3\x95%!\x06\xe5}\x0bv\xb0\xbf\x17\xca\xd5\xe0\xc4-\xa0\xb1\x8b\xb6`\xc0I\xa4\xc5\xf4\x9el\xef\x95v [\x94\xcf\x8e\xd5\xcay\xe4l\xf7\xfe\xf7u\r'
+        b'\x1b\x95j\xb6\xfb\xc4\x11\x85\xea\x84\xd0\x12O\x03t\x83D\xad\xc4\x0f\xf0\x95"M\xbc\x95\x00\xc0\xe7f|6\x8aYi^B.u<\xef\xb1\x19\xcf\xbb\xce\xdc|\x038=\xc7\xe6R\x01\x00\x00'
     ),
     ( './.bzr/revision-store/[e-mail]',
-        '\x1f\x8b\x08\x08A^BC\x00\[e-mail]-20051004104937-c9b7a7bfcc0bb22d\x00\x9d\x90\xc1j\xc30\x0c\x86\xef}\n'
-        "\xe3Coie'\xb1c\x9a\x94\xbe\xc0`o0,[N\x03M\\\x1c\xafe{\xfae\x94n\x85\xc1`;Y\x88O\xd2\xff\xb9Mt\x19\xe6!N\xcc\xc5q\x1cr\xa6\xd4\xf1'\x9b\xf20\xb1\xe7\x18Ol}\xca\xbb\x11\xcf\x879\xbe&G!\xc5~3Q^\xf7y\xc7\xd90]h\xca1\xbd\xbd\x0c\xbe\xe3?\xa9B\x02\xd4\x02\xa0\x12P\x99R\x17\xce\xa0\xb6\x1a\x83s\x80(\xa5\x7f\xdc0\x1f\xad\xe88\x82\xb0\x18\x0c\x82\x05\xa7\x04\x05[{\xc2\xda7\xc6\x81*\x85B\x8dh\x1a\xe7\x05g\xf7\xdc\xff>\x9d\x87\x91\xe6l\xc7s\xc7\x85\x90M%\xa5\xd1z#\x85\xa8\x9b\x1a\xaa\xfa\x06\xbc\xc7\x89:^*\x00\xe0\xfbU\xbbL\xcc\xb6\xa7\xfdH\xa9'\x16\x03\xeb\x8fq\xce\xed\xf6\xde_\xb5g\x9b\x16\xa1y\xa9\xbe\x02&\n"
-        '\x7fJ+EaM\x83$\xa5n\xbc/a\x91~\xd0\xbd\xfd\x135\n'
-        '\xd0\x9a`\x0c*W\x1aR\xc1\x94du\x08(\t\xb0\x91\xdeZ\xa3\x9cU\x9cm\x7f\x8dr\x1d\x10Ot\xb8\xc6\xcf\xa7\x907|\xfb-\xb1\xbd\xd3\xfb\xd5\x07\xeeD\xee\x08*\x02\x00\x00'
+        b'\x1f\x8b\x08\x08A^BC\x00\[e-mail]-20051004104937-c9b7a7bfcc0bb22d\x00\x9d\x90\xc1j\xc30\x0c\x86\xef}\n'
+        b"\xe3Coie'\xb1c\x9a\x94\xbe\xc0`o0,[N\x03M\\\x1c\xafe{\xfae\x94n\x85\xc1`;Y\x88O\xd2\xff\xb9Mt\x19\xe6!N\xcc\xc5q\x1cr\xa6\xd4\xf1'\x9b\xf20\xb1\xe7\x18Ol}\xca\xbb\x11\xcf\x879\xbe&G!\xc5~3Q^\xf7y\xc7\xd90]h\xca1\xbd\xbd\x0c\xbe\xe3?\xa9B\x02\xd4\x02\xa0\x12P\x99R\x17\xce\xa0\xb6\x1a\x83s\x80(\xa5\x7f\xdc0\x1f\xad\xe88\x82\xb0\x18\x0c\x82\x05\xa7\x04\x05[{\xc2\xda7\xc6\x81*\x85B\x8dh\x1a\xe7\x05g\xf7\xdc\xff>\x9d\x87\x91\xe6l\xc7s\xc7\x85\x90M%\xa5\xd1z#\x85\xa8\x9b\x1a\xaa\xfa\x06\xbc\xc7\x89:^*\x00\xe0\xfbU\xbbL\xcc\xb6\xa7\xfdH\xa9'\x16\x03\xeb\x8fq\xce\xed\xf6\xde_\xb5g\x9b\x16\xa1y\xa9\xbe\x02&\n"
+        b'\x7fJ+EaM\x83$\xa5n\xbc/a\x91~\xd0\xbd\xfd\x135\n'
+        b'\xd0\x9a`\x0c*W\x1aR\xc1\x94du\x08(\t\xb0\x91\xdeZ\xa3\x9cU\x9cm\x7f\x8dr\x1d\x10Ot\xb8\xc6\xcf\xa7\x907|\xfb-\xb1\xbd\xd3\xfb\xd5\x07\xeeD\xee\x08*\x02\x00\x00'
     ),
 ]
 
 _upgrade_dir_template = [
     ( './.bzr/', ),
     ( './.bzr/README',
-      'This is a Bazaar control directory.\n'
-      'Do not change any files in this directory.\n'
-      'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
+      b'This is a Bazaar control directory.\n'
+      b'Do not change any files in this directory.\n'
+      b'See http://bazaar.canonical.com/ for more information about Bazaar.\n'
     ),
     ( './.bzr/branch-format',
-        'Bazaar-NG branch, format 0.0.4\n'
+        b'Bazaar-NG branch, format 0.0.4\n'
     ),
     ( './.bzr/branch-lock',
-        ''
+        b''
     ),
     ( './.bzr/branch-name',
-        ''
+        b''
     ),
     ( './.bzr/inventory',
-        '<inventory>\n'
-        '<entry file_id="dir-20051005095101-da1441ea3fa6917a" kind="directory" name="dir" />\n'
-        '</inventory>\n'
+        b'<inventory>\n'
+        b'<entry file_id="dir-20051005095101-da1441ea3fa6917a" kind="directory" name="dir" />\n'
+        b'</inventory>\n'
     ),
     ( './.bzr/merged-patches',
-        ''
+        b''
     ),
     ( './.bzr/pending-merged-patches',
-        ''
+        b''
     ),
     ( './.bzr/pending-merges',
-        ''
+        b''
     ),
     ( './.bzr/revision-history',
-        '[e-mail]-20051005095108-6065fbd8e7d8617e\n'
+        b'[e-mail]-20051005095108-6065fbd8e7d8617e\n'
     ),
     ( './.bzr/stat-cache',
-        '### bzr hashcache v5\n'
+        b'### bzr hashcache v5\n'
     ),
     ( './.bzr/text-store/', ),
     ( './.bzr/inventory-store/', ),
     ( './.bzr/inventory-store/[e-mail]',
-        '\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xb3\xc9\xcc+K\xcd+\xc9/\xaa\xb4\xe3\xb2\x012\x8a*\x15\xd22sR\xe33Sl\x95R2\x8bt\x8d\x0c\x0cL\r'
-        "\x81\xd8\xc0\x12H\x19\xea\xa6$\x1a\x9a\x98\x18\xa6&\x1a\xa7%\x9aY\x1a\x9a'*)dg\xe6A\x94\xa6&\x83LQR\xc8K\xccM\x05\x0b()\xe8\x03\xcd\xd4G\xb2\x00\x00\xc2<\x94\xb1m\x00\x00\x00"
+        b'\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xb3\xc9\xcc+K\xcd+\xc9/\xaa\xb4\xe3\xb2\x012\x8a*\x15\xd22sR\xe33Sl\x95R2\x8bt\x8d\x0c\x0cL\r'
+        b"\x81\xd8\xc0\x12H\x19\xea\xa6$\x1a\x9a\x98\x18\xa6&\x1a\xa7%\x9aY\x1a\x9a'*)dg\xe6A\x94\xa6&\x83LQR\xc8K\xccM\x05\x0b()\xe8\x03\xcd\xd4G\xb2\x00\x00\xc2<\x94\xb1m\x00\x00\x00"
     ),
     ( './.bzr/revision-store/', ),
     ( './.bzr/revision-store/[e-mail]',
-        '\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xa5OKj\xc30\x14\xdc\xfb\x14B\x8b\xec\x92<I\xd6\xc7\xc42\x85\xde\xa0\x17(\xb6\xf4\x9c\n'
-        'l\xa9H"\x90\x9c\xbe\xa6\xa9\xa1\x9b\xae\xbax\x0c\xcc\xe71\xd3g\xbc\x85\x12R$.\xadk\xa8\x15\xb3\xa5oi\xc2\\\xc9kZ\x96\x10\x0b9,\xf5\x92\xbf)\xf7\xf2\x83O\xe5\x14\xb1\x1e\xae\xf5BI\x887\x8c5\xe5\xfb{\xf0\x96\xfei>r\x00\xc9\xb6\x83n\x03sT\xa0\xe4<y\x83\xda\x1b\xc54\xfe~T>Ff\xe9\xcc:\xdd\x8e\xa6E\xc7@\xa2\x82I\xaaNL\xbas\\313)\x00\xb9\xe6\xe0(\xd9\x87\xfc\xb7A\r'
-        "+\x96:\xae\x9f\x962\xc6\x8d\x04i\x949\x01\x97R\xb7\x1d\x17O\xc3#E\xb4T(\x00\xa0C\xd3o\x892^q\x18\xbd'>\xe4\xfe\xbc\x13M\x7f\xde{\r"
-        '\xcd\x17\x85\xea\xba\x03l\x01\x00\x00'
+        b'\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xa5OKj\xc30\x14\xdc\xfb\x14B\x8b\xec\x92<I\xd6\xc7\xc42\x85\xde\xa0\x17(\xb6\xf4\x9c\n'
+        b'l\xa9H"\x90\x9c\xbe\xa6\xa9\xa1\x9b\xae\xbax\x0c\xcc\xe71\xd3g\xbc\x85\x12R$.\xadk\xa8\x15\xb3\xa5oi\xc2\\\xc9kZ\x96\x10\x0b9,\xf5\x92\xbf)\xf7\xf2\x83O\xe5\x14\xb1\x1e\xae\xf5BI\x887\x8c5\xe5\xfb{\xf0\x96\xfei>r\x00\xc9\xb6\x83n\x03sT\xa0\xe4<y\x83\xda\x1b\xc54\xfe~T>Ff\xe9\xcc:\xdd\x8e\xa6E\xc7@\xa2\x82I\xaaNL\xbas\\313)\x00\xb9\xe6\xe0(\xd9\x87\xfc\xb7A\r'
+        b"+\x96:\xae\x9f\x962\xc6\x8d\x04i\x949\x01\x97R\xb7\x1d\x17O\xc3#E\xb4T(\x00\xa0C\xd3o\x892^q\x18\xbd'>\xe4\xfe\xbc\x13M\x7f\xde{\r"
+        b'\xcd\x17\x85\xea\xba\x03l\x01\x00\x00'
     ),
     ( './dir/', ),
 ]

=== modified file 'breezy/plugins/weave_fmt/test_repository.py'
--- breezy/plugins/weave_fmt/test_repository.py	2018-02-17 02:02:38 +0000
+++ breezy/plugins/weave_fmt/test_repository.py	2018-03-25 11:39:57 +0000
@@ -142,10 +142,10 @@
         # disk.
         control.create_branch()
         tree = control.create_workingtree()
-        tree.add(['foo'], ['Foo:Bar'], ['file'])
-        tree.put_file_bytes_non_atomic('foo', 'content\n', 'Foo:Bar')
+        tree.add(['foo'], [b'Foo:Bar'], ['file'])
+        tree.put_file_bytes_non_atomic('foo', 'content\n', b'Foo:Bar')
         try:
-            tree.commit('first post', rev_id='first')
+            tree.commit('first post', rev_id=b'first')
         except IllegalPath:
             if sys.platform != 'win32':
                 raise

=== modified file 'breezy/plugins/weave_fmt/test_workingtree.py'
--- breezy/plugins/weave_fmt/test_workingtree.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/weave_fmt/test_workingtree.py	2018-03-25 11:39:57 +0000
@@ -45,15 +45,19 @@
         tree = self.create_format2_tree('.')
         self.assertRaises(errors.UnsupportedOperation, tree.set_conflicts,
                           None)
-        file('lala.BASE', 'wb').write('labase')
+        with open('lala.BASE', 'wb') as f:
+            f.write(b'labase')
         expected = conflicts.ContentsConflict('lala')
         self.assertEqual(list(tree.conflicts()), [expected])
-        file('lala', 'wb').write('la')
-        tree.add('lala', 'lala-id')
+        with open('lala', 'wb') as f:
+            f.write(b'la')
+        tree.add('lala', b'lala-id')
         expected = conflicts.ContentsConflict('lala', file_id='lala-id')
         self.assertEqual(list(tree.conflicts()), [expected])
-        file('lala.THIS', 'wb').write('lathis')
-        file('lala.OTHER', 'wb').write('laother')
+        with open('lala.THIS', 'wb') as f:
+            f.write(b'lathis')
+        with open('lala.OTHER', 'wb') as f:
+            f.write(b'laother')
         # When "text conflict"s happen, stem, THIS and OTHER are text
         expected = conflicts.TextConflict('lala', file_id='lala-id')
         self.assertEqual(list(tree.conflicts()), [expected])
@@ -65,12 +69,12 @@
     def test_detect_conflicts(self):
         """Conflicts are detected properly"""
         tree = self.create_format2_tree('.')
-        self.build_tree_contents([('hello', 'hello world4'),
-                                  ('hello.THIS', 'hello world2'),
-                                  ('hello.BASE', 'hello world1'),
-                                  ('hello.OTHER', 'hello world3'),
-                                  ('hello.sploo.BASE', 'yellowworld'),
-                                  ('hello.sploo.OTHER', 'yellowworld2'),
+        self.build_tree_contents([('hello', b'hello world4'),
+                                  ('hello.THIS', b'hello world2'),
+                                  ('hello.BASE', b'hello world1'),
+                                  ('hello.OTHER', b'hello world3'),
+                                  ('hello.sploo.BASE', b'yellowworld'),
+                                  ('hello.sploo.OTHER', b'yellowworld2'),
                                   ])
         tree.lock_read()
         self.assertLength(6, list(tree.list_files()))
@@ -82,7 +86,7 @@
         conflicts.restore('hello')
         conflicts.restore('hello.sploo')
         self.assertLength(0, tree.conflicts())
-        self.assertFileEqual('hello world2', 'hello')
+        self.assertFileEqual('hello world2', b'hello')
         self.assertFalse(os.path.lexists('hello.sploo'))
         self.assertRaises(errors.NotConflicted, conflicts.restore, 'hello')
         self.assertRaises(errors.NotConflicted,

=== modified file 'breezy/repository.py'
--- breezy/repository.py	2018-03-24 17:48:04 +0000
+++ breezy/repository.py	2018-03-25 11:39:57 +0000
@@ -1177,7 +1177,7 @@
         # weave repositories refuse to store revisionids that are non-ascii.
         if revision_id is not None:
             # weaves require ascii revision ids.
-            if isinstance(revision_id, unicode):
+            if isinstance(revision_id, text_type):
                 try:
                     revision_id.encode('ascii')
                 except UnicodeEncodeError:

=== modified file 'breezy/shelf.py'
--- breezy/shelf.py	2017-11-13 22:24:02 +0000
+++ breezy/shelf.py	2018-03-25 11:39:57 +0000
@@ -293,9 +293,9 @@
 
     @staticmethod
     def metadata_record(serializer, revision_id, message=None):
-        metadata = {'revision_id': revision_id}
+        metadata = {b'revision_id': revision_id}
         if message is not None:
-            metadata['message'] = message.encode('utf-8')
+            metadata[b'message'] = message.encode('utf-8')
         return serializer.bytes_record(
             bencode.bencode(metadata), (('metadata',),))
 

=== modified file 'breezy/tests/blackbox/test_add.py'
--- breezy/tests/blackbox/test_add.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_add.py	2018-03-25 11:39:57 +0000
@@ -48,7 +48,7 @@
         """add command prints the names of added files."""
         tree = self.make_branch_and_tree('.')
         self.build_tree(['top.txt', 'dir/', 'dir/sub.txt', 'CVS'])
-        self.build_tree_contents([('.bzrignore', 'CVS\n')])
+        self.build_tree_contents([('.bzrignore', b'CVS\n')])
         out = self.run_bzr('add')[0]
         # the ordering is not defined at the moment
         results = sorted(out.rstrip('\n').split('\n'))
@@ -249,9 +249,9 @@
         """Test skipping files larger than add.maximum_file_size"""
         tree = self.make_branch_and_tree('.')
         self.build_tree(['small.txt', 'big.txt', 'big2.txt'])
-        self.build_tree_contents([('small.txt', '0\n')])
-        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
-        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
+        self.build_tree_contents([('small.txt', b'0\n')])
+        self.build_tree_contents([('big.txt', b'01234567890123456789\n')])
+        self.build_tree_contents([('big2.txt', b'01234567890123456789\n')])
         tree.branch.get_config_stack().set('add.maximum_file_size', 5)
         out = self.run_bzr('add')[0]
         results = sorted(out.rstrip('\n').split('\n'))

=== modified file 'breezy/tests/blackbox/test_added.py'
--- breezy/tests/blackbox/test_added.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_added.py	2018-03-25 11:39:57 +0000
@@ -55,7 +55,7 @@
         check_added('')
 
         # with unknown file, still nothing added
-        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
+        self.build_tree_contents([(name, b'contents of %s\n' % (name))])
         check_added('')
 
         # after add, shows up in list

=== modified file 'breezy/tests/blackbox/test_ancestry.py'
--- breezy/tests/blackbox/test_ancestry.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_ancestry.py	2018-03-25 11:39:57 +0000
@@ -22,20 +22,20 @@
 
     def _build_branches(self):
         a_wt = self.make_branch_and_tree('A')
-        self.build_tree_contents([('A/foo', '1111\n')])
+        self.build_tree_contents([('A/foo', b'1111\n')])
         a_wt.add('foo')
-        a_wt.commit('added foo', rev_id='A1')
+        a_wt.commit('added foo', rev_id=b'A1')
 
         b_wt = a_wt.controldir.sprout('B').open_workingtree()
-        self.build_tree_contents([('B/foo', '1111\n22\n')])
-        b_wt.commit('modified B/foo', rev_id='B1')
+        self.build_tree_contents([('B/foo', b'1111\n22\n')])
+        b_wt.commit('modified B/foo', rev_id=b'B1')
 
-        self.build_tree_contents([('A/foo', '000\n1111\n')])
-        a_wt.commit('modified A/foo', rev_id='A2')
+        self.build_tree_contents([('A/foo', b'000\n1111\n')])
+        a_wt.commit('modified A/foo', rev_id=b'A2')
 
         a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
             b_wt.branch.get_rev_id(1))
-        a_wt.commit('merged B into A', rev_id='A3')
+        a_wt.commit('merged B into A', rev_id=b'A3')
         return a_wt, b_wt
 
     def _check_ancestry(self, location='', result=None):

=== modified file 'breezy/tests/blackbox/test_annotate.py'
--- breezy/tests/blackbox/test_annotate.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_annotate.py	2018-03-25 11:39:57 +0000
@@ -39,8 +39,8 @@
         super(TestAnnotate, self).setUp()
         wt = self.make_branch_and_tree('.')
         b = wt.branch
-        self.build_tree_contents([('hello.txt', 'my helicopter\n'),
-                                  ('nomail.txt', 'nomail\n')])
+        self.build_tree_contents([('hello.txt', b'my helicopter\n'),
+                                  ('nomail.txt', b'nomail\n')])
         wt.add(['hello.txt'])
         self.revision_id_1 = wt.commit('add hello',
                               committer='test@user',
@@ -49,15 +49,15 @@
         self.revision_id_2 = wt.commit('add nomail',
                               committer='no mail',
                               timestamp=1165970000.00, timezone=0)
-        self.build_tree_contents([('hello.txt', 'my helicopter\n'
-                                                'your helicopter\n')])
+        self.build_tree_contents([('hello.txt', b'my helicopter\n'
+                                                b'your helicopter\n')])
         self.revision_id_3 = wt.commit('mod hello',
                               committer='user@test',
                               timestamp=1166040000.00, timezone=0)
-        self.build_tree_contents([('hello.txt', 'my helicopter\n'
-                                                'your helicopter\n'
-                                                'all of\n'
-                                                'our helicopters\n'
+        self.build_tree_contents([('hello.txt', b'my helicopter\n'
+                                                b'your helicopter\n'
+                                                b'all of\n'
+                                                b'our helicopters\n'
                                   )])
         self.revision_id_4 = wt.commit('mod hello',
                               committer='user@test',
@@ -159,10 +159,10 @@
         """Create a tree with a locally edited file."""
         tree = self.make_branch_and_tree(relpath)
         file_relpath = joinpath(relpath, 'file')
-        self.build_tree_contents([(file_relpath, 'foo\ngam\n')])
+        self.build_tree_contents([(file_relpath, b'foo\ngam\n')])
         tree.add('file')
         tree.commit('add file', committer="test@host", rev_id="rev1")
-        self.build_tree_contents([(file_relpath, 'foo\nbar\ngam\n')])
+        self.build_tree_contents([(file_relpath, b'foo\nbar\ngam\n')])
         return tree
 
     def test_annotate_cmd_revspec_branch(self):
@@ -214,20 +214,20 @@
     def _create_merged_file(self):
         """Create a file with a pending merge and local edit."""
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('file', 'foo\ngam\n')])
+        self.build_tree_contents([('file', b'foo\ngam\n')])
         tree.add('file')
         tree.commit('add file', rev_id="rev1", committer="test@host")
         # right side
-        self.build_tree_contents([('file', 'foo\nbar\ngam\n')])
+        self.build_tree_contents([('file', b'foo\nbar\ngam\n')])
         tree.commit("right", rev_id="rev1.1.1", committer="test@host")
         tree.pull(tree.branch, True, "rev1")
         # left side
-        self.build_tree_contents([('file', 'foo\nbaz\ngam\n')])
+        self.build_tree_contents([('file', b'foo\nbaz\ngam\n')])
         tree.commit("left", rev_id="rev2", committer="test@host")
         # merge
         tree.merge_from_branch(tree.branch, "rev1.1.1")
         # edit the file to be 'resolved' and have a further local edit
-        self.build_tree_contents([('file', 'local\nfoo\nbar\nbaz\ngam\n')])
+        self.build_tree_contents([('file', b'local\nfoo\nbar\nbaz\ngam\n')])
         return tree
 
     def test_annotated_edited_merged_file_revnos(self):
@@ -256,7 +256,7 @@
 
     def test_annotate_empty_file(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('empty', '')])
+        self.build_tree_contents([('empty', b'')])
         tree.add('empty')
         tree.commit('add empty file')
         out, err = self.run_bzr(['annotate', 'empty'])
@@ -264,7 +264,7 @@
 
     def test_annotate_removed_file(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('empty', '')])
+        self.build_tree_contents([('empty', b'')])
         tree.add('empty')
         tree.commit('add empty file')
         # delete the file.
@@ -275,7 +275,7 @@
 
     def test_annotate_empty_file_show_ids(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('empty', '')])
+        self.build_tree_contents([('empty', b'')])
         tree.add('empty')
         tree.commit('add empty file')
         out, err = self.run_bzr(['annotate', '--show-ids', 'empty'])
@@ -292,7 +292,7 @@
 
     def test_annotate_without_workingtree(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('empty', '')])
+        self.build_tree_contents([('empty', b'')])
         tree.add('empty')
         tree.commit('add empty file')
         bzrdir = tree.branch.controldir
@@ -304,7 +304,7 @@
     def test_annotate_directory(self):
         """Test --directory option"""
         wt = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/hello.txt', 'my helicopter\n')])
+        self.build_tree_contents([('a/hello.txt', b'my helicopter\n')])
         wt.add(['hello.txt'])
         wt.commit('commit', committer='test@user')
         out, err = self.run_bzr(['annotate', '-d', 'a', 'hello.txt'])
@@ -316,7 +316,7 @@
     def test_simple_annotate(self):
         self.setup_smart_server_with_call_log()
         wt = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/hello.txt', 'my helicopter\n')])
+        self.build_tree_contents([('branch/hello.txt', b'my helicopter\n')])
         wt.add(['hello.txt'])
         wt.commit('commit', committer='test@user')
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_bound_branches.py'
--- breezy/tests/blackbox/test_bound_branches.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_bound_branches.py	2018-03-25 11:39:57 +0000
@@ -94,7 +94,7 @@
     def test_bound_commit(self):
         child_tree = self.create_branches()[1]
 
-        self.build_tree_contents([('child/a', 'new contents')])
+        self.build_tree_contents([('child/a', b'new contents')])
         child_tree.commit(message='child')
 
         self.check_revno(2, 'child')
@@ -107,8 +107,8 @@
         base_tree, child_tree = self.create_branches()
 
         self.build_tree_contents([
-            ('base/a',  'new base contents\n'   ),
-            ('child/b', 'new b child contents\n')])
+            ('base/a',  b'new base contents\n'   ),
+            ('child/b', b'new b child contents\n')])
         base_tree.commit(message='base')
         self.check_revno(2, 'base')
 
@@ -140,8 +140,8 @@
         base_tree, child_tree = self.create_branches()
 
         self.build_tree_contents([
-            ('base/a',  'new base contents\n'   ),
-            ('child/b', 'new b child contents\n')])
+            ('base/a',  b'new base contents\n'   ),
+            ('child/b', b'new b child contents\n')])
 
         base_tree.commit(message='base')
         self.check_revno(2, 'base')
@@ -172,7 +172,7 @@
     def test_pull_updates_both(self):
         base_tree = self.create_branches()[0]
         newchild_tree = base_tree.controldir.sprout('newchild').open_workingtree()
-        self.build_tree_contents([('newchild/b', 'newchild b contents\n')])
+        self.build_tree_contents([('newchild/b', b'newchild b contents\n')])
         newchild_tree.commit(message='newchild')
         self.check_revno(2, 'newchild')
 
@@ -185,7 +185,7 @@
     def test_pull_local_updates_local(self):
         base_tree = self.create_branches()[0]
         newchild_tree = base_tree.controldir.sprout('newchild').open_workingtree()
-        self.build_tree_contents([('newchild/b', 'newchild b contents\n')])
+        self.build_tree_contents([('newchild/b', b'newchild b contents\n')])
         newchild_tree.commit(message='newchild')
         self.check_revno(2, 'newchild')
 
@@ -293,7 +293,7 @@
         other_tree = child_tree.controldir.sprout('other').open_workingtree()
         other_branch = other_tree.branch
 
-        self.build_tree_contents([('other/c', 'file c\n')])
+        self.build_tree_contents([('other/c', b'file c\n')])
         other_tree.add('c')
         other_tree.commit(message='adding c')
         new_rev_id = other_branch.last_revision()
@@ -322,19 +322,19 @@
 
         other_tree = child_tree.controldir.sprout('other').open_workingtree()
 
-        self.build_tree_contents([('other/a', 'new contents\n')])
+        self.build_tree_contents([('other/a', b'new contents\n')])
         other_tree.commit(message='changed a')
         self.check_revno(2, 'other')
         self.build_tree_contents([
-            ('other/a', 'new contents\nand then some\n')])
+            ('other/a', b'new contents\nand then some\n')])
         other_tree.commit(message='another a')
         self.check_revno(3, 'other')
         self.build_tree_contents([
-            ('other/a', 'new contents\nand then some\nand some more\n')])
+            ('other/a', b'new contents\nand then some\nand some more\n')])
         other_tree.commit('yet another a')
         self.check_revno(4, 'other')
 
-        self.build_tree_contents([('child/a', 'also changed a\n')])
+        self.build_tree_contents([('child/a', b'also changed a\n')])
         child_tree.commit(message='child modified a')
 
         self.check_revno(2, 'child')

=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2018-03-04 17:01:24 +0000
+++ breezy/tests/blackbox/test_branch.py	2018-03-25 11:39:57 +0000
@@ -49,10 +49,10 @@
 
     def example_branch(self, path='.', format=None):
         tree = self.make_branch_and_tree(path, format=format)
-        self.build_tree_contents([(path + '/hello', 'foo')])
+        self.build_tree_contents([(path + '/hello', b'foo')])
         tree.add('hello')
         tree.commit(message='setup')
-        self.build_tree_contents([(path + '/goodbye', 'baz')])
+        self.build_tree_contents([(path + '/goodbye', b'baz')])
         tree.add('goodbye')
         tree.commit(message='setup')
         return tree
@@ -216,16 +216,16 @@
         tree_a = make_shared_tree('a')
         self.build_tree(['repo/a/file'])
         tree_a.add('file')
-        tree_a.commit('commit a-1', rev_id='a-1')
+        tree_a.commit('commit a-1', rev_id=b'a-1')
         f = open('repo/a/file', 'ab')
         f.write('more stuff\n')
         f.close()
-        tree_a.commit('commit a-2', rev_id='a-2')
+        tree_a.commit('commit a-2', rev_id=b'a-2')
 
         tree_b = make_shared_tree('b')
         self.build_tree(['repo/b/file'])
         tree_b.add('file')
-        tree_b.commit('commit b-1', rev_id='b-1')
+        tree_b.commit('commit b-1', rev_id=b'b-1')
 
         self.assertTrue(shared_repo.has_revision('a-1'))
         self.assertTrue(shared_repo.has_revision('a-2'))
@@ -293,8 +293,8 @@
         self.example_branch('a')
         # existing dir with similar files but no .brz dir
         self.build_tree_contents([('b/',)])
-        self.build_tree_contents([('b/hello', 'bar')])  # different content
-        self.build_tree_contents([('b/goodbye', 'baz')])# same content
+        self.build_tree_contents([('b/hello', b'bar')])  # different content
+        self.build_tree_contents([('b/goodbye', b'baz')])# same content
         # fails without --use-existing-dir
         out, err = self.run_bzr('branch a b', retcode=3)
         self.assertEqual('', out)
@@ -595,7 +595,7 @@
     def setUp(self):
         super(TestRemoteBranch, self).setUp()
         tree = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/file', 'file content\n')])
+        self.build_tree_contents([('branch/file', b'file content\n')])
         tree.add('file')
         tree.commit('file created')
 

=== modified file 'breezy/tests/blackbox/test_break_lock.py'
--- breezy/tests/blackbox/test_break_lock.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_break_lock.py	2018-03-25 11:39:57 +0000
@@ -110,7 +110,7 @@
         super(TestConfigBreakLock, self).setUp()
         self.config_file_name = './my.conf'
         self.build_tree_contents([(self.config_file_name,
-                                   '[DEFAULT]\none=1\n')])
+                                   b'[DEFAULT]\none=1\n')])
         self.config = config.LockableConfig(file_name=self.config_file_name)
         self.config.lock_write()
 

=== modified file 'breezy/tests/blackbox/test_bundle_info.py'
--- breezy/tests/blackbox/test_bundle_info.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_bundle_info.py	2018-03-25 11:39:57 +0000
@@ -27,7 +27,7 @@
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/foo'])
         source.add('foo')
-        source.commit('added file', rev_id='rev1')
+        source.commit('added file', rev_id=b'rev1')
         bundle = open('bundle', 'wb')
         try:
             source.branch.repository.create_bundle('rev1', 'null:', bundle,
@@ -45,7 +45,7 @@
         target = self.make_branch('target')
         md = merge_directive.MergeDirective2.from_objects(
             source.branch.repository, 'rev1', 0, 0, 'target',
-            base_revision_id='null:')
+            base_revision_id=b'null:')
         directive = open('directive', 'wb')
         try:
             directive.writelines(md.to_lines())

=== modified file 'breezy/tests/blackbox/test_cat.py'
--- breezy/tests/blackbox/test_cat.py	2018-03-04 15:59:37 +0000
+++ breezy/tests/blackbox/test_cat.py	2018-03-25 11:39:57 +0000
@@ -27,13 +27,13 @@
 
     def test_cat(self):
         tree = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/a', 'foo\n')])
+        self.build_tree_contents([('branch/a', b'foo\n')])
         tree.add('a')
         # 'brz cat' without an option should cat the last revision
         self.run_bzr(['cat', 'a'], retcode=3, working_dir='branch')
 
         tree.commit(message='1')
-        self.build_tree_contents([('branch/a', 'baz\n')])
+        self.build_tree_contents([('branch/a', b'baz\n')])
 
         self.assertEqual('foo\n',
                           self.run_bzr(['cat', 'a'], working_dir='branch')[0])
@@ -77,11 +77,11 @@
         # current trees later in the test case
         # a-rev-tree is special because it appears in both the revision
         # tree and the working tree
-        self.build_tree_contents([('a-rev-tree', 'foo\n'),
-            ('c-rev', 'baz\n'), ('d-rev', 'bar\n'), ('e-rev', 'qux\n')])
+        self.build_tree_contents([('a-rev-tree', b'foo\n'),
+            ('c-rev', b'baz\n'), ('d-rev', b'bar\n'), ('e-rev', b'qux\n')])
         with tree.lock_write():
             tree.add(['a-rev-tree', 'c-rev', 'd-rev', 'e-rev'])
-            tree.commit('add test files', rev_id='first')
+            tree.commit('add test files', rev_id=b'first')
             # remove currently uses self._write_inventory -
             # work around that for now.
             tree.flush()
@@ -89,7 +89,7 @@
             tree.rename_one('a-rev-tree', 'b-tree')
             tree.rename_one('c-rev', 'a-rev-tree')
             tree.rename_one('e-rev', 'old-rev')
-            self.build_tree_contents([('e-rev', 'new\n')])
+            self.build_tree_contents([('e-rev', b'new\n')])
             tree.add(['e-rev'])
 
         # 'b-tree' is not present in the old tree.
@@ -161,7 +161,7 @@
         from ...tree import Tree
         wt = self.make_branch_and_tree('.')
         self.build_tree_contents([
-            ('README', "junk\nline 1 of README\nline 2 of README\n"),
+            ('README', b"junk\nline 1 of README\nline 2 of README\n"),
             ])
         wt.add('README')
         wt.commit('Making sure there is a basis_tree available')
@@ -219,7 +219,7 @@
     def test_simple_branch_cat(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_cat_revision.py'
--- breezy/tests/blackbox/test_cat_revision.py	2017-08-26 13:58:53 +0000
+++ breezy/tests/blackbox/test_cat_revision.py	2018-03-25 11:39:57 +0000
@@ -22,7 +22,7 @@
 
     def test_cat_unicode_revision(self):
         tree = self.make_branch_and_tree('.')
-        tree.commit('This revision', rev_id='abcd')
+        tree.commit('This revision', rev_id=b'abcd')
         output, errors = self.run_bzr(['cat-revision', u'abcd'])
         self.assertContainsRe(output, 'This revision')
         self.assertEqual('', errors)
@@ -33,9 +33,9 @@
         wt = self.make_branch_and_tree('.')
         r = wt.branch.repository
 
-        wt.commit('Commit one', rev_id='a@r-0-1')
-        wt.commit('Commit two', rev_id='a@r-0-2')
-        wt.commit('Commit three', rev_id='a@r-0-3')
+        wt.commit('Commit one', rev_id=b'a@r-0-1')
+        wt.commit('Commit two', rev_id=b'a@r-0-2')
+        wt.commit('Commit three', rev_id=b'a@r-0-3')
 
         with r.lock_read():
             revs = {}
@@ -61,14 +61,14 @@
     def test_cat_revision_directory(self):
         """Test --directory option"""
         tree = self.make_branch_and_tree('a')
-        tree.commit('This revision', rev_id='abcd')
+        tree.commit('This revision', rev_id=b'abcd')
         output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
         self.assertContainsRe(output, 'This revision')
         self.assertEqual('', errors)
 
     def test_cat_tree_less_branch(self):
         tree = self.make_branch_and_tree('.')
-        tree.commit('This revision', rev_id='abcd')
+        tree.commit('This revision', rev_id=b'abcd')
         tree.controldir.destroy_workingtree()
         output, errors = self.run_bzr(['cat-revision', '-d', 'a', u'abcd'])
         self.assertContainsRe(output, 'This revision')

=== modified file 'breezy/tests/blackbox/test_checkout.py'
--- breezy/tests/blackbox/test_checkout.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_checkout.py	2018-03-25 11:39:57 +0000
@@ -41,10 +41,10 @@
     def setUp(self):
         super(TestCheckout, self).setUp()
         tree = controldir.ControlDir.create_standalone_workingtree('branch')
-        tree.commit('1', rev_id='1', allow_pointless=True)
+        tree.commit('1', rev_id=b'1', allow_pointless=True)
         self.build_tree(['branch/added_in_2'])
         tree.add('added_in_2')
-        tree.commit('2', rev_id='2')
+        tree.commit('2', rev_id=b'2')
 
     def test_checkout_makes_bound_branch(self):
         self.run_bzr('checkout branch checkout')
@@ -118,13 +118,13 @@
 
     def _test_checkout_existing_dir(self, lightweight):
         source = self.make_branch_and_tree('source')
-        self.build_tree_contents([('source/file1', 'content1'),
-                                  ('source/file2', 'content2'),])
+        self.build_tree_contents([('source/file1', b'content1'),
+                                  ('source/file2', b'content2'),])
         source.add(['file1', 'file2'])
         source.commit('added files')
-        self.build_tree_contents([('target/', ''),
-                                  ('target/file1', 'content1'),
-                                  ('target/file2', 'content3'),])
+        self.build_tree_contents([('target/', b''),
+                                  ('target/file1', b'content1'),
+                                  ('target/file2', b'content3'),])
         cmd = ['checkout', 'source', 'target']
         if lightweight:
             cmd.append('--lightweight')

=== modified file 'breezy/tests/blackbox/test_commit.py'
--- breezy/tests/blackbox/test_commit.py	2017-12-21 16:44:19 +0000
+++ breezy/tests/blackbox/test_commit.py	2018-03-25 11:39:57 +0000
@@ -92,10 +92,10 @@
         self.run_bzr(['commit', '-m', 'first commit', 'a'])
 
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('b/a_file', 'changes in b')])
+        self.build_tree_contents([('b/a_file', b'changes in b')])
         self.run_bzr(['commit', '-m', 'first commit in b', 'b'])
 
-        self.build_tree_contents([('a/a_file', 'new contents')])
+        self.build_tree_contents([('a/a_file', b'new contents')])
         self.run_bzr(['commit', '-m', 'change in a', 'a'])
 
         b_tree.merge_from_branch(a_tree.branch)
@@ -126,7 +126,7 @@
     def test_verbose_commit_modified(self):
         # Verbose commit of modified file should say so
         wt = self.prepare_simple_history()
-        self.build_tree_contents([('hello.txt', 'new contents')])
+        self.build_tree_contents([('hello.txt', b'new contents')])
         out, err = self.run_bzr('commit -m modified')
         self.assertEqual('', out)
         self.assertContainsRe(err, '^Committing to: .*\n'
@@ -320,8 +320,8 @@
             other_tree.remove(['dirtoremove', 'filetoremove'])
             self.build_tree_contents([
                 ('other/newdir/',),
-                ('other/filetomodify', 'new content'),
-                ('other/newfile', 'new file content')])
+                ('other/filetomodify', b'new content'),
+                ('other/newfile', b'new file content')])
             other_tree.add('newfile')
             other_tree.add('newdir/')
             other_tree.commit('modify all sample files and dirs.')
@@ -347,7 +347,7 @@
 
     def test_empty_commit_message(self):
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('foo.c', 'int main() {}')])
+        self.build_tree_contents([('foo.c', b'int main() {}')])
         tree.add('foo.c')
         self.run_bzr('commit -m ""')
 
@@ -357,8 +357,8 @@
         outer_tree = self.make_branch_and_tree('.')
         inner_tree = self.make_branch_and_tree('branch')
         self.build_tree_contents([
-            ('branch/foo.c', 'int main() {}'),
-            ('branch/bar.c', 'int main() {}')])
+            ('branch/foo.c', b'int main() {}'),
+            ('branch/bar.c', b'int main() {}')])
         inner_tree.add(['foo.c', 'bar.c'])
         # can't commit files in different trees; sane error
         self.run_bzr('commit -m newstuff branch/foo.c .', retcode=3)
@@ -403,16 +403,16 @@
         trunk = self.make_branch_and_tree('trunk')
 
         u1 = trunk.branch.create_checkout('u1')
-        self.build_tree_contents([('u1/hosts', 'initial contents\n')])
+        self.build_tree_contents([('u1/hosts', b'initial contents\n')])
         u1.add('hosts')
         self.run_bzr('commit -m add-hosts u1')
 
         u2 = trunk.branch.create_checkout('u2')
-        self.build_tree_contents([('u2/hosts', 'altered in u2\n')])
+        self.build_tree_contents([('u2/hosts', b'altered in u2\n')])
         self.run_bzr('commit -m checkin-from-u2 u2')
 
         # make an offline commits
-        self.build_tree_contents([('u1/hosts', 'first offline change in u1\n')])
+        self.build_tree_contents([('u1/hosts', b'first offline change in u1\n')])
         self.run_bzr('commit -m checkin-offline --local u1')
 
         # now try to pull in online work from u2, and then commit our offline
@@ -432,7 +432,7 @@
         # add a text change here to represent resolving the merge conflicts in
         # favour of a new version of the file not identical to either the u1
         # version or the u2 version.
-        self.build_tree_contents([('u1/hosts', 'merge resolution\n')])
+        self.build_tree_contents([('u1/hosts', b'merge resolution\n')])
         self.run_bzr('commit -m checkin-merge-of-the-offline-work-from-u1 u1')
 
     def test_commit_exclude_excludes_modified_files(self):
@@ -759,7 +759,7 @@
         # then during partial commit we have error
         # parent_id {dir-XXX} not in inventory
         t.rename_one('dir/a', 'a')
-        self.build_tree_contents([('test', 'changes in test')])
+        self.build_tree_contents([('test', b'changes in test')])
         # partial commit
         out, err = self.run_bzr('commit test -m "partial commit"')
         self.assertEqual('', out)

=== modified file 'breezy/tests/blackbox/test_config.py'
--- breezy/tests/blackbox/test_config.py	2018-03-10 13:52:14 +0000
+++ breezy/tests/blackbox/test_config.py	2018-03-25 11:39:57 +0000
@@ -57,12 +57,12 @@
 
     def test_unexpected_regexp(self):
         self.run_bzr_error(
-            ['The "\*file" configuration option does not exist',],
+            ['The "\\*file" configuration option does not exist',],
             ['config', '*file'])
 
     def test_wrong_regexp(self):
         self.run_bzr_error(
-            ['Invalid pattern\(s\) found. "\*file" nothing to repeat',],
+            ['Invalid pattern\\(s\\) found. "\\*file" nothing to repeat',],
             ['config', '--all', '*file'])
 
 

=== modified file 'breezy/tests/blackbox/test_conflicts.py'
--- breezy/tests/blackbox/test_conflicts.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_conflicts.py	2018-03-25 11:39:57 +0000
@@ -26,8 +26,8 @@
         prefix='my'):
     this_tree = test.make_branch_and_tree(this_path)
     test.build_tree_contents([
-        ('%s/%sfile' % (this_path, prefix), 'this content\n'),
-        ('%s/%s_other_file' % (this_path, prefix), 'this content\n'),
+        ('%s/%sfile' % (this_path, prefix), b'this content\n'),
+        ('%s/%s_other_file' % (this_path, prefix), b'this content\n'),
         ('%s/%sdir/' % (this_path, prefix),),
         ])
     this_tree.add(prefix+'file')
@@ -36,14 +36,14 @@
     this_tree.commit(message="new")
     other_tree = this_tree.controldir.sprout(other_path).open_workingtree()
     test.build_tree_contents([
-        ('%s/%sfile' % (other_path, prefix), 'contentsb\n'),
-        ('%s/%s_other_file' % (other_path, prefix), 'contentsb\n'),
+        ('%s/%sfile' % (other_path, prefix), b'contentsb\n'),
+        ('%s/%s_other_file' % (other_path, prefix), b'contentsb\n'),
         ])
     other_tree.rename_one(prefix+'dir', prefix+'dir2')
     other_tree.commit(message="change")
     test.build_tree_contents([
-        ('%s/%sfile' % (this_path, prefix), 'contentsa2\n'),
-        ('%s/%s_other_file' % (this_path, prefix), 'contentsa2\n'),
+        ('%s/%sfile' % (this_path, prefix), b'contentsa2\n'),
+        ('%s/%s_other_file' % (this_path, prefix), b'contentsa2\n'),
         ])
     this_tree.rename_one(prefix+'dir', prefix+'dir3')
     this_tree.commit(message='change')

=== modified file 'breezy/tests/blackbox/test_diff.py'
--- breezy/tests/blackbox/test_diff.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_diff.py	2018-03-25 11:39:57 +0000
@@ -45,8 +45,8 @@
     def make_example_branch(self):
         tree = self.make_branch_and_tree('.')
         self.build_tree_contents([
-            ('hello', 'foo\n'),
-            ('goodbye', 'baz\n')])
+            ('hello', b'foo\n'),
+            ('goodbye', b'baz\n')])
         tree.add(['hello'])
         tree.commit('setup')
         tree.add(['goodbye'])
@@ -58,7 +58,7 @@
 
     def test_diff(self):
         tree = self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!')])
+        self.build_tree_contents([('hello', b'hello world!')])
         tree.commit(message='fixing hello')
         output = self.run_bzr('diff -r 2..3', retcode=1)[0]
         self.assertTrue('\n+hello world!' in output)
@@ -76,7 +76,7 @@
     def test_diff_prefix(self):
         """diff --prefix appends to filenames in output"""
         self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         out, err = self.run_bzr('diff --prefix old/:new/', retcode=1)
         self.assertEqual(err, '')
         self.assertEqualDiff(subst_dates(out), '''\
@@ -98,7 +98,7 @@
     def test_diff_p1(self):
         """diff -p1 produces lkml-style diffs"""
         self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         out, err = self.run_bzr('diff -p1', retcode=1)
         self.assertEqual(err, '')
         self.assertEqualDiff(subst_dates(out), '''\
@@ -114,7 +114,7 @@
     def test_diff_p0(self):
         """diff -p0 produces diffs with no prefix"""
         self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         out, err = self.run_bzr('diff -p0', retcode=1)
         self.assertEqual(err, '')
         self.assertEqualDiff(subst_dates(out), '''\
@@ -175,7 +175,7 @@
         branch1_tree.add('file2')
         branch1_tree.commit(message='add file and file2')
         branch2_tree = branch1_tree.controldir.sprout('branch2').open_workingtree()
-        self.build_tree_contents([('branch2/file', 'new content\n')])
+        self.build_tree_contents([('branch2/file', b'new content\n')])
         branch2_tree.commit(message='update file')
         return branch1_tree, branch2_tree
 
@@ -250,7 +250,7 @@
     def test_diff_revno_branches(self):
         self.example_branches()
         branch2_tree = workingtree.WorkingTree.open_containing('branch2')[0]
-        self.build_tree_contents([('branch2/file', 'even newer content')])
+        self.build_tree_contents([('branch2/file', b'even newer content')])
         branch2_tree.commit(message='update file once more')
 
         out, err = self.run_bzr('diff -r revno:1:branch2..revno:1:branch1',
@@ -270,22 +270,22 @@
 
     def example_branch2(self):
         branch1_tree = self.make_branch_and_tree('branch1')
-        self.build_tree_contents([('branch1/file1', 'original line\n')])
+        self.build_tree_contents([('branch1/file1', b'original line\n')])
         branch1_tree.add('file1')
         branch1_tree.commit(message='first commit')
-        self.build_tree_contents([('branch1/file1', 'repo line\n')])
+        self.build_tree_contents([('branch1/file1', b'repo line\n')])
         branch1_tree.commit(message='second commit')
         return branch1_tree
 
     def test_diff_to_working_tree(self):
         self.example_branch2()
-        self.build_tree_contents([('branch1/file1', 'new line')])
+        self.build_tree_contents([('branch1/file1', b'new line')])
         output = self.run_bzr('diff -r 1.. branch1', retcode=1)
         self.assertContainsRe(output[0], '\n\\-original line\n\\+new line\n')
 
     def test_diff_to_working_tree_in_subdir(self):
         self.example_branch2()
-        self.build_tree_contents([('branch1/file1', 'new line')])
+        self.build_tree_contents([('branch1/file1', b'new line')])
         os.mkdir('branch1/dir1')
         output = self.run_bzr('diff -r 1..', retcode=1,
                               working_dir='branch1/dir1')
@@ -318,7 +318,7 @@
         diff_format_registry.register("boo", BooDiffTree, "Scary diff format")
         self.addCleanup(diff_format_registry.remove, "boo")
         self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         output = self.run_bzr('diff --format=boo', retcode=1)
         self.assertTrue("BOO!" in output[0])
         output = self.run_bzr('diff -Fboo', retcode=1)
@@ -360,14 +360,14 @@
 
     def test_diff_label_added(self):
         tree = super(TestDiffLabels, self).make_example_branch()
-        self.build_tree_contents([('barbar', 'barbar')])
+        self.build_tree_contents([('barbar', b'barbar')])
         tree.add('barbar')
         diff = self.run_bzr('diff', retcode=1)
         self.assertTrue("=== added file 'barbar'" in diff[0])
 
     def test_diff_label_modified(self):
         super(TestDiffLabels, self).make_example_branch()
-        self.build_tree_contents([('hello', 'barbar')])
+        self.build_tree_contents([('hello', b'barbar')])
         diff = self.run_bzr('diff', retcode=1)
         self.assertTrue("=== modified file 'hello'" in diff[0])
 
@@ -409,7 +409,7 @@
         """Test that the options are passed correctly to an external diff process"""
         self.requireFeature(features.diff_feature)
         self.make_example_branch()
-        self.build_tree_contents([('hello', 'Foo\n')])
+        self.build_tree_contents([('hello', b'Foo\n')])
         out, err = self.run_bzr('diff --diff-options -i --using diff',
                                     retcode=1)
         self.assertEqual("=== modified file 'hello'\n", out)
@@ -421,6 +421,6 @@
     def test_diff_output(self):
         # check that output doesn't mangle line-endings
         self.make_example_branch()
-        self.build_tree_contents([('hello', 'hello world!\n')])
+        self.build_tree_contents([('hello', b'hello world!\n')])
         output = self.run_bzr_subprocess('diff', retcode=1)[0]
         self.assertTrue('\n+hello world!\n' in output)

=== modified file 'breezy/tests/blackbox/test_dpush.py'
--- breezy/tests/blackbox/test_dpush.py	2017-11-16 00:39:04 +0000
+++ breezy/tests/blackbox/test_dpush.py	2018-03-25 11:39:57 +0000
@@ -47,7 +47,7 @@
         builder.build_snapshot(None,
             [('add', ('', 'TREE_ROOT', 'directory', None)),
              ('add', ('foo', 'fooid', 'file', 'bar'))],
-            revision_id='revid')
+            revision_id=b'revid')
         return builder
 
     def test_dpush_native(self):
@@ -78,7 +78,7 @@
         b = self.make_dummy_builder('d').get_branch()
 
         dc = b.controldir.sprout('dc', force_new_repo=True)
-        self.build_tree_contents([("dc/foofile", "blaaaa")])
+        self.build_tree_contents([("dc/foofile", b"blaaaa")])
         dc_tree = dc.open_workingtree()
         dc_tree.add("foofile")
         dc_tree.commit("msg")
@@ -97,12 +97,12 @@
         b = self.make_dummy_builder('d').get_branch()
 
         dc = b.controldir.sprout('dc', force_new_repo=True)
-        self.build_tree_contents([("dc/foofile", "blaaaa")])
+        self.build_tree_contents([("dc/foofile", b"blaaaa")])
         dc_tree = dc.open_workingtree()
         dc_tree.add("foofile")
         newrevid = dc_tree.commit('msg')
 
-        self.build_tree_contents([("dc/foofile", "blaaaal")])
+        self.build_tree_contents([("dc/foofile", b"blaaaal")])
         script.run_script(self, '''
             $ brz dpush -d dc d --no-strict
             2>Doing on-the-fly conversion from DummyForeignVcsRepositoryFormat() to RepositoryFormat2a().
@@ -126,11 +126,11 @@
         dc = b.controldir.sprout('dc', force_new_repo=True)
         dc_tree = dc.open_workingtree()
 
-        self.build_tree_contents([("dc/foo", "bar")])
+        self.build_tree_contents([("dc/foo", b"bar")])
         dc_tree.commit('msg1')
 
         builder.build_snapshot(None,
-          [('modify', ('fooid', 'blie'))], revision_id='revid2')
+          [('modify', (b'fooid', 'blie'))], revision_id=b'revid2')
 
         output, error = self.run_bzr("dpush -d dc d", retcode=3)
         self.assertEqual(output, "")

=== modified file 'breezy/tests/blackbox/test_export.py'
--- breezy/tests/blackbox/test_export.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_export.py	2018-03-25 11:39:57 +0000
@@ -78,7 +78,7 @@
 
     def make_tree_with_extra_bzr_files(self):
         tree = self.make_basic_tree()
-        self.build_tree_contents([('tree/.bzrrules', '')])
+        self.build_tree_contents([('tree/.bzrrules', b'')])
         self.build_tree(['tree/.bzr-adir/', 'tree/.bzr-adir/afile'])
         tree.add(['.bzrrules', '.bzr-adir/', '.bzr-adir/afile'])
 
@@ -244,7 +244,7 @@
         tree = self.make_branch_and_tree('dir')
         self.build_tree(['dir/a'])
         tree.add('a')
-        self.build_tree_contents([('dir/.bzrrules', '')])
+        self.build_tree_contents([('dir/.bzrrules', b'')])
         tree.add('.bzrrules')
         self.build_tree(['dir/.bzr-adir/', 'dir/.bzr-adir/afile'])
         tree.add(['.bzr-adir/', '.bzr-adir/afile'])
@@ -267,11 +267,11 @@
     def example_branch(self):
         """Create a branch a 'branch' containing hello and goodbye."""
         tree = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/hello', 'foo')])
+        self.build_tree_contents([('branch/hello', b'foo')])
         tree.add('hello')
         tree.commit('setup')
 
-        self.build_tree_contents([('branch/goodbye', 'baz')])
+        self.build_tree_contents([('branch/goodbye', b'baz')])
         tree.add('goodbye')
         tree.commit('setup')
         return tree
@@ -380,7 +380,7 @@
 
     def test_dir_export_per_file_timestamps(self):
         tree = self.example_branch()
-        self.build_tree_contents([('branch/har', 'foo')])
+        self.build_tree_contents([('branch/har', b'foo')])
         tree.add('har')
         # Earliest allowable date on FAT32 filesystems is 1980-01-01
         tree.commit('setup', timestamp=315532800)
@@ -409,7 +409,7 @@
         """Test --uncommitted option"""
         self.example_branch()
         os.chdir('branch')
-        self.build_tree_contents([('goodbye', 'uncommitted data')])
+        self.build_tree_contents([('goodbye', b'uncommitted data')])
         self.run_bzr(['export', '--uncommitted', 'latest'])
         self.check_file_contents('latest/goodbye', 'uncommitted data')
 
@@ -424,7 +424,7 @@
 
     def test_zip_export_per_file_timestamps(self):
         tree = self.example_branch()
-        self.build_tree_contents([('branch/har', 'foo')])
+        self.build_tree_contents([('branch/har', b'foo')])
         tree.add('har')
         # Earliest allowable date on FAT32 filesystems is 1980-01-01
         timestamp = 347151600
@@ -440,7 +440,7 @@
     def test_simple_export(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_filesystem_cicp.py'
--- breezy/tests/blackbox/test_filesystem_cicp.py	2017-05-22 00:56:52 +0000
+++ breezy/tests/blackbox/test_filesystem_cicp.py	2018-03-25 11:39:57 +0000
@@ -43,9 +43,9 @@
         wt = self.make_branch_and_tree('.')
         # create a file on disk with the mixed-case parent and base name
         self.build_tree(['CamelCaseParent/', 'lowercaseparent/'])
-        self.build_tree_contents([('CamelCaseParent/CamelCase', 'camel case'),
-                                  ('lowercaseparent/lowercase', 'lower case'),
-                                  ('lowercaseparent/mixedCase', 'mixedCasecase'),
+        self.build_tree_contents([('CamelCaseParent/CamelCase', b'camel case'),
+                                  ('lowercaseparent/lowercase', b'lower case'),
+                                  ('lowercaseparent/mixedCase', b'mixedCasecase'),
                                  ])
         return wt
 

=== modified file 'breezy/tests/blackbox/test_filtered_view_ops.py'
--- breezy/tests/blackbox/test_filtered_view_ops.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_filtered_view_ops.py	2018-03-25 11:39:57 +0000
@@ -160,8 +160,8 @@
         wt2.views.set_view('my', ['a', 'b'])
         # Commit a change to the first tree
         self.build_tree_contents([
-            ('tree_1/a', 'changed a\n'),
-            ('tree_1/c', 'changed c\n'),
+            ('tree_1/a', b'changed a\n'),
+            ('tree_1/c', b'changed c\n'),
             ])
         wt1.commit("changing a c")
         return wt1, wt2

=== modified file 'breezy/tests/blackbox/test_ignore.py'
--- breezy/tests/blackbox/test_ignore.py	2017-11-12 18:17:03 +0000
+++ breezy/tests/blackbox/test_ignore.py	2018-03-25 11:39:57 +0000
@@ -68,24 +68,24 @@
         ignores._set_user_ignores(['*.tmp'])
 
         self.build_tree_contents(
-            [('foo.tmp', '.tmp files are ignored by default')])
+            [('foo.tmp', b'.tmp files are ignored by default')])
         self.assertEqual(list(tree.unknowns()), [])
 
-        self.build_tree_contents([('foo.c', 'int main() {}')])
+        self.build_tree_contents([('foo.c', b'int main() {}')])
         self.assertEqual(list(tree.unknowns()), ['foo.c'])
 
         tree.add('foo.c')
         self.assertEqual(list(tree.unknowns()), [])
 
         # 'ignore' works when creating the .bzrignore file
-        self.build_tree_contents([('foo.blah', 'blah')])
+        self.build_tree_contents([('foo.blah', b'blah')])
         self.assertEqual(list(tree.unknowns()), ['foo.blah'])
         self.run_bzr('ignore *.blah')
         self.assertEqual(list(tree.unknowns()), [])
         self.check_file_contents('.bzrignore', '*.blah\n')
 
         # 'ignore' works when then .bzrignore file already exists
-        self.build_tree_contents([('garh', 'garh')])
+        self.build_tree_contents([('garh', b'garh')])
         self.assertEqual(list(tree.unknowns()), ['garh'])
         self.run_bzr('ignore garh')
         self.assertEqual(list(tree.unknowns()), [])

=== modified file 'breezy/tests/blackbox/test_ignored.py'
--- breezy/tests/blackbox/test_ignored.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_ignored.py	2018-03-25 11:39:57 +0000
@@ -31,7 +31,7 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['foo.pyc'])
         # ensure that foo.pyc is ignored
-        self.build_tree_contents([('.bzrignore', 'foo.pyc')])
+        self.build_tree_contents([('.bzrignore', b'foo.pyc')])
         self.assertTrue(tree.is_ignored('foo.pyc'))
         # now add it and check the ui does not show it.
         tree.add('foo.pyc')
@@ -42,7 +42,7 @@
     def test_ignored_directory(self):
         """Test --directory option"""
         tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/README', 'contents'),
-                                  ('a/.bzrignore', 'README')])
+        self.build_tree_contents([('a/README', b'contents'),
+                                  ('a/.bzrignore', b'README')])
         out, err = self.run_bzr(['ignored', '--directory=a'])
         self.assertStartsWith(out, 'README')

=== modified file 'breezy/tests/blackbox/test_info.py'
--- breezy/tests/blackbox/test_info.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_info.py	2018-03-25 11:39:57 +0000
@@ -1553,7 +1553,7 @@
     def test_simple_branch_info(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()
@@ -1570,7 +1570,7 @@
     def test_verbose_branch_info(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_init.py'
--- breezy/tests/blackbox/test_init.py	2018-03-04 17:01:24 +0000
+++ breezy/tests/blackbox/test_init.py	2018-03-25 11:39:57 +0000
@@ -153,8 +153,8 @@
     def create_simple_tree(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a'])
-        tree.add(['a'], ['a-id'])
-        tree.commit('one', rev_id='r1')
+        tree.add(['a'], [b'a-id'])
+        tree.commit('one', rev_id=b'r1')
         return tree
 
     def test_init_create_prefix(self):

=== modified file 'breezy/tests/blackbox/test_inventory.py'
--- breezy/tests/blackbox/test_inventory.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_inventory.py	2018-03-25 11:39:57 +0000
@@ -29,8 +29,8 @@
         tree = self.make_branch_and_tree('.')
         self.build_tree(['a', 'b/', 'b/c'])
 
-        tree.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
-        tree.commit('init', rev_id='one')
+        tree.add(['a', 'b', 'b/c'], [b'a-id', b'b-id', b'c-id'])
+        tree.commit('init', rev_id=b'one')
         self.tree = tree
 
     def assertInventoryEqual(self, expected, args=None, **kwargs):
@@ -91,7 +91,7 @@
 
     def test_inventory_revision(self):
         self.build_tree(['b/d', 'e'])
-        self.tree.add(['b/d', 'e'], ['d-id', 'e-id'])
+        self.tree.add(['b/d', 'e'], [b'd-id', b'e-id'])
         self.tree.commit('add files')
 
         self.tree.rename_one('b/d', 'd')

=== modified file 'breezy/tests/blackbox/test_join.py'
--- breezy/tests/blackbox/test_join.py	2017-10-07 22:42:22 +0000
+++ breezy/tests/blackbox/test_join.py	2018-03-25 11:39:57 +0000
@@ -32,7 +32,7 @@
         base_tree.commit('empty commit')
         self.build_tree(['tree/subtree/', 'tree/subtree/file1'])
         sub_tree = self.make_branch_and_tree('tree/subtree')
-        sub_tree.add('file1', 'file1-id')
+        sub_tree.add('file1', b'file1-id')
         sub_tree.commit('added file1')
         return base_tree, sub_tree
 

=== modified file 'breezy/tests/blackbox/test_link_tree.py'
--- breezy/tests/blackbox/test_link_tree.py	2017-08-27 02:13:50 +0000
+++ breezy/tests/blackbox/test_link_tree.py	2018-03-25 11:39:57 +0000
@@ -37,8 +37,8 @@
         self.parent_tree = self.make_branch_and_tree('parent')
         self.parent_tree.lock_write()
         self.addCleanup(self.parent_tree.unlock)
-        self.build_tree_contents([('parent/foo', 'bar')])
-        self.parent_tree.add('foo', 'foo-id')
+        self.build_tree_contents([('parent/foo', b'bar')])
+        self.parent_tree.add('foo', b'foo-id')
         self.parent_tree.commit('added foo')
         child_controldir = self.parent_tree.controldir.sprout('child')
         self.child_tree = child_controldir.open_workingtree()

=== modified file 'breezy/tests/blackbox/test_locale.py'
--- breezy/tests/blackbox/test_locale.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_locale.py	2018-03-25 11:39:57 +0000
@@ -35,7 +35,7 @@
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a'])
         tree.add('a')
-        tree.commit(u'Unicode \xb5 commit', rev_id='r1',
+        tree.commit(u'Unicode \xb5 commit', rev_id=b'r1',
                     committer=u'\u062c\u0648\u062c\u0648'
                               u' Meinel <[e-mail]>',
                     timestamp=1156451297.96, timezone=0)

=== modified file 'breezy/tests/blackbox/test_log.py'
--- breezy/tests/blackbox/test_log.py	2017-11-16 00:39:04 +0000
+++ breezy/tests/blackbox/test_log.py	2018-03-25 11:39:57 +0000
@@ -215,23 +215,23 @@
         # mainline
         builder.build_snapshot(None, [
             ('add', ('', 'root-id', 'directory', ''))],
-            revision_id='1')
-        builder.build_snapshot(['1'], [], revision_id='2')
+            revision_id=b'1')
+        builder.build_snapshot([b'1'], [], revision_id=b'2')
         # branch
-        builder.build_snapshot(['1'], [], revision_id='1.1.1')
+        builder.build_snapshot([b'1'], [], revision_id=b'1.1.1')
         # merge branch into mainline
-        builder.build_snapshot(['2', '1.1.1'], [], revision_id='3')
+        builder.build_snapshot([b'2', '1.1.1'], [], revision_id=b'3')
         # new commits in branch
-        builder.build_snapshot(['1.1.1'], [], revision_id='1.1.2')
-        builder.build_snapshot(['1.1.2'], [], revision_id='1.1.3')
+        builder.build_snapshot([b'1.1.1'], [], revision_id=b'1.1.2')
+        builder.build_snapshot([b'1.1.2'], [], revision_id=b'1.1.3')
         # merge branch into mainline
-        builder.build_snapshot(['3', '1.1.3'], [], revision_id='4')
+        builder.build_snapshot([b'3', b'1.1.3'], [], revision_id=b'4')
         # merge mainline into branch
-        builder.build_snapshot(['1.1.3', '4'], [], revision_id='1.1.4')
+        builder.build_snapshot([b'1.1.3', b'4'], [], revision_id=b'1.1.4')
         # merge branch into mainline
-        builder.build_snapshot(['4', '1.1.4'], [], revision_id='5')
-        builder.build_snapshot(['5'], [], revision_id='5.1.1')
-        builder.build_snapshot(['5', '5.1.1'], [], revision_id='6')
+        builder.build_snapshot([b'4', b'1.1.4'], [], revision_id=b'5')
+        builder.build_snapshot([b'5'], [], revision_id=b'5.1.1')
+        builder.build_snapshot([b'5', b'5.1.1'], [], revision_id=b'6')
         builder.finish_series()
 
     def test_n0(self):
@@ -287,16 +287,16 @@
         # |       /
         # 5 -----/
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', ''))], revision_id='1')
-        builder.build_snapshot(['1'], [], revision_id='2')
-        builder.build_snapshot(['1'], [], revision_id='1.1.1')
-        builder.build_snapshot(['2'], [], revision_id='2.1.1')
-        builder.build_snapshot(['2', '1.1.1'], [], revision_id='3')
-        builder.build_snapshot(['2.1.1'], [], revision_id='2.1.2')
-        builder.build_snapshot(['2.1.1'], [], revision_id='2.2.1')
-        builder.build_snapshot(['2.1.2', '2.2.1'], [], revision_id='2.1.3')
-        builder.build_snapshot(['3', '2.1.3'], [], revision_id='4')
-        builder.build_snapshot(['4', '2.1.2'], [], revision_id='5')
+            ('add', ('', b'root-id', 'directory', ''))], revision_id=b'1')
+        builder.build_snapshot(['1'], [], revision_id=b'2')
+        builder.build_snapshot(['1'], [], revision_id=b'1.1.1')
+        builder.build_snapshot(['2'], [], revision_id=b'2.1.1')
+        builder.build_snapshot(['2', '1.1.1'], [], revision_id=b'3')
+        builder.build_snapshot(['2.1.1'], [], revision_id=b'2.1.2')
+        builder.build_snapshot(['2.1.1'], [], revision_id=b'2.2.1')
+        builder.build_snapshot(['2.1.2', '2.2.1'], [], revision_id=b'2.1.3')
+        builder.build_snapshot(['3', '2.1.3'], [], revision_id=b'4')
+        builder.build_snapshot(['4', '2.1.2'], [], revision_id=b'5')
         builder.finish_series()
         return builder
 
@@ -625,7 +625,7 @@
         self.wt_commit(level0, 'in branch level0')
 
         level1 = level0.controldir.sprout('level1').open_workingtree()
-        self.build_tree_contents([('level1/file2', 'hello\n')])
+        self.build_tree_contents([('level1/file2', b'hello\n')])
         self.wt_commit(level1, 'in branch level1')
         level0.merge_from_branch(level1.branch)
         self.wt_commit(level0, 'merge branch level1')
@@ -713,7 +713,7 @@
     def test_log_show_diff_non_ascii(self):
         # Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
         message = u'Message with \xb5'
-        body = 'Body with \xb5\n'
+        body = b'Body with \xb5\n'
         wt = self.make_branch_and_tree('.')
         self.build_tree_contents([('foo', body)])
         wt.add('foo')
@@ -759,7 +759,7 @@
     def create_branch(self):
         brz = self.run_bzr
         brz('init')
-        self.build_tree_contents([('a', 'some stuff\n')])
+        self.build_tree_contents([('a', b'some stuff\n')])
         brz('add a')
         brz(['commit', '-m', self._message])
 
@@ -850,7 +850,7 @@
         tree.add('file3')
         tree.commit('add file3')
         child_tree = tree.controldir.sprout('child').open_workingtree()
-        self.build_tree_contents([('child/file2', 'hello')])
+        self.build_tree_contents([('child/file2', b'hello')])
         child_tree.commit(message='branch 1')
         tree.merge_from_branch(child_tree.branch)
         tree.commit(message='merge child branch')
@@ -943,7 +943,7 @@
         tree.add('dir1/file5')
         tree.commit('add file5')
         child_tree = tree.controldir.sprout('child').open_workingtree()
-        self.build_tree_contents([('child/file2', 'hello')])
+        self.build_tree_contents([('child/file2', b'hello')])
         child_tree.commit(message='branch 1')
         tree.merge_from_branch(child_tree.branch)
         tree.commit(message='merge child branch')
@@ -990,8 +990,8 @@
         tree = self.make_branch_and_tree('')
         tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
         tree.add('')
-        tree.commit('msg1', rev_id='rev1')
-        tree.commit('msg2', rev_id='rev2')
+        tree.commit('msg1', rev_id=b'rev1')
+        tree.commit('msg2', rev_id=b'rev2')
 
     def test_log_range(self):
         self.assertLogRevnos(["-r1..2"], ["2", "1"])
@@ -1072,7 +1072,7 @@
     def test_standard_log(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()
@@ -1089,7 +1089,7 @@
     def test_verbose_log(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()
@@ -1106,7 +1106,7 @@
     def test_per_file(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_lookup_revision.py'
--- breezy/tests/blackbox/test_lookup_revision.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_lookup_revision.py	2018-03-25 11:39:57 +0000
@@ -25,7 +25,7 @@
     def test_lookup_revison_directory(self):
         """Test --directory option"""
         tree = self.make_branch_and_tree('a')
-        tree.commit('This revision', rev_id='abcd')
+        tree.commit('This revision', rev_id=b'abcd')
         out, err = self.run_bzr(['lookup-revision', '-d', 'a', '1'])
         self.assertEqual('abcd\n', out)
         self.assertEqual('', err)

=== modified file 'breezy/tests/blackbox/test_ls.py'
--- breezy/tests/blackbox/test_ls.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_ls.py	2018-03-25 11:39:57 +0000
@@ -33,8 +33,8 @@
 
         self.wt = self.make_branch_and_tree('.')
         self.build_tree_contents([
-                                 ('.bzrignore', '*.pyo\n'),
-                                 ('a', 'hello\n'),
+                                 ('.bzrignore', b'*.pyo\n'),
+                                 ('a', b'hello\n'),
                                  ])
 
     def ls_equals(self, value, args=None, recursive=True, working_dir=None):
@@ -97,7 +97,7 @@
 
     def test_show_ids(self):
         self.build_tree(['subdir/'])
-        self.wt.add(['a', 'subdir'], ['a-id', 'subdir-id'])
+        self.wt.add(['a', 'subdir'], [b'a-id', b'subdir-id'])
         self.ls_equals(
             '.bzrignore                                         \n'
             'a                                                  a-id\n'
@@ -247,7 +247,7 @@
     def test_simple_ls(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_merge.py'
--- breezy/tests/blackbox/test_merge.py	2018-03-12 04:40:40 +0000
+++ breezy/tests/blackbox/test_merge.py	2018-03-25 11:39:57 +0000
@@ -48,8 +48,8 @@
     def example_branch(self, path='.'):
         tree = self.make_branch_and_tree(path)
         self.build_tree_contents([
-            (osutils.pathjoin(path, 'hello'), 'foo'),
-            (osutils.pathjoin(path, 'goodbye'), 'baz')])
+            (osutils.pathjoin(path, 'hello'), b'foo'),
+            (osutils.pathjoin(path, 'goodbye'), b'baz')])
         tree.add('hello')
         tree.commit(message='setup')
         tree.add('goodbye')
@@ -66,13 +66,13 @@
         builder.build_snapshot(None,
             [('add', ('', 'root-id', 'directory', None)),
              ('add', ('fname', 'f-id', 'file', 'a\nb\nc\n'))],
-            revision_id='rev1')
+            revision_id=b'rev1')
         builder.build_snapshot(['rev1'],
             [('modify', ('f-id', 'a\nB\nD\n'))],
-            revision_id='rev2other')
+            revision_id=b'rev2other')
         other = builder.get_branch().controldir.sprout('other').open_branch()
         builder.build_snapshot(['rev1'],
-            [('modify', ('f-id', 'a\nB\nC\n'))], revision_id='rev2this')
+            [('modify', ('f-id', 'a\nB\nC\n'))], revision_id=b'rev2this')
         tree = builder.get_branch().create_checkout('tree', lightweight=True)
         return tree, other
 
@@ -85,10 +85,10 @@
         a_tree = self.example_branch('a')
         ancestor = a_tree.branch.revno()
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('b/goodbye', 'quux')])
+        self.build_tree_contents([('b/goodbye', b'quux')])
         b_tree.commit(message="more u's are always good")
 
-        self.build_tree_contents([('a/hello', 'quuux')])
+        self.build_tree_contents([('a/hello', b'quuux')])
         # We can't merge when there are in-tree changes
         self.run_bzr('merge ../b', retcode=3, working_dir='a')
         a = workingtree.WorkingTree.open('a')
@@ -195,17 +195,17 @@
         self.build_tree_contents([
             ('a/',),
             ('a/sub/',),
-            ('a/sub/a.txt', 'hello\n'),
-            ('a/b.txt', 'hello\n'),
-            ('a/sub/c.txt', 'hello\n')])
+            ('a/sub/a.txt', b'hello\n'),
+            ('a/b.txt', b'hello\n'),
+            ('a/sub/c.txt', b'hello\n')])
         a_tree = self.make_branch_and_tree('a')
         a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
         a_tree.commit(message='added a')
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
         self.build_tree_contents([
-            ('a/sub/a.txt', 'hello\nthere\n'),
-            ('a/b.txt', 'hello\nthere\n'),
-            ('a/sub/c.txt', 'hello\nthere\n')])
+            ('a/sub/a.txt', b'hello\nthere\n'),
+            ('a/b.txt', b'hello\nthere\n'),
+            ('a/sub/c.txt', b'hello\nthere\n')])
         a_tree.commit(message='Added there')
         os.remove('a/sub/a.txt')
         os.remove('a/sub/c.txt')
@@ -213,9 +213,9 @@
         os.remove('a/b.txt')
         a_tree.commit(message='Removed a.txt')
         self.build_tree_contents([
-            ('b/sub/a.txt', 'hello\nsomething\n'),
-            ('b/b.txt', 'hello\nsomething\n'),
-            ('b/sub/c.txt', 'hello\nsomething\n')])
+            ('b/sub/a.txt', b'hello\nsomething\n'),
+            ('b/b.txt', b'hello\nsomething\n'),
+            ('b/sub/c.txt', b'hello\nsomething\n')])
         b_tree.commit(message='Modified a.txt')
 
         self.run_bzr('merge ../a/', retcode=1, working_dir='b')
@@ -310,15 +310,15 @@
     def test_merge_bundle(self):
         from breezy.testament import Testament
         tree_a = self.make_branch_and_tree('branch_a')
-        self.build_tree_contents([('branch_a/a', 'hello')])
+        self.build_tree_contents([('branch_a/a', b'hello')])
         tree_a.add('a')
         tree_a.commit('message')
 
         tree_b = tree_a.controldir.sprout('branch_b').open_workingtree()
-        self.build_tree_contents([('branch_a/a', 'hey there')])
+        self.build_tree_contents([('branch_a/a', b'hey there')])
         tree_a.commit('message')
 
-        self.build_tree_contents([('branch_b/a', 'goodbye')])
+        self.build_tree_contents([('branch_b/a', b'goodbye')])
         tree_b.commit('message')
         self.run_bzr('bundle ../branch_a -o ../bundle', working_dir='branch_b')
         self.run_bzr('merge ../bundle', retcode=1, working_dir='branch_a')
@@ -370,7 +370,7 @@
         """It should not be possible to merge changes from a file which
         does not exist."""
         tree_a = self.make_branch_and_tree('tree_a')
-        self.build_tree_contents([('tree_a/file', 'bar\n')])
+        self.build_tree_contents([('tree_a/file', b'bar\n')])
         tree_a.add(['file'])
         tree_a.commit('commit 1')
         self.run_bzr_error(('Path\(s\) do not exist: non/existing',),
@@ -378,13 +378,13 @@
 
     def pullable_branch(self):
         tree_a = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/file', 'bar\n')])
+        self.build_tree_contents([('a/file', b'bar\n')])
         tree_a.add(['file'])
         self.id1 = tree_a.commit('commit 1')
 
         tree_b = self.make_branch_and_tree('b')
         tree_b.pull(tree_a.branch)
-        self.build_tree_contents([('b/file', 'foo\n')])
+        self.build_tree_contents([('b/file', b'foo\n')])
         self.id2 = tree_b.commit('commit 2')
 
     def test_merge_pull(self):
@@ -411,8 +411,8 @@
 
     def test_merge_kind_change(self):
         tree_a = self.make_branch_and_tree('tree_a')
-        self.build_tree_contents([('tree_a/file', 'content_1')])
-        tree_a.add('file', 'file-id')
+        self.build_tree_contents([('tree_a/file', b'content_1')])
+        tree_a.add('file', b'file-id')
         tree_a.commit('added file')
         tree_b = tree_a.controldir.sprout('tree_b').open_workingtree()
         os.unlink('tree_a/file')
@@ -422,7 +422,7 @@
         self.assertEqual('directory', osutils.file_kind('tree_b/file'))
         tree_b.revert()
         self.assertEqual('file', osutils.file_kind('tree_b/file'))
-        self.build_tree_contents([('tree_b/file', 'content_2')])
+        self.build_tree_contents([('tree_b/file', b'content_2')])
         tree_b.commit('content change')
         self.run_bzr('merge ../tree_a', retcode=1, working_dir='tree_b')
         self.assertEqual(tree_b.conflicts(),
@@ -439,10 +439,10 @@
         target = source.controldir.sprout('target').open_workingtree()
         self.build_tree(['source/a'])
         source.add('a')
-        source.commit('Added a', rev_id='rev1')
+        source.commit('Added a', rev_id=b'rev1')
         self.build_tree(['source/b'])
         source.add('b')
-        source.commit('Added b', rev_id='rev2')
+        source.commit('Added b', rev_id=b'rev2')
         target.commit('empty commit')
         self.write_directive('directive', source.branch, 'target', 'rev2',
                              'rev1')
@@ -458,13 +458,13 @@
             base_revision_id=base_revision_id)
         if mangle_patch:
             md.patch = 'asdf\n'
-        self.build_tree_contents([(filename, ''.join(md.to_lines()))])
+        self.build_tree_contents([(filename, b''.join(md.to_lines()))])
 
     def test_directive_verify_warning(self):
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/a'])
         source.add('a')
-        source.commit('Added a', rev_id='rev1')
+        source.commit('Added a', rev_id=b'rev1')
         target = self.make_branch_and_tree('target')
         target.commit('empty commit')
         self.write_directive('directive', source.branch, 'target', 'rev1')
@@ -483,14 +483,14 @@
         branch_a = target.controldir.sprout('branch_a').open_workingtree()
         self.build_tree(['branch_a/file1'])
         branch_a.add('file1')
-        branch_a.commit('added file1', rev_id='rev2a')
+        branch_a.commit('added file1', rev_id=b'rev2a')
         branch_b = target.controldir.sprout('branch_b').open_workingtree()
         self.build_tree(['branch_b/file2'])
         branch_b.add('file2')
-        branch_b.commit('added file2', rev_id='rev2b')
+        branch_b.commit('added file2', rev_id=b'rev2b')
         branch_b.merge_from_branch(branch_a.branch)
         self.assertPathExists('branch_b/file1')
-        branch_b.commit('merged branch_a', rev_id='rev3b')
+        branch_b.commit('merged branch_a', rev_id=b'rev3b')
 
         # It works if the revid has an interger revno
         self.run_bzr('merge -d target -r revid:rev2a branch_a')
@@ -523,7 +523,7 @@
         for f in ('a', 'b', 'c', 'd'):
             self.build_tree(['source/'+f])
             source.add(f)
-            source.commit('added '+f, rev_id='rev_'+f)
+            source.commit('added '+f, rev_id=b'rev_'+f)
         # target branch
         target = source.controldir.sprout('target', 'rev_a').open_workingtree()
         self.assertDirectoryContent('target', ['.bzr', 'a'])
@@ -541,14 +541,14 @@
 
     def test_merge_criss_cross(self):
         tree_a = self.make_branch_and_tree('a')
-        tree_a.commit('', rev_id='rev1')
+        tree_a.commit('', rev_id=b'rev1')
         tree_b = tree_a.controldir.sprout('b').open_workingtree()
-        tree_a.commit('', rev_id='rev2a')
-        tree_b.commit('', rev_id='rev2b')
+        tree_a.commit('', rev_id=b'rev2a')
+        tree_b.commit('', rev_id=b'rev2b')
         tree_a.merge_from_branch(tree_b.branch)
         tree_b.merge_from_branch(tree_a.branch)
-        tree_a.commit('', rev_id='rev3a')
-        tree_b.commit('', rev_id='rev3b')
+        tree_a.commit('', rev_id=b'rev3a')
+        tree_b.commit('', rev_id=b'rev3b')
         graph = tree_a.branch.repository.get_graph(tree_b.branch.repository)
         out, err = self.run_bzr(['merge', '-d', 'a', 'b'])
         self.assertContainsRe(err, 'Warning: criss-cross merge encountered.')
@@ -589,7 +589,7 @@
 
     def test_no_remember_dont_set_submit(self):
         tree_a = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/file', "a\n")])
+        self.build_tree_contents([('a/file', b"a\n")])
         tree_a.add('file')
         tree_a.commit('rev1')
         tree_b = tree_a.controldir.sprout('b').open_workingtree()
@@ -606,39 +606,39 @@
 
     def test_weave_cherrypick(self):
         this_tree = self.make_branch_and_tree('this')
-        self.build_tree_contents([('this/file', "a\n")])
+        self.build_tree_contents([('this/file', b"a\n")])
         this_tree.add('file')
         this_tree.commit('rev1')
         other_tree = this_tree.controldir.sprout('other').open_workingtree()
-        self.build_tree_contents([('other/file', "a\nb\n")])
+        self.build_tree_contents([('other/file', b"a\nb\n")])
         other_tree.commit('rev2b')
-        self.build_tree_contents([('other/file', "c\na\nb\n")])
+        self.build_tree_contents([('other/file', b"c\na\nb\n")])
         other_tree.commit('rev3b')
         self.run_bzr('merge --weave -d this other -r -2..-1')
         self.assertFileEqual('c\na\n', 'this/file')
 
     def test_lca_merge_criss_cross(self):
         tree_a = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/file', 'base-contents\n')])
+        self.build_tree_contents([('a/file', b'base-contents\n')])
         tree_a.add('file')
-        tree_a.commit('', rev_id='rev1')
+        tree_a.commit('', rev_id=b'rev1')
         tree_b = tree_a.controldir.sprout('b').open_workingtree()
         self.build_tree_contents([('a/file',
-                                   'base-contents\nthis-contents\n')])
-        tree_a.commit('', rev_id='rev2a')
+                                   b'base-contents\nthis-contents\n')])
+        tree_a.commit('', rev_id=b'rev2a')
         self.build_tree_contents([('b/file',
-                                   'base-contents\nother-contents\n')])
-        tree_b.commit('', rev_id='rev2b')
+                                   b'base-contents\nother-contents\n')])
+        tree_b.commit('', rev_id=b'rev2b')
         tree_a.merge_from_branch(tree_b.branch)
         self.build_tree_contents([('a/file',
-                                   'base-contents\nthis-contents\n')])
+                                   b'base-contents\nthis-contents\n')])
         tree_a.set_conflicts(conflicts.ConflictList())
         tree_b.merge_from_branch(tree_a.branch)
         self.build_tree_contents([('b/file',
-                                   'base-contents\nother-contents\n')])
+                                   b'base-contents\nother-contents\n')])
         tree_b.set_conflicts(conflicts.ConflictList())
-        tree_a.commit('', rev_id='rev3a')
-        tree_b.commit('', rev_id='rev3b')
+        tree_a.commit('', rev_id=b'rev3a')
+        tree_b.commit('', rev_id=b'rev3b')
         out, err = self.run_bzr(['merge', '-d', 'a', 'b', '--lca'], retcode=1)
         self.assertFileEqual('base-contents\n<<<<<<< TREE\nthis-contents\n'
                              '=======\nother-contents\n>>>>>>> MERGE-SOURCE\n',
@@ -648,7 +648,7 @@
         this_tree = self.make_branch_and_tree('this')
         this_tree.commit('rev1')
         other_tree = this_tree.controldir.sprout('other').open_workingtree()
-        self.build_tree_contents([('other/file', 'new line')])
+        self.build_tree_contents([('other/file', b'new line')])
         other_tree.add('file')
         other_tree.commit('rev2a')
         this_tree.commit('rev2b')
@@ -686,15 +686,15 @@
         """
         # Make a source, sprout a target off it
         builder = self.make_branch_builder('source')
-        builder.build_commit(message="Rev 1", rev_id='rev-1')
+        builder.build_commit(message="Rev 1", rev_id=b'rev-1')
         source = builder.get_branch()
         target_bzrdir = source.controldir.sprout('target')
         # Add a non-ancestry tag to source
-        builder.build_commit(message="Rev 2a", rev_id='rev-2a')
+        builder.build_commit(message="Rev 2a", rev_id=b'rev-2a')
         source.tags.set_tag('tag-a', 'rev-2a')
         source.set_last_revision_info(1, 'rev-1')
         source.get_config_stack().set('branch.fetch_tags', True)
-        builder.build_commit(message="Rev 2b", rev_id='rev-2b')
+        builder.build_commit(message="Rev 2b", rev_id=b'rev-2b')
         # Merge from source
         self.run_bzr('merge -d target source')
         target = target_bzrdir.open_branch()
@@ -728,7 +728,7 @@
         source = self.make_branch_and_tree('source')
         self.build_tree(['source/a'])
         source.add('a')
-        source.commit('Added a', rev_id='rev1')
+        source.commit('Added a', rev_id=b'rev1')
         target = self.make_branch_and_tree('target')
         self.run_script("""\
 $ brz merge -d target source
@@ -744,7 +744,7 @@
         self.tree_a.add(['foo'])
         self.tree_a.commit('add file')
         self.tree_b = self.tree_a.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('a/foo', 'change 1')])
+        self.build_tree_contents([('a/foo', b'change 1')])
         self.tree_a.commit('change file')
         self.tree_b.merge_from_branch(self.tree_a.branch)
 

=== modified file 'breezy/tests/blackbox/test_merge_directive.py'
--- breezy/tests/blackbox/test_merge_directive.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_merge_directive.py	2018-03-25 11:39:57 +0000
@@ -43,14 +43,14 @@
 
     def prepare_merge_directive(self):
         self.tree1 = self.make_branch_and_tree('tree1')
-        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
+        self.build_tree_contents([('tree1/file', b'a\nb\nc\nd\n')])
         self.tree1.branch.get_config_stack().set(
             'email', 'J. Random Hacker <[e-mail]>')
         self.tree1.add('file')
-        self.tree1.commit('foo', rev_id='foo-id')
+        self.tree1.commit('foo', rev_id=b'foo-id')
         self.tree2 = self.tree1.controldir.sprout('tree2').open_workingtree()
-        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\ne\n')])
-        self.tree1.commit('bar', rev_id='bar-id')
+        self.build_tree_contents([('tree1/file', b'a\nb\nc\nd\ne\n')])
+        self.tree1.commit('bar', rev_id=b'bar-id')
         os.chdir('tree1')
         return self.tree1, self.tree2
 
@@ -155,7 +155,7 @@
 
     def test_pull_raw(self):
         self.prepare_merge_directive()
-        self.tree1.commit('baz', rev_id='baz-id')
+        self.tree1.commit('baz', rev_id=b'baz-id')
         md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
                                 '-r', '2', self.tree1.basedir, '--plain'])[0]
         self.build_tree_contents([('../directive', md_text)])
@@ -167,7 +167,7 @@
     def test_pull_user_r(self):
         """If the user supplies -r, an error is emitted"""
         self.prepare_merge_directive()
-        self.tree1.commit('baz', rev_id='baz-id')
+        self.tree1.commit('baz', rev_id=b'baz-id')
         md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
                                 self.tree1.basedir, '--plain'])[0]
         self.build_tree_contents([('../directive', md_text)])
@@ -178,7 +178,7 @@
 
     def test_pull_bundle(self):
         self.prepare_merge_directive()
-        self.tree1.commit('baz', rev_id='baz-id')
+        self.tree1.commit('baz', rev_id=b'baz-id')
         md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
                                 '-r', '2', '/dev/null', '--bundle'])[0]
         self.build_tree_contents([('../directive', md_text)])
@@ -189,7 +189,7 @@
 
     def test_merge_raw(self):
         self.prepare_merge_directive()
-        self.tree1.commit('baz', rev_id='baz-id')
+        self.tree1.commit('baz', rev_id=b'baz-id')
         md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
                                 '-r', '2', self.tree1.basedir, '--plain'])[0]
         self.build_tree_contents([('../directive', md_text)])
@@ -201,7 +201,7 @@
     def test_merge_user_r(self):
         """If the user supplies -r, an error is emitted"""
         self.prepare_merge_directive()
-        self.tree1.commit('baz', rev_id='baz-id')
+        self.tree1.commit('baz', rev_id=b'baz-id')
         md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
                                 self.tree1.basedir, '--plain'])[0]
         self.build_tree_contents([('../directive', md_text)])
@@ -212,7 +212,7 @@
 
     def test_merge_bundle(self):
         self.prepare_merge_directive()
-        self.tree1.commit('baz', rev_id='baz-id')
+        self.tree1.commit('baz', rev_id=b'baz-id')
         md_text = self.run_bzr(['merge-directive', self.tree2.basedir,
                                '-r', '2', '/dev/null', '--bundle'])[0]
         self.build_tree_contents([('../directive', md_text)])

=== modified file 'breezy/tests/blackbox/test_missing.py'
--- breezy/tests/blackbox/test_missing.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_missing.py	2018-03-25 11:39:57 +0000
@@ -38,7 +38,7 @@
         # XXX: This still needs a test that missing is quiet when there are
         # missing revisions.
         a_tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('a', 'initial\n')])
+        self.build_tree_contents([('a', b'initial\n')])
         a_tree.add('a')
         a_tree.commit(message='initial')
 
@@ -52,13 +52,13 @@
 
         # create a source branch
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/a', 'initial\n')])
+        self.build_tree_contents([('a/a', b'initial\n')])
         a_tree.add('a')
         a_tree.commit(message='initial')
 
         # clone and add a differing revision
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('b/a', 'initial\nmore\n')])
+        self.build_tree_contents([('b/a', b'initial\nmore\n')])
         b_tree.commit(message='more')
 
         def run_missing(args, retcode=1, working_dir=None):
@@ -160,7 +160,7 @@
     def test_missing_filtered(self):
         # create a source branch
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/a', 'initial\n')])
+        self.build_tree_contents([('a/a', b'initial\n')])
         a_tree.add('a')
         a_tree.commit(message='r1')
         # clone and add differing revisions
@@ -221,13 +221,13 @@
 
         # create a source branch
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/a', 'initial\n')])
+        self.build_tree_contents([('a/a', b'initial\n')])
         a_tree.add('a')
         a_tree.commit(message='initial')
 
         # clone and add a differing revision
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('b/a', 'initial\nmore\n')])
+        self.build_tree_contents([('b/a', b'initial\nmore\n')])
         b_tree.commit(message='more')
 
         out2, err2 = self.run_bzr('missing --directory a b', retcode=1)
@@ -240,13 +240,13 @@
 
         # create a source branch
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/a', 'initial\n')])
+        self.build_tree_contents([('a/a', b'initial\n')])
         a_tree.add('a')
         a_tree.commit(message='initial')
 
         # clone and add a differing revision
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('b/a', 'initial\nmore\n')])
+        self.build_tree_contents([('b/a', b'initial\nmore\n')])
         b_tree.commit(message='more')
         b_tree.branch.tags.set_tag('a-tag', b_tree.last_revision())
 

=== modified file 'breezy/tests/blackbox/test_modified.py'
--- breezy/tests/blackbox/test_modified.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_modified.py	2018-03-25 11:39:57 +0000
@@ -48,7 +48,7 @@
         check_modified('')
 
         # with unknown file, still nothing modified
-        self.build_tree_contents([(name, 'contents of %s\n' % (name))])
+        self.build_tree_contents([(name, b'contents of %s\n' % (name))])
         check_modified('')
 
         # after add, not modified
@@ -60,7 +60,7 @@
         check_modified('')
 
         # modify the file
-        self.build_tree_contents([(name, 'changed\n')])
+        self.build_tree_contents([(name, b'changed\n')])
         check_modified(output + '\n')
 
         # check null seps - use the unquoted raw name here
@@ -76,6 +76,6 @@
         self.build_tree(['a/README'])
         tree.add('README')
         tree.commit('r1')
-        self.build_tree_contents([('a/README', 'changed\n')])
+        self.build_tree_contents([('a/README', b'changed\n')])
         out, err = self.run_bzr(['modified', '--directory=a'])
         self.assertEqual('README\n', out)

=== modified file 'breezy/tests/blackbox/test_mv.py'
--- breezy/tests/blackbox/test_mv.py	2018-02-15 19:38:33 +0000
+++ breezy/tests/blackbox/test_mv.py	2018-03-25 11:39:57 +0000
@@ -196,7 +196,7 @@
         self.build_tree(['a/', 'a/b'])
         os.symlink('a', 'c')
         os.symlink('.', 'd')
-        tree.add(['a', 'a/b', 'c'], ['a-id', 'b-id', 'c-id'])
+        tree.add(['a', 'a/b', 'c'], [b'a-id', b'b-id', b'c-id'])
         self.run_bzr('mv c/b b')
         tree = workingtree.WorkingTree.open('.')
         self.assertEqual('b-id', tree.path2id('b'))

=== modified file 'breezy/tests/blackbox/test_non_ascii.py'
--- breezy/tests/blackbox/test_non_ascii.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_non_ascii.py	2018-03-25 11:39:57 +0000
@@ -115,17 +115,17 @@
 
     def create_base(self):
         wt = self.make_branch_and_tree('.')
-        self.build_tree_contents([('a', 'foo\n')])
+        self.build_tree_contents([('a', b'foo\n')])
         wt.add('a')
         wt.commit('adding a')
 
         self.build_tree_contents(
-            [('b', 'non-ascii \xFF\xFF\xFC\xFB\x00 in b\n')])
+            [('b', b'non-ascii \xFF\xFF\xFC\xFB\x00 in b\n')])
         wt.add('b')
         wt.commit(self.info['message'])
 
         fname = self.info['filename']
-        self.build_tree_contents([(fname, 'unicode filename\n')])
+        self.build_tree_contents([(fname, b'unicode filename\n')])
         wt.add(fname)
         wt.commit(u'And a unicode file\n')
         self.wt = wt
@@ -137,7 +137,7 @@
 
     def test_status(self):
         self.build_tree_contents(
-            [(self.info['filename'], 'changed something\n')])
+            [(self.info['filename'], b'changed something\n')])
         txt = self.run_bzr_decode('status')
         self._check_OSX_can_roundtrip(self.info['filename'])
         self.assertEqual(u'modified:\n  %s\n' % (self.info['filename'],), txt)
@@ -259,7 +259,7 @@
         out_bzrdir.sprout(url2)
 
         self.build_tree_contents(
-            [(osutils.pathjoin(dirname1, "a"), 'different text\n')])
+            [(osutils.pathjoin(dirname1, "a"), b'different text\n')])
         self.wt.commit('mod a')
 
         txt = self.run_bzr_decode('pull', working_dir=dirname2)
@@ -269,7 +269,7 @@
                 'No revisions or tags to pull.\n' % (expected,), txt)
 
         self.build_tree_contents(
-            [(osutils.pathjoin(dirname1, 'a'), 'and yet more\n')])
+            [(osutils.pathjoin(dirname1, 'a'), b'and yet more\n')])
         self.wt.commit(u'modifying a by ' + self.info['committer'])
 
         # We should be able to pull, even if our encoding is bad
@@ -288,14 +288,14 @@
         dirname = self.info['directory']
         self.run_bzr_decode(['push', dirname])
 
-        self.build_tree_contents([('a', 'adding more text\n')])
+        self.build_tree_contents([('a', b'adding more text\n')])
         self.wt.commit('added some stuff')
 
         # TODO: check the output text is properly encoded
         self.run_bzr_decode('push')
 
         self.build_tree_contents(
-            [('a', 'and a bit more: \n%s\n' % (dirname.encode('utf-8'),))])
+            [('a', b'and a bit more: \n%s\n' % (dirname.encode('utf-8'),))])
 
         self.wt.commit('Added some ' + dirname)
         self.run_bzr_decode('push --verbose', encoding='ascii')
@@ -372,7 +372,7 @@
         # TODO: jam 20060106 diff is a difficult one to test, because it
         #       shouldn't encode the file contents, but it needs some sort
         #       of encoding for the paths, etc which are displayed.
-        self.build_tree_contents([(self.info['filename'], 'newline\n')])
+        self.build_tree_contents([(self.info['filename'], b'newline\n')])
         txt = self.run_bzr('diff', retcode=1)[0]
 
     def test_deleted(self):
@@ -394,7 +394,7 @@
 
     def test_modified(self):
         fname = self.info['filename']
-        self.build_tree_contents([(fname, 'modified\n')])
+        self.build_tree_contents([(fname, b'modified\n')])
 
         txt = self.run_bzr_decode('modified')
         self._check_OSX_can_roundtrip(self.info['filename'])
@@ -404,7 +404,7 @@
 
     def test_added(self):
         fname = self.info['filename'] + '2'
-        self.build_tree_contents([(fname, 'added\n')])
+        self.build_tree_contents([(fname, b'added\n')])
         self.wt.add(fname)
 
         txt = self.run_bzr_decode('added')
@@ -474,7 +474,7 @@
 
     def test_unknowns(self):
         fname = self.info['filename'] + '2'
-        self.build_tree_contents([(fname, 'unknown\n')])
+        self.build_tree_contents([(fname, b'unknown\n')])
 
         # TODO: jam 20060112 brz unknowns is the only one which
         #       quotes paths do we really want it to?
@@ -487,7 +487,7 @@
 
     def test_ignore(self):
         fname2 = self.info['filename'] + '2.txt'
-        self.build_tree_contents([(fname2, 'ignored\n')])
+        self.build_tree_contents([(fname2, b'ignored\n')])
 
         def check_unknowns(expected):
             self.assertEqual(expected, list(self.wt.unknowns()))
@@ -499,7 +499,7 @@
         check_unknowns([])
 
         fname3 = self.info['filename'] + '3.txt'
-        self.build_tree_contents([(fname3, 'unknown 3\n')])
+        self.build_tree_contents([(fname3, b'unknown 3\n')])
         check_unknowns([fname3])
 
         # Ignore should not care what the encoding is
@@ -509,7 +509,7 @@
 
         # Now try a wildcard match
         fname4 = self.info['filename'] + '4.txt'
-        self.build_tree_contents([(fname4, 'unknown 4\n')])
+        self.build_tree_contents([(fname4, b'unknown 4\n')])
         self.run_bzr_decode('ignore *.txt')
         check_unknowns([])
 
@@ -541,7 +541,7 @@
 
     def test_ignored(self):
         fname = self.info['filename'] + '1.txt'
-        self.build_tree_contents([(fname, 'ignored\n')])
+        self.build_tree_contents([(fname, b'ignored\n')])
         self.run_bzr(['ignore', fname])
         txt = self.run_bzr_decode(['ignored'])
         self.assertEqual(txt, '%-50s %s\n' % (fname, fname))

=== modified file 'breezy/tests/blackbox/test_pack.py'
--- breezy/tests/blackbox/test_pack.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_pack.py	2018-03-25 11:39:57 +0000
@@ -90,7 +90,7 @@
     def test_simple_pack(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_ping.py'
--- breezy/tests/blackbox/test_ping.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_ping.py	2018-03-25 11:39:57 +0000
@@ -25,7 +25,7 @@
     def test_simple_ping(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_pull.py'
--- breezy/tests/blackbox/test_pull.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_pull.py	2018-03-25 11:39:57 +0000
@@ -45,8 +45,8 @@
     def example_branch(self, path='.'):
         tree = self.make_branch_and_tree(path)
         self.build_tree_contents([
-            (osutils.pathjoin(path, 'hello'),   'foo'),
-            (osutils.pathjoin(path, 'goodbye'), 'baz')])
+            (osutils.pathjoin(path, 'hello'),   b'foo'),
+            (osutils.pathjoin(path, 'goodbye'), b'baz')])
         tree.add('hello')
         tree.commit(message='setup')
         tree.add('goodbye')
@@ -120,8 +120,8 @@
         """Pull some changes from one branch to another."""
         a_tree = self.example_branch('a')
         self.build_tree_contents([
-            ('a/hello2',   'foo'),
-            ('a/goodbye2', 'baz')])
+            ('a/hello2',   b'foo'),
+            ('a/goodbye2', b'baz')])
         a_tree.add('hello2')
         a_tree.commit(message="setup")
         a_tree.add('goodbye2')
@@ -161,16 +161,16 @@
         # even if the target branch has merged
         # everything already.
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/foo', 'original\n')])
+        self.build_tree_contents([('a/foo', b'original\n')])
         a_tree.add('foo')
         a_tree.commit(message='initial commit')
 
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
-        self.build_tree_contents([('a/foo', 'changed\n')])
+        self.build_tree_contents([('a/foo', b'changed\n')])
         a_tree.commit(message='later change')
 
-        self.build_tree_contents([('a/foo', 'a third change')])
+        self.build_tree_contents([('a/foo', b'a third change')])
         a_tree.commit(message='a third change')
 
         self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
@@ -189,16 +189,16 @@
         # Make sure pull --overwrite sets the revision-history
         # to be identical to the pull source, even if we have convergence
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/foo', 'original\n')])
+        self.build_tree_contents([('a/foo', b'original\n')])
         a_tree.add('foo')
         a_tree.commit(message='initial commit')
 
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
 
-        self.build_tree_contents([('a/foo', 'changed\n')])
+        self.build_tree_contents([('a/foo', b'changed\n')])
         a_tree.commit(message='later change')
 
-        self.build_tree_contents([('a/foo', 'a third change')])
+        self.build_tree_contents([('a/foo', b'a third change')])
         a_tree.commit(message='a third change')
 
         self.assertEqual(a_tree.branch.last_revision_info()[0], 3)
@@ -208,7 +208,7 @@
 
         self.assertEqual(b_tree.branch.last_revision_info()[0], 2)
 
-        self.build_tree_contents([('a/foo', 'a fourth change\n')])
+        self.build_tree_contents([('a/foo', b'a fourth change\n')])
         a_tree.commit(message='a fourth change')
 
         rev_info_a = a_tree.branch.last_revision_info()

=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2017-11-16 00:39:04 +0000
+++ breezy/tests/blackbox/test_push.py	2018-03-25 11:39:57 +0000
@@ -208,16 +208,16 @@
         tree_a = make_shared_tree('a')
         self.build_tree(['repo/a/file'])
         tree_a.add('file')
-        tree_a.commit('commit a-1', rev_id='a-1')
+        tree_a.commit('commit a-1', rev_id=b'a-1')
         f = open('repo/a/file', 'ab')
         f.write('more stuff\n')
         f.close()
-        tree_a.commit('commit a-2', rev_id='a-2')
+        tree_a.commit('commit a-2', rev_id=b'a-2')
 
         tree_b = make_shared_tree('b')
         self.build_tree(['repo/b/file'])
         tree_b.add('file')
-        tree_b.commit('commit b-1', rev_id='b-1')
+        tree_b.commit('commit b-1', rev_id=b'b-1')
 
         self.assertTrue(shared_repo.has_revision('a-1'))
         self.assertTrue(shared_repo.has_revision('a-2'))
@@ -256,9 +256,9 @@
         source.start_series()
         source.build_snapshot(None, [
             ('add', ('', 'root-id', 'directory', None))],
-            revision_id='A')
-        source.build_snapshot(['A'], [], revision_id='B')
-        source.build_snapshot(['A'], [], revision_id='C')
+            revision_id=b'A')
+        source.build_snapshot(['A'], [], revision_id=b'B')
+        source.build_snapshot(['A'], [], revision_id=b'C')
         source.finish_series()
         self.run_bzr('push target -d source')
         self.addCleanup(target_repo.lock_read().unlock)
@@ -363,8 +363,8 @@
     def create_simple_tree(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a'])
-        tree.add(['a'], ['a-id'])
-        tree.commit('one', rev_id='r1')
+        tree.add(['a'], [b'a-id'])
+        tree.commit('one', rev_id=b'r1')
         return tree
 
     def test_push_create_prefix(self):
@@ -578,11 +578,11 @@
         builder.build_snapshot(None, [
             ('add', ('', 'root-id', 'directory', '')),
             ('add', ('filename', 'f-id', 'file', 'content\n'))],
-            revision_id='rev-1')
-        builder.build_snapshot(['rev-1'], [], revision_id='rev-2')
+            revision_id=b'rev-1')
+        builder.build_snapshot(['rev-1'], [], revision_id=b'rev-2')
         builder.build_snapshot(['rev-2'],
             [('modify', ('f-id', 'new-content\n'))],
-            revision_id='rev-3')
+            revision_id=b'rev-3')
         builder.finish_series()
         branch = builder.get_branch()
         # Push rev-1 to "trunk", so that we can stack on it.
@@ -727,11 +727,11 @@
 
     def make_local_branch_and_tree(self):
         self.tree = self.make_branch_and_tree('local')
-        self.build_tree_contents([('local/file', 'initial')])
+        self.build_tree_contents([('local/file', b'initial')])
         self.tree.add('file')
-        self.tree.commit('adding file', rev_id='added')
-        self.build_tree_contents([('local/file', 'modified')])
-        self.tree.commit('modify file', rev_id='modified')
+        self.tree.commit('adding file', rev_id=b'added')
+        self.build_tree_contents([('local/file', b'modified')])
+        self.tree.commit('modify file', rev_id=b'modified')
 
     def set_config_push_strict(self, value):
         br = branch.Branch.open('local')
@@ -823,16 +823,16 @@
     def _uncommitted_changes(self):
         self.make_local_branch_and_tree()
         # Make a change without committing it
-        self.build_tree_contents([('local/file', 'in progress')])
+        self.build_tree_contents([('local/file', b'in progress')])
 
     def _pending_merges(self):
         self.make_local_branch_and_tree()
         # Create 'other' branch containing a new file
         other_bzrdir = self.tree.controldir.sprout('other')
         other_tree = other_bzrdir.open_workingtree()
-        self.build_tree_contents([('other/other-file', 'other')])
+        self.build_tree_contents([('other/other-file', b'other')])
         other_tree.add('other-file')
-        other_tree.commit('other commit', rev_id='other')
+        other_tree.commit('other commit', rev_id=b'other')
         # Merge and revert, leaving a pending merge
         self.tree.merge_from_branch(other_tree.branch)
         self.tree.revert(filenames=['other-file'], backups=False)
@@ -841,8 +841,8 @@
         self.make_local_branch_and_tree()
         self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
         # Make a change and commit it
-        self.build_tree_contents([('local/file', 'modified in local')])
-        self.tree.commit('modify file', rev_id='modified-in-local')
+        self.build_tree_contents([('local/file', b'modified in local')])
+        self.tree.commit('modify file', rev_id=b'modified-in-local')
         # Exercise commands from the checkout directory
         self._default_wd = 'checkout'
         self._default_errors = ["Working tree is out of date, please run"
@@ -889,9 +889,9 @@
         builder = self.make_branch_builder(
             relpath, format=test_foreign.DummyForeignVcsDirFormat())
         builder.build_snapshot(None,
-            [('add', ('', 'TREE_ROOT', 'directory', None)),
-             ('add', ('foo', 'fooid', 'file', 'bar'))],
-            revision_id='revid')
+            [('add', ('', b'TREE_ROOT', 'directory', None)),
+             ('add', ('foo', b'fooid', 'file', 'bar'))],
+            revision_id=b'revid')
         return builder
 
     def test_no_roundtripping(self):

=== modified file 'breezy/tests/blackbox/test_re_sign.py'
--- breezy/tests/blackbox/test_re_sign.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_re_sign.py	2018-03-25 11:39:57 +0000
@@ -40,9 +40,9 @@
 
     def setup_tree(self):
         wt = ControlDir.create_standalone_workingtree('.')
-        wt.commit("base A", allow_pointless=True, rev_id='A')
-        wt.commit("base B", allow_pointless=True, rev_id='B')
-        wt.commit("base C", allow_pointless=True, rev_id='C')
+        wt.commit("base A", allow_pointless=True, rev_id=b'A')
+        wt.commit("base B", allow_pointless=True, rev_id=b'B')
+        wt.commit("base C", allow_pointless=True, rev_id=b'C')
 
         return wt
 
@@ -90,9 +90,9 @@
     def test_resign_directory(self):
         """Test --directory option"""
         wt = ControlDir.create_standalone_workingtree('a')
-        wt.commit("base A", allow_pointless=True, rev_id='A')
-        wt.commit("base B", allow_pointless=True, rev_id='B')
-        wt.commit("base C", allow_pointless=True, rev_id='C')
+        wt.commit("base A", allow_pointless=True, rev_id=b'A')
+        wt.commit("base B", allow_pointless=True, rev_id=b'B')
+        wt.commit("base C", allow_pointless=True, rev_id=b'C')
         repo = wt.branch.repository
         self.monkey_patch_gpg()
         self.run_bzr('re-sign --directory=a -r revid:A')

=== modified file 'breezy/tests/blackbox/test_reconcile.py'
--- breezy/tests/blackbox/test_reconcile.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_reconcile.py	2018-03-25 11:39:57 +0000
@@ -50,7 +50,7 @@
         t = controldir.ControlDir.create_standalone_workingtree('.')
         # an empty inventory with no revision will trigger reconciliation.
         repo = t.branch.repository
-        inv = inventory.Inventory(revision_id='missing')
+        inv = inventory.Inventory(revision_id=b'missing')
         inv.root.revision='missing'
         repo.lock_write()
         repo.start_write_group()

=== modified file 'breezy/tests/blackbox/test_reconfigure.py'
--- breezy/tests/blackbox/test_reconfigure.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_reconfigure.py	2018-03-25 11:39:57 +0000
@@ -140,13 +140,13 @@
         self.assertNotEqual(branch.controldir.root_transport.base,
             branch.repository.controldir.root_transport.base)
         tree = workingtree.WorkingTree.open('repo/tree')
-        self.build_tree_contents([('repo/tree/file', 'foo\n')]);
+        self.build_tree_contents([('repo/tree/file', b'foo\n')]);
         tree.add(['file'])
         tree.commit('added file')
         self.run_bzr('reconfigure --standalone', working_dir='repo/tree')
         tree = workingtree.WorkingTree.open('repo/tree')
-        self.build_tree_contents([('repo/tree/file', 'bar\n')]);
-        self.check_file_contents('repo/tree/file', 'bar\n')
+        self.build_tree_contents([('repo/tree/file', b'bar\n')]);
+        self.check_file_contents('repo/tree/file', b'bar\n')
         self.run_bzr('revert', working_dir='repo/tree')
         self.check_file_contents('repo/tree/file', 'foo\n')
         self.assertEqual(tree.controldir.root_transport.base,
@@ -165,13 +165,13 @@
         branch = self.make_branch('branch', format=format)
         checkout = branch.create_checkout('checkout', lightweight=True)
         tree = workingtree.WorkingTree.open('checkout')
-        self.build_tree_contents([('checkout/file', 'foo\n')]);
+        self.build_tree_contents([('checkout/file', b'foo\n')]);
         tree.add(['file'])
         tree.commit('added file')
         self.run_bzr('reconfigure --tree', working_dir='checkout')
         tree = workingtree.WorkingTree.open('checkout')
-        self.build_tree_contents([('checkout/file', 'bar\n')]);
-        self.check_file_contents('checkout/file', 'bar\n')
+        self.build_tree_contents([('checkout/file', b'bar\n')]);
+        self.check_file_contents('checkout/file', b'bar\n')
         self.run_bzr('revert', working_dir='checkout')
         self.check_file_contents('checkout/file', 'foo\n')
 
@@ -255,7 +255,7 @@
         # because that's most likely to work across different transports
         self.assertEqual('../b1', branch_2.get_stacked_on_url())
         # commit, and it should be stored into b2's repo
-        self.build_tree_contents([('foo', 'new foo')])
+        self.build_tree_contents([('foo', b'new foo')])
         tree_2.commit('update foo')
         # Now turn it off again
         out, err = self.run_bzr('reconfigure --unstacked b2')

=== modified file 'breezy/tests/blackbox/test_reference.py'
--- breezy/tests/blackbox/test_reference.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_reference.py	2018-03-25 11:39:57 +0000
@@ -43,7 +43,7 @@
     def make_tree_with_reference(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/newpath'])
-        tree.add('newpath', 'file-id')
+        tree.add('newpath', b'file-id')
         tree.branch.set_reference_info('file-id', 'path', 'http://example.org')
         tree.branch.set_reference_info('file-id2', 'lath',
                                        'http://example.org/2')
@@ -74,7 +74,7 @@
     def test_two_args_sets(self):
         tree = self.make_branch_and_tree('tree')
         self.build_tree(['tree/file'])
-        tree.add('file', 'file-id')
+        tree.add('file', b'file-id')
         out, err = self.run_bzr('reference tree/file http://example.org')
         path, location = tree.branch.get_reference_info('file-id')
         self.assertEqual('http://example.org', location)

=== modified file 'breezy/tests/blackbox/test_resolve.py'
--- breezy/tests/blackbox/test_resolve.py	2017-12-04 00:18:38 +0000
+++ breezy/tests/blackbox/test_resolve.py	2018-03-25 11:39:57 +0000
@@ -175,7 +175,7 @@
         """Text conflicts can be resolved automatically"""
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([('tree/file',
-            '<<<<<<<\na\n=======\n>>>>>>>\n')])
+            b'<<<<<<<\na\n=======\n>>>>>>>\n')])
         tree.add('file', 'file_id')
         self.assertEqual(tree.kind('file', 'file_id'), 'file')
         file_conflict = conflicts.TextConflict('file', file_id='file_id')
@@ -184,6 +184,6 @@
         self.assertContainsRe(note, '0 conflicts auto-resolved.')
         self.assertContainsRe(note,
             'Remaining conflicts:\nText conflict in file')
-        self.build_tree_contents([('tree/file', 'a\n')])
+        self.build_tree_contents([('tree/file', b'a\n')])
         note = self.run_bzr('resolve', working_dir='tree')[1]
         self.assertContainsRe(note, 'All conflicts resolved.')

=== modified file 'breezy/tests/blackbox/test_revert.py'
--- breezy/tests/blackbox/test_revert.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_revert.py	2018-03-25 11:39:57 +0000
@@ -197,7 +197,7 @@
         self.run_bzr(['revert', '--forget-merges'])
         self.build_tree(['file'])
         first_rev_id = tree.commit('initial commit')
-        self.build_tree_contents([('file', 'new content')])
+        self.build_tree_contents([('file', b'new content')])
         existing_parents = tree.get_parent_ids()
         self.assertEqual([first_rev_id], existing_parents)
         merged_parents = existing_parents + ['merged-in-rev']

=== modified file 'breezy/tests/blackbox/test_revision_history.py'
--- breezy/tests/blackbox/test_revision_history.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_revision_history.py	2018-03-25 11:39:57 +0000
@@ -28,13 +28,13 @@
         with open('test/foo', 'wb') as f:
             f.write('1111\n')
         tree.add('foo')
-        tree.commit('added foo', rev_id='revision_1')
+        tree.commit('added foo', rev_id=b'revision_1')
         with open('test/foo', 'wb')as f:
             f.write('2222\n')
-        tree.commit('updated foo', rev_id='revision_2')
+        tree.commit('updated foo', rev_id=b'revision_2')
         with open('test/foo', 'wb')as f:
             f.write('3333\n')
-        tree.commit('updated foo again', rev_id='revision_3')
+        tree.commit('updated foo again', rev_id=b'revision_3')
         return tree
 
     def _check_revision_history(self, location='', working_dir=None):

=== modified file 'breezy/tests/blackbox/test_revision_info.py'
--- breezy/tests/blackbox/test_revision_info.py	2017-11-16 00:39:04 +0000
+++ breezy/tests/blackbox/test_revision_info.py	2018-03-25 11:39:57 +0000
@@ -36,11 +36,11 @@
         wt = self.make_branch_and_tree('.')
 
         # Make history with a non-mainline rev
-        wt.commit('Commit one', rev_id='a@r-0-1')
-        wt.commit('Commit two', rev_id='a@r-0-1.1.1')
+        wt.commit('Commit one', rev_id=b'a@r-0-1')
+        wt.commit('Commit two', rev_id=b'a@r-0-1.1.1')
         wt.set_parent_ids(['a@r-0-1', 'a@r-0-1.1.1'])
         wt.branch.set_last_revision_info(1, 'a@r-0-1')
-        wt.commit('Commit three', rev_id='a@r-0-2')
+        wt.commit('Commit three', rev_id=b'a@r-0-2')
 
         # This is expected to work even if the working tree is removed
         wt.controldir.destroy_workingtree()
@@ -88,17 +88,17 @@
         """Test that 'brz revision-info' honors the '-d' option."""
         wt = self.make_branch_and_tree('branch')
 
-        wt.commit('Commit one', rev_id='a@r-0-1')
+        wt.commit('Commit one', rev_id=b'a@r-0-1')
         self.check_output('1 a@r-0-1\n', 'revision-info -d branch')
 
     def test_revision_info_tree(self):
         # Make branch and checkout
         wt = self.make_branch_and_tree('branch')
-        wt.commit('Commit one', rev_id='a@r-0-1')
+        wt.commit('Commit one', rev_id=b'a@r-0-1')
 
         # Make checkout and move the branch forward
         wt.branch.create_checkout('checkout', lightweight=True)
-        wt.commit('Commit two', rev_id='a@r-0-2')
+        wt.commit('Commit two', rev_id=b'a@r-0-2')
 
         # Make sure the checkout gives the right answer for branch and
         # tree
@@ -120,9 +120,9 @@
         builder.start_series()
         builder.build_snapshot(None, [
             ('add', ('', 'root-id', 'directory', None))],
-            revision_id='A-id')
-        builder.build_snapshot(['A-id'], [], revision_id='B-id')
-        builder.build_snapshot(['A-id'], [], revision_id='C-id')
+            revision_id=b'A-id')
+        builder.build_snapshot(['A-id'], [], revision_id=b'B-id')
+        builder.build_snapshot(['A-id'], [], revision_id=b'C-id')
         builder.finish_series()
         self.check_output('  1 A-id\n??? B-id\n  2 C-id\n',
                           'revision-info -d branch'

=== modified file 'breezy/tests/blackbox/test_revno.py'
--- breezy/tests/blackbox/test_revno.py	2017-11-16 00:39:04 +0000
+++ breezy/tests/blackbox/test_revno.py	2018-03-25 11:39:57 +0000
@@ -86,13 +86,13 @@
         builder.build_snapshot(None, [
             ('add', ('', 'root-id', 'directory', None)),
             ('add', ('file', 'file-id', 'file', 'content\n'))],
-            revision_id='A-id')
-        builder.build_snapshot(['A-id'], [], revision_id='B-id')
-        builder.build_snapshot(['A-id', 'B-id'], [], revision_id='C-id')
+            revision_id=b'A-id')
+        builder.build_snapshot(['A-id'], [], revision_id=b'B-id')
+        builder.build_snapshot(['A-id', 'B-id'], [], revision_id=b'C-id')
         builder.finish_series()
         b = builder.get_branch()
         co_b = b.create_checkout('checkout_b', lightweight=True,
-                                 revision_id='B-id')
+                                 revision_id=b'B-id')
         out, err = self.run_bzr('revno checkout_b')
         self.assertEqual('', err)
         self.assertEqual('2\n', out)
@@ -104,17 +104,17 @@
         builder = self.make_branch_builder('branch')
         builder.start_series()
         builder.build_snapshot(None, [
-            ('add', ('', 'root-id', 'directory', None)),
-            ('add', ('file', 'file-id', 'file', 'content\n'))],
-            revision_id='A-id')
-        builder.build_snapshot(['A-id'], [], revision_id='B-id')
-        builder.build_snapshot(['A-id'], [], revision_id='C-id')
+            ('add', ('', b'root-id', 'directory', None)),
+            ('add', ('file', b'file-id', 'file', 'content\n'))],
+            revision_id=b'A-id')
+        builder.build_snapshot(['A-id'], [], revision_id=b'B-id')
+        builder.build_snapshot(['A-id'], [], revision_id=b'C-id')
         builder.finish_series()
         b = builder.get_branch()
         # The branch is now at "C-id", but the checkout is still at "B-id"
         # which is no longer in the history
         co_b = b.create_checkout('checkout_b', lightweight=True,
-                                 revision_id='B-id')
+                                 revision_id=b'B-id')
         out, err = self.run_bzr('revno checkout_b')
         self.assertEqual('', err)
         self.assertEqual('2\n', out)
@@ -147,7 +147,7 @@
     def test_simple_branch_revno(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         revid = t.commit("message")
         self.reset_smart_call_log()
@@ -164,7 +164,7 @@
     def test_simple_branch_revno_lookup(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         revid1 = t.commit("message")
         revid2 = t.commit("message")

=== modified file 'breezy/tests/blackbox/test_rmbranch.py'
--- breezy/tests/blackbox/test_rmbranch.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_rmbranch.py	2018-03-25 11:39:57 +0000
@@ -30,10 +30,10 @@
 
     def example_tree(self, path='.', format=None):
         tree = self.make_branch_and_tree(path, format=format)
-        self.build_tree_contents([(path + '/hello', 'foo')])
+        self.build_tree_contents([(path + '/hello', b'foo')])
         tree.add('hello')
         tree.commit(message='setup')
-        self.build_tree_contents([(path + '/goodbye', 'baz')])
+        self.build_tree_contents([(path + '/goodbye', b'baz')])
         tree.add('goodbye')
         tree.commit(message='setup')
         return tree

=== modified file 'breezy/tests/blackbox/test_script.py'
--- breezy/tests/blackbox/test_script.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_script.py	2018-03-25 11:39:57 +0000
@@ -32,7 +32,7 @@
         self.run_bzr(['test-script', 'I-do-not-exist'], retcode=3)
 
     def test_empty_file(self):
-        self.build_tree_contents([('script', '')])
+        self.build_tree_contents([('script', b'')])
         out, err = self.run_bzr(['test-script', 'script'])
         out_lines = out.splitlines()
         self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
@@ -40,7 +40,7 @@
         self.assertEqual('', err)
 
     def test_simple_file(self):
-        self.build_tree_contents([('script', '''
+        self.build_tree_contents([('script', b'''
 $ echo hello world
 hello world
 ''')])
@@ -51,7 +51,7 @@
         self.assertEqual('', err)
 
     def test_null_output(self):
-        self.build_tree_contents([('script', '''
+        self.build_tree_contents([('script', b'''
 $ echo hello world
 ''')])
         out, err = self.run_bzr(['test-script', 'script', '--null-output'])
@@ -61,7 +61,7 @@
         self.assertEqual('', err)
 
     def test_failing_script(self):
-        self.build_tree_contents([('script', '''
+        self.build_tree_contents([('script', b'''
 $ echo hello foo
 hello bar
 ''')])

=== modified file 'breezy/tests/blackbox/test_send.py'
--- breezy/tests/blackbox/test_send.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_send.py	2018-03-25 11:39:57 +0000
@@ -65,17 +65,17 @@
         super(TestSend, self).setUp()
         grandparent_tree = ControlDir.create_standalone_workingtree(
             'grandparent')
-        self.build_tree_contents([('grandparent/file1', 'grandparent')])
+        self.build_tree_contents([('grandparent/file1', b'grandparent')])
         grandparent_tree.add('file1')
-        grandparent_tree.commit('initial commit', rev_id='rev1')
+        grandparent_tree.commit('initial commit', rev_id=b'rev1')
 
         parent_bzrdir = grandparent_tree.controldir.sprout('parent')
         parent_tree = parent_bzrdir.open_workingtree()
-        parent_tree.commit('next commit', rev_id='rev2')
+        parent_tree.commit('next commit', rev_id=b'rev2')
 
         branch_tree = parent_tree.controldir.sprout('branch').open_workingtree()
-        self.build_tree_contents([('branch/file1', 'branch')])
-        branch_tree.commit('last commit', rev_id='rev3')
+        self.build_tree_contents([('branch/file1', b'branch')])
+        branch_tree.commit('last commit', rev_id=b'rev3')
 
     def assertFormatIs(self, fmt_string, md):
         self.assertEqual(fmt_string, md.get_raw_bundle().splitlines()[0])
@@ -276,14 +276,14 @@
     def make_parent_and_local_branches(self):
         # Create a 'parent' branch as the base
         self.parent_tree = ControlDir.create_standalone_workingtree('parent')
-        self.build_tree_contents([('parent/file', 'parent')])
+        self.build_tree_contents([('parent/file', b'parent')])
         self.parent_tree.add('file')
-        self.parent_tree.commit('first commit', rev_id='parent')
+        self.parent_tree.commit('first commit', rev_id=b'parent')
         # Branch 'local' from parent and do a change
         local_bzrdir = self.parent_tree.controldir.sprout('local')
         self.local_tree = local_bzrdir.open_workingtree()
-        self.build_tree_contents([('local/file', 'local')])
-        self.local_tree.commit('second commit', rev_id='local')
+        self.build_tree_contents([('local/file', b'local')])
+        self.local_tree.commit('second commit', rev_id=b'local')
 
     _default_command = ['send', '-o-', '../parent']
     _default_wd = 'local'
@@ -380,16 +380,16 @@
     def _uncommitted_changes(self):
         self.make_parent_and_local_branches()
         # Make a change without committing it
-        self.build_tree_contents([('local/file', 'modified')])
+        self.build_tree_contents([('local/file', b'modified')])
 
     def _pending_merges(self):
         self.make_parent_and_local_branches()
         # Create 'other' branch containing a new file
         other_bzrdir = self.parent_tree.controldir.sprout('other')
         other_tree = other_bzrdir.open_workingtree()
-        self.build_tree_contents([('other/other-file', 'other')])
+        self.build_tree_contents([('other/other-file', b'other')])
         other_tree.add('other-file')
-        other_tree.commit('other commit', rev_id='other')
+        other_tree.commit('other commit', rev_id=b'other')
         # Merge and revert, leaving a pending merge
         self.local_tree.merge_from_branch(other_tree.branch)
         self.local_tree.revert(filenames=['other-file'], backups=False)
@@ -398,8 +398,8 @@
         self.make_parent_and_local_branches()
         self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
         # Make a change and commit it
-        self.build_tree_contents([('local/file', 'modified in local')])
-        self.local_tree.commit('modify file', rev_id='modified-in-local')
+        self.build_tree_contents([('local/file', b'modified in local')])
+        self.local_tree.commit('modify file', rev_id=b'modified-in-local')
         # Exercise commands from the checkout directory
         self._default_wd = 'checkout'
         self._default_errors = ["Working tree is out of date, please run"
@@ -448,11 +448,11 @@
     def test_send(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         local = t.controldir.sprout('local-branch').open_workingtree()
-        self.build_tree_contents([('branch/foo', 'thenewcontents')])
+        self.build_tree_contents([('branch/foo', b'thenewcontents')])
         local.commit("anothermessage")
         self.reset_smart_call_log()
         out, err = self.run_bzr(

=== modified file 'breezy/tests/blackbox/test_serve.py'
--- breezy/tests/blackbox/test_serve.py	2017-08-26 13:58:53 +0000
+++ breezy/tests/blackbox/test_serve.py	2018-03-25 11:39:57 +0000
@@ -275,7 +275,7 @@
         # Save the config as the subprocess will use it
         gs.store.save()
         process, url = self.start_server_port()
-        self.build_tree_contents([('a_file', 'contents\n')])
+        self.build_tree_contents([('a_file', b'contents\n')])
         # We can connect and issue a request
         t = transport.get_transport_from_url(url)
         self.assertEqual('contents\n', t.get_bytes('a_file'))
@@ -292,7 +292,7 @@
 
     def test_bzr_serve_supports_client_timeout(self):
         process, url = self.start_server_port(['--client-timeout=0.1'])
-        self.build_tree_contents([('a_file', 'contents\n')])
+        self.build_tree_contents([('a_file', b'contents\n')])
         # We can connect and issue a request
         t = transport.get_transport_from_url(url)
         self.assertEqual('contents\n', t.get_bytes('a_file'))
@@ -311,7 +311,7 @@
         self.assertServerFinishesCleanly(process)
 
     def test_bzr_serve_graceful_shutdown(self):
-        big_contents = 'a'*64*1024
+        big_contents = b'a'*64*1024
         self.build_tree_contents([('bigfile', big_contents)])
         process, url = self.start_server_port(['--client-timeout=1.0'])
         t = transport.get_transport_from_url(url)

=== modified file 'breezy/tests/blackbox/test_shelve.py'
--- breezy/tests/blackbox/test_shelve.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_shelve.py	2018-03-25 11:39:57 +0000
@@ -145,10 +145,10 @@
     def test_directory(self):
         """Test --directory option"""
         tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/a', 'initial\n')])
+        self.build_tree_contents([('tree/a', b'initial\n')])
         tree.add('a')
         tree.commit(message='committed')
-        self.build_tree_contents([('tree/a', 'initial\nmore\n')])
+        self.build_tree_contents([('tree/a', b'initial\nmore\n')])
         self.run_bzr('shelve -d tree --all')
         self.assertFileEqual('initial\n', 'tree/a')
         self.run_bzr('unshelve --directory tree')

=== modified file 'breezy/tests/blackbox/test_sign_my_commits.py'
--- breezy/tests/blackbox/test_sign_my_commits.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_sign_my_commits.py	2018-03-25 11:39:57 +0000
@@ -37,13 +37,13 @@
 
     def setup_tree(self, location='.'):
         wt = self.make_branch_and_tree(location)
-        wt.commit("base A", allow_pointless=True, rev_id='A')
-        wt.commit("base B", allow_pointless=True, rev_id='B')
-        wt.commit("base C", allow_pointless=True, rev_id='C')
-        wt.commit("base D", allow_pointless=True, rev_id='D',
+        wt.commit("base A", allow_pointless=True, rev_id=b'A')
+        wt.commit("base B", allow_pointless=True, rev_id=b'B')
+        wt.commit("base C", allow_pointless=True, rev_id=b'C')
+        wt.commit("base D", allow_pointless=True, rev_id=b'D',
                 committer='Alternate <[e-mail]>')
         wt.add_parent_tree_id("aghost")
-        wt.commit("base E", allow_pointless=True, rev_id='E')
+        wt.commit("base E", allow_pointless=True, rev_id=b'E')
         return wt
 
     def assertUnsigned(self, repo, revision_id):
@@ -131,7 +131,7 @@
     def test_sign_single_commit(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()

=== modified file 'breezy/tests/blackbox/test_split.py'
--- breezy/tests/blackbox/test_split.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_split.py	2018-03-25 11:39:57 +0000
@@ -36,7 +36,7 @@
         a_branch = repo.controldir.create_branch()
         self.build_tree(['a/', 'a/b/', 'a/b/c/', 'a/b/c/d'])
         wt = a_branch.create_checkout('a', lightweight=True)
-        wt.add(['b', 'b/c', 'b/c/d'], ['b-id', 'c-id', 'd-id'])
+        wt.add(['b', 'b/c', 'b/c/d'], [b'b-id', b'c-id', b'd-id'])
         wt.commit('added files')
         self.run_bzr_error(('must upgrade your branch at .*a',), 'split a/b')
 

=== modified file 'breezy/tests/blackbox/test_status.py'
--- breezy/tests/blackbox/test_status.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_status.py	2018-03-25 11:39:57 +0000
@@ -491,7 +491,7 @@
     def test_status_out_of_date(self):
         """Simulate status of out-of-date tree after remote push"""
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('a', 'foo\n')])
+        self.build_tree_contents([('a', b'foo\n')])
         tree.lock_write()
         try:
             tree.add(['a'])
@@ -753,11 +753,11 @@
     def test_pending_specific_files(self):
         """With a specific file list, pending merges are not shown."""
         tree = self.make_branch_and_tree('tree')
-        self.build_tree_contents([('tree/a', 'content of a\n')])
+        self.build_tree_contents([('tree/a', b'content of a\n')])
         tree.add('a')
         r1_id = tree.commit('one')
         alt = tree.controldir.sprout('alt').open_workingtree()
-        self.build_tree_contents([('alt/a', 'content of a\nfrom alt\n')])
+        self.build_tree_contents([('alt/a', b'content of a\nfrom alt\n')])
         alt_id = alt.commit('alt')
         tree.merge_from_branch(alt.branch)
         output = self.make_utf8_encoded_stringio()
@@ -774,7 +774,7 @@
         working_tree = self.make_branch_and_tree(u'.')
         filename = u'hell\u00d8'
         try:
-            self.build_tree_contents([(filename, 'contents of hello')])
+            self.build_tree_contents([(filename, b'contents of hello')])
         except UnicodeEncodeError:
             raise TestSkipped("can't build unicode working tree in "
                 "filesystem encoding %s" % sys.getfilesystemencoding())

=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_switch.py	2018-03-25 11:39:57 +0000
@@ -317,7 +317,7 @@
     def test_create_branch(self):
         branch = self.make_branch('branch')
         tree = branch.create_checkout('tree', lightweight=True)
-        tree.commit('one', rev_id='rev-1')
+        tree.commit('one', rev_id=b'rev-1')
         self.run_bzr('switch --create-branch ../branch2', working_dir='tree')
         tree = WorkingTree.open('tree')
         self.assertEndsWith(tree.branch.base, '/branch2/')
@@ -325,7 +325,7 @@
     def test_create_branch_local(self):
         branch = self.make_branch('branch')
         tree = branch.create_checkout('tree', lightweight=True)
-        tree.commit('one', rev_id='rev-1')
+        tree.commit('one', rev_id=b'rev-1')
         self.run_bzr('switch --create-branch branch2', working_dir='tree')
         tree = WorkingTree.open('tree')
         # The new branch should have been created at the same level as
@@ -335,7 +335,7 @@
     def test_create_branch_short_name(self):
         branch = self.make_branch('branch')
         tree = branch.create_checkout('tree', lightweight=True)
-        tree.commit('one', rev_id='rev-1')
+        tree.commit('one', rev_id=b'rev-1')
         self.run_bzr('switch -b branch2', working_dir='tree')
         tree = WorkingTree.open('tree')
         # The new branch should have been created at the same level as
@@ -385,13 +385,13 @@
 
         # create a source branch
         a_tree = self.make_branch_and_tree('a')
-        self.build_tree_contents([('a/a', 'initial\n')])
+        self.build_tree_contents([('a/a', b'initial\n')])
         a_tree.add('a')
         a_tree.commit(message='initial')
 
         # clone and add a differing revision
         b_tree = a_tree.controldir.sprout('b').open_workingtree()
-        self.build_tree_contents([('b/a', 'initial\nmore\n')])
+        self.build_tree_contents([('b/a', b'initial\nmore\n')])
         b_tree.commit(message='more')
 
         self.run_bzr('checkout --lightweight a checkout')

=== modified file 'breezy/tests/blackbox/test_tags.py'
--- breezy/tests/blackbox/test_tags.py	2017-06-10 00:17:06 +0000
+++ breezy/tests/blackbox/test_tags.py	2018-03-25 11:39:57 +0000
@@ -58,7 +58,7 @@
     def test_tag_current_rev(self):
         t = self.make_branch_and_tree('branch')
         t.commit(allow_pointless=True, message='initial commit',
-            rev_id='first-revid')
+            rev_id=b'first-revid')
         # make a tag through the command line
         out, err = self.run_bzr('tag -d branch NEWTAG')
         self.assertContainsRe(err, 'Created tag NEWTAG.')
@@ -85,9 +85,9 @@
     def test_tag_same_revision(self):
         t = self.make_branch_and_tree('branch')
         t.commit(allow_pointless=True, message='initial commit',
-            rev_id='first-revid')
+            rev_id=b'first-revid')
         t.commit(allow_pointless=True, message='second commit',
-            rev_id='second-revid')
+            rev_id=b'second-revid')
         out, err = self.run_bzr('tag -rrevid:first-revid -d branch NEWTAG')
         out, err = self.run_bzr('tag -rrevid:first-revid -d branch NEWTAG')
         self.assertContainsRe(err,
@@ -103,7 +103,7 @@
     def test_branch_push_pull_merge_copies_tags(self):
         t = self.make_branch_and_tree('branch1')
         t.commit(allow_pointless=True, message='initial commit',
-            rev_id='first-revid')
+            rev_id=b'first-revid')
         b1 = t.branch
         b1.tags.set_tag('tag1', 'first-revid')
         # branching copies the tag across
@@ -120,7 +120,7 @@
         self.assertEqual(b2.tags.lookup_tag('tag3'), 'san')
         # make a new tag and merge it
         t.commit(allow_pointless=True, message='second commit',
-            rev_id='second-revid')
+            rev_id=b'second-revid')
         t2 = WorkingTree.open('branch2')
         t2.commit(allow_pointless=True, message='commit in second')
         b1.tags.set_tag('tag4', 'second-revid')
@@ -133,7 +133,7 @@
 
     def make_master_and_checkout(self):
         builder = self.make_branch_builder('master')
-        builder.build_commit(message='Initial commit.', rev_id='rev-1')
+        builder.build_commit(message='Initial commit.', rev_id=b'rev-1')
         master = builder.get_branch()
         child = master.create_checkout(self.get_url('child'))
         return master, child
@@ -142,9 +142,9 @@
         fork = branch.create_clone_on_transport(self.get_transport('fork'))
         self.addCleanup(fork.lock_write().unlock)
         with transform.TransformPreview(fork.basis_tree()) as tt:
-            tt.commit(fork, message='Commit in fork.', revision_id='fork-0')
+            tt.commit(fork, message='Commit in fork.', revision_id=b'fork-0')
         with transform.TransformPreview(fork.basis_tree()) as tt:
-            tt.commit(fork, message='Commit in fork.', revision_id='fork-1')
+            tt.commit(fork, message='Commit in fork.', revision_id=b'fork-1')
         return fork
 
     def test_merge_without_commit_does_not_propagate_tags_to_master(self):
@@ -208,9 +208,9 @@
     def test_list_tags(self):
         tree1 = self.make_branch_and_tree('branch1')
         tree1.commit(allow_pointless=True, message='revision 1',
-                rev_id='revid-1', timestamp=10)
+                rev_id=b'revid-1', timestamp=10)
         tree1.commit(allow_pointless=True, message='revision 2',
-                rev_id='revid-2', timestamp=15)
+                rev_id=b'revid-2', timestamp=15)
 
         b1 = tree1.branch
         # note how the tag for revid-1 sorts after the one for revid-2
@@ -254,14 +254,14 @@
         # now test dotted revnos
         tree2 = tree1.controldir.sprout('branch2').open_workingtree()
         tree1.commit(allow_pointless=True, message='revision 3 in branch1',
-                rev_id='revid-3a')
+                rev_id=b'revid-3a')
         tree2.commit(allow_pointless=True, message='revision 3 in branch2',
-                rev_id='revid-3b')
+                rev_id=b'revid-3b')
 
         b2 = tree2.branch
         b2.tags.set_tag('tagD', 'revid-3b')
         self.run_bzr('merge -d branch1 branch2')
-        tree1.commit('merge', rev_id='revid-4')
+        tree1.commit('merge', rev_id=b'revid-4')
 
         out, err = self.run_bzr('tags -d branch1', encoding='utf-8')
         self.assertEqual(err, '')
@@ -284,13 +284,13 @@
     def test_list_tags_revision_filtering(self):
         tree1 = self.make_branch_and_tree('.')
         tree1.commit(allow_pointless=True, message='revision 1',
-                rev_id='revid-1')
+                rev_id=b'revid-1')
         tree1.commit(allow_pointless=True, message='revision 2',
-                rev_id='revid-2')
+                rev_id=b'revid-2')
         tree1.commit(allow_pointless=True, message='revision 3',
-                rev_id='revid-3')
+                rev_id=b'revid-3')
         tree1.commit(allow_pointless=True, message='revision 4',
-                rev_id='revid-4')
+                rev_id=b'revid-4')
         b1 = tree1.branch
         b1.tags.set_tag(u'tag 1', 'revid-1')
         b1.tags.set_tag(u'tag 2', 'revid-2')
@@ -324,9 +324,9 @@
 
         tree1 = self.make_branch_and_tree('branch1')
         tree1.commit(allow_pointless=True, message='revision 1',
-                rev_id='revid-1', timestamp=10)
+                rev_id=b'revid-1', timestamp=10)
         tree1.commit(allow_pointless=True, message='revision 2',
-                rev_id='revid-2', timestamp=15)
+                rev_id=b'revid-2', timestamp=15)
 
         b1 = tree1.branch
 
@@ -393,8 +393,8 @@
         tree = self.make_branch_and_tree('tree1')
         tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
         tree.add('')
-        tree.commit('msg1', rev_id='rev1')
-        tree.commit('msg2', rev_id='rev2')
+        tree.commit('msg1', rev_id=b'rev1')
+        tree.commit('msg2', rev_id=b'rev2')
         tree.branch.tags.set_tag('unknown', 'out-of-mainline')
         tree.branch.tags.set_tag('ghost', 'spooky')
         tree.branch.tags.set_tag('tag1', 'rev1')
@@ -414,7 +414,7 @@
     def test_set_tag(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         self.reset_smart_call_log()
@@ -431,7 +431,7 @@
     def test_show_tags(self):
         self.setup_smart_server_with_call_log()
         t = self.make_branch_and_tree('branch')
-        self.build_tree_contents([('branch/foo', 'thecontents')])
+        self.build_tree_contents([('branch/foo', b'thecontents')])
         t.add("foo")
         t.commit("message")
         t.branch.tags.set_tag("sometag", "rev1")

=== modified file 'breezy/tests/blackbox/test_uncommit.py'
--- breezy/tests/blackbox/test_uncommit.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_uncommit.py	2018-03-25 11:39:57 +0000
@@ -35,10 +35,10 @@
         wt = self.make_branch_and_tree('tree')
         self.build_tree(['tree/a', 'tree/b', 'tree/c'])
         wt.add(['a', 'b', 'c'])
-        wt.commit('initial commit', rev_id='a1')
+        wt.commit('initial commit', rev_id=b'a1')
 
-        self.build_tree_contents([('tree/a', 'new contents of a\n')])
-        wt.commit('second commit', rev_id='a2')
+        self.build_tree_contents([('tree/a', b'new contents of a\n')])
+        wt.commit('second commit', rev_id=b'a2')
 
         return wt
 
@@ -163,11 +163,11 @@
 
         tree2 = wt.controldir.sprout('tree2').open_workingtree()
 
-        tree2.commit('unchanged', rev_id='b3')
-        tree2.commit('unchanged', rev_id='b4')
+        tree2.commit('unchanged', rev_id=b'b3')
+        tree2.commit('unchanged', rev_id=b'b4')
 
         wt.merge_from_branch(tree2.branch)
-        wt.commit('merge b4', rev_id='a3')
+        wt.commit('merge b4', rev_id=b'a3')
 
         self.assertEqual(['a3'], wt.get_parent_ids())
 
@@ -179,7 +179,7 @@
     def test_uncommit_pending_merge(self):
         wt = self.create_simple_tree()
         tree2 = wt.controldir.sprout('tree2').open_workingtree()
-        tree2.commit('unchanged', rev_id='b3')
+        tree2.commit('unchanged', rev_id=b'b3')
 
         wt.branch.fetch(tree2.branch)
         wt.set_pending_merges(['b3'])
@@ -192,16 +192,16 @@
         wt = self.create_simple_tree()
 
         tree2 = wt.controldir.sprout('tree2').open_workingtree()
-        tree2.commit('unchanged', rev_id='b3')
+        tree2.commit('unchanged', rev_id=b'b3')
 
         tree3 = wt.controldir.sprout('tree3').open_workingtree()
-        tree3.commit('unchanged', rev_id='c3')
+        tree3.commit('unchanged', rev_id=b'c3')
 
         wt.merge_from_branch(tree2.branch)
-        wt.commit('merge b3', rev_id='a3')
+        wt.commit('merge b3', rev_id=b'a3')
 
         wt.merge_from_branch(tree3.branch)
-        wt.commit('merge c3', rev_id='a4')
+        wt.commit('merge c3', rev_id=b'a4')
 
         self.assertEqual(['a4'], wt.get_parent_ids())
 
@@ -214,13 +214,13 @@
         wt = self.create_simple_tree()
 
         tree2 = wt.controldir.sprout('tree2').open_workingtree()
-        tree2.commit('unchanged', rev_id='b3')
+        tree2.commit('unchanged', rev_id=b'b3')
         tree3 = wt.controldir.sprout('tree3').open_workingtree()
-        tree3.commit('unchanged', rev_id='c3')
+        tree3.commit('unchanged', rev_id=b'c3')
 
         wt.branch.fetch(tree2.branch)
         wt.set_pending_merges(['b3'])
-        wt.commit('merge b3', rev_id='a3')
+        wt.commit('merge b3', rev_id=b'a3')
 
 
         wt.merge_from_branch(tree3.branch)
@@ -255,19 +255,19 @@
         tree2 = wt.controldir.sprout('tree2').open_workingtree()
         tree3 = wt.controldir.sprout('tree3').open_workingtree()
 
-        tree2.commit('unchanged', rev_id='b3')
-        tree3.commit('unchanged', rev_id='c3')
+        tree2.commit('unchanged', rev_id=b'b3')
+        tree3.commit('unchanged', rev_id=b'c3')
 
         wt.merge_from_branch(tree2.branch)
         wt.merge_from_branch(tree3.branch, force=True)
-        wt.commit('merge b3, c3', rev_id='a3')
+        wt.commit('merge b3, c3', rev_id=b'a3')
 
-        tree2.commit('unchanged', rev_id='b4')
-        tree3.commit('unchanged', rev_id='c4')
+        tree2.commit('unchanged', rev_id=b'b4')
+        tree3.commit('unchanged', rev_id=b'c4')
 
         wt.merge_from_branch(tree3.branch)
         wt.merge_from_branch(tree2.branch, force=True)
-        wt.commit('merge b4, c4', rev_id='a4')
+        wt.commit('merge b4, c4', rev_id=b'a4')
 
         self.assertEqual(['a4'], wt.get_parent_ids())
 
@@ -327,7 +327,7 @@
         wt = self.make_branch_and_tree('test')
         self.build_tree(['test/a/', 'test/a/b', 'test/a/c'])
         wt.add(['a', 'a/b', 'a/c'])
-        wt.commit('initial commit', rev_id='a1')
+        wt.commit('initial commit', rev_id=b'a1')
         wt.remove(['a/b', 'a/c'])
-        wt.commit('remove b and c', rev_id='a2')
+        wt.commit('remove b and c', rev_id=b'a2')
         self.run_bzr("uncommit --force test")

=== modified file 'breezy/tests/blackbox/test_unknowns.py'
--- breezy/tests/blackbox/test_unknowns.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_unknowns.py	2018-03-25 11:39:57 +0000
@@ -31,7 +31,7 @@
         self.assertEqual(self.run_bzr('unknowns')[0], '')
 
         # single unknown file
-        self.build_tree_contents([('a', 'contents of a\n')])
+        self.build_tree_contents([('a', b'contents of a\n')])
         self.assertEqual(self.run_bzr('unknowns')[0], 'a\n')
 
         # multiple unknown files, including one with a space in its name

=== modified file 'breezy/tests/blackbox/test_update.py'
--- breezy/tests/blackbox/test_update.py	2017-11-12 13:53:51 +0000
+++ breezy/tests/blackbox/test_update.py	2018-03-25 11:39:57 +0000
@@ -192,7 +192,7 @@
         master = self.make_branch_and_tree('master')
         self.build_tree(['master/file'])
         master.add(['file'])
-        master.commit('one', rev_id='m1')
+        master.commit('one', rev_id=b'm1')
 
         self.build_tree(['checkout1/'])
         checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
@@ -203,12 +203,12 @@
         other = master.controldir.sprout('other').open_workingtree()
         self.build_tree(['other/file2'])
         other.add(['file2'])
-        other.commit('other2', rev_id='o2')
+        other.commit('other2', rev_id=b'o2')
 
         # Create a new commit in the master branch
         self.build_tree(['master/file3'])
         master.add(['file3'])
-        master.commit('f3', rev_id='m2')
+        master.commit('f3', rev_id=b'm2')
 
         # Merge the other branch into checkout
         os.chdir('checkout1')
@@ -248,7 +248,7 @@
         master = self.make_branch_and_tree('master')
         self.build_tree(['master/file'])
         master.add(['file'])
-        master.commit('one', rev_id='m1')
+        master.commit('one', rev_id=b'm1')
 
         self.build_tree(['checkout1/'])
         checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
@@ -259,7 +259,7 @@
         other = master.controldir.sprout('other').open_workingtree()
         self.build_tree(['other/file2'])
         other.add(['file2'])
-        other.commit('other2', rev_id='o2')
+        other.commit('other2', rev_id=b'o2')
 
         # Merge the other branch into checkout -  'start reviewing a patch'
         checkout1.merge_from_branch(other.branch)
@@ -267,7 +267,7 @@
 
         # Create a new commit in the master branch - 'someone else lands its'
         master.merge_from_branch(other.branch)
-        master.commit('f3', rev_id='m2')
+        master.commit('f3', rev_id=b'm2')
 
         # This should not report about local commits being pending
         # merges, because they were real merges (but are now gone).
@@ -286,10 +286,10 @@
         os.chdir('master')
         self.build_tree(['./file1'])
         master.add(['file1'])
-        master.commit('one', rev_id='m1')
+        master.commit('one', rev_id=b'm1')
         self.build_tree(['./file2'])
         master.add(['file2'])
-        master.commit('two', rev_id='m2')
+        master.commit('two', rev_id=b'm2')
 
         sr = ScriptRunner()
         sr.run_script(self, '''
@@ -308,19 +308,19 @@
         master = self.make_branch_and_tree('master')
         self.build_tree(['master/file1'])
         master.add(['file1'])
-        master.commit('one', rev_id='m1')
+        master.commit('one', rev_id=b'm1')
 
         # Create a second branch, with extra commits
         other = master.controldir.sprout('other').open_workingtree()
         self.build_tree(['other/file2', 'other/file3'])
         other.add(['file2'])
-        other.commit('other2', rev_id='o2')
+        other.commit('other2', rev_id=b'o2')
         other.add(['file3'])
-        other.commit('other3', rev_id='o3')
+        other.commit('other3', rev_id=b'o3')
 
         os.chdir('master')
         self.run_bzr('merge ../other')
-        master.commit('merge', rev_id='merge')
+        master.commit('merge', rev_id=b'merge')
 
         # Switch to o2. file3 was added only in o3 and should be deleted.
         out, err = self.run_bzr('update -r revid:o2')
@@ -340,14 +340,14 @@
         master = self.make_branch_and_tree('master')
         self.build_tree(['master/file1'])
         master.add(['file1'])
-        master.commit('one', rev_id='m1')
+        master.commit('one', rev_id=b'm1')
 
         self.run_bzr('checkout master checkout')
 
         # add a revision in the master.
         self.build_tree(['master/file2'])
         master.add(['file2'])
-        master.commit('two', rev_id='m2')
+        master.commit('two', rev_id=b'm2')
 
         os.chdir('checkout')
         sr = ScriptRunner()
@@ -400,9 +400,9 @@
         """"Launchpad bug 113809 in brz "update performs two merges"
         https://launchpad.net/bugs/113809"""
         master = self.make_branch_and_tree('master')
-        self.build_tree_contents([('master/file', 'initial contents\n')])
+        self.build_tree_contents([('master/file', b'initial contents\n')])
         master.add(['file'])
-        master.commit('one', rev_id='m1')
+        master.commit('one', rev_id=b'm1')
 
         checkout = master.branch.create_checkout('checkout')
         lightweight = checkout.branch.create_checkout('lightweight',
@@ -410,19 +410,19 @@
 
         # time to create a mess
         # add a commit to the master
-        self.build_tree_contents([('master/file', 'master\n')])
-        master.commit('two', rev_id='m2')
-        self.build_tree_contents([('master/file', 'master local changes\n')])
+        self.build_tree_contents([('master/file', b'master\n')])
+        master.commit('two', rev_id=b'm2')
+        self.build_tree_contents([('master/file', b'master local changes\n')])
 
         # local commit on the checkout
-        self.build_tree_contents([('checkout/file', 'checkout\n')])
-        checkout.commit('tree', rev_id='c2', local=True)
+        self.build_tree_contents([('checkout/file', b'checkout\n')])
+        checkout.commit('tree', rev_id=b'c2', local=True)
         self.build_tree_contents([('checkout/file',
-                                   'checkout local changes\n')])
+                                   b'checkout local changes\n')])
 
         # lightweight 
         self.build_tree_contents([('lightweight/file',
-                                   'lightweight local changes\n')])
+                                   b'lightweight local changes\n')])
 
         # now update (and get conflicts)
         out, err = self.run_bzr('update lightweight', retcode=1)
@@ -439,7 +439,7 @@
 
         # resolve it
         self.build_tree_contents([('lightweight/file',
-                                   'lightweight+checkout\n')])
+                                   b'lightweight+checkout\n')])
         self.run_bzr('resolve lightweight/file')
 
         # check we get the second conflict
@@ -466,7 +466,7 @@
         """
         self.make_branch_and_tree('.')
         self.build_tree_contents([('a/',),
-            ('a/file', 'content')])
+            ('a/file', b'content')])
         sr = ScriptRunner()
         sr.run_script(self, '''
             $ brz update ./a

=== modified file 'breezy/tests/blackbox/test_verify_signatures.py'
--- breezy/tests/blackbox/test_verify_signatures.py	2017-05-21 18:10:28 +0000
+++ breezy/tests/blackbox/test_verify_signatures.py	2018-03-25 11:39:57 +0000
@@ -37,13 +37,13 @@
 
     def setup_tree(self, location='.'):
         wt = self.make_branch_and_tree(location)
-        wt.commit("base A", allow_pointless=True, rev_id='A')
-        wt.commit("base B", allow_pointless=True, rev_id='B')
-        wt.commit("base C", allow_pointless=True, rev_id='C')