/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/bzrrepository.py

  • Committer: Breezy landing bot
  • Author(s): Martin
  • Date: 2017-06-10 02:49:30 UTC
  • mfrom: (6677.1.4 py3_bootstrap)
  • Revision ID: breezy.the.bot@gmail.com-20170610024930-enw8wdbjy9s4dtnm
Progress on Python 3 to get TestCaseWithTransport working

Merged from https://code.launchpad.net/~gz/brz/py3_bootstrap/+merge/325439

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzrrepository.py
132
132
        control_files.lock_write()
133
133
        transport = control_files._transport
134
134
        if shared == True:
135
 
            utf8_files += [('shared-storage', '')]
 
135
            utf8_files += [('shared-storage', b'')]
136
136
        try:
137
137
            transport.mkdir_multi(dirs, mode=a_bzrdir._get_dir_mode())
138
138
            for (filename, content_stream) in files:
155
155
        try:
156
156
            transport = a_bzrdir.get_repository_transport(None)
157
157
            format_string = transport.get_bytes("format")
 
158
            # GZ 2017-06-17: Where should format strings get decoded...
 
159
            format_text = format_string.decode("ascii")
158
160
        except errors.NoSuchFile:
159
161
            raise errors.NoRepositoryPresent(a_bzrdir)
160
 
        return klass._find_format(format_registry, 'repository', format_string)
 
162
        return klass._find_format(format_registry, 'repository', format_text)
161
163
 
162
164
    def check_support_status(self, allow_unsupported, recommend_upgrade=True,
163
165
            basedir=None):