/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/bzr/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-15 13:10:28 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 6993.
  • Revision ID: jelmer@jelmer.uk-20180615131028-abolpmqrid8th0cd
More bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/bzr/branch.py
52
52
from ..lock import _RelockDebugMixin, LogicalLockResult
53
53
from ..sixish import (
54
54
    BytesIO,
 
55
    text_type,
55
56
    viewitems,
56
57
    )
57
58
from ..trace import (
86
87
            raise ValueError('name must be supplied')
87
88
        self.controldir = a_controldir
88
89
        self._user_transport = self.controldir.transport.clone('..')
89
 
        if name != "":
 
90
        if name != u"":
90
91
            self._user_transport.set_segment_parameter(
91
 
                "branch", urlutils.escape(name))
 
92
                "branch", urlutils.escape(name).encode('utf-8'))
92
93
        self._base = self._user_transport.base
93
94
        self.name = name
94
95
        self._format = _format
280
281
        if url is None:
281
282
            self._transport.delete('parent')
282
283
        else:
 
284
            if isinstance(url, text_type):
 
285
                url = url.encode('utf-8')
283
286
            self._transport.put_bytes('parent', url + b'\n',
284
287
                mode=self.controldir._get_file_mode())
285
288