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

  • Committer: Jelmer Vernooij
  • Date: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/branch.py
16
16
 
17
17
"""Weave-era branch implementations."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
from ... import (
22
20
    errors,
23
21
    lockable_files,
55
53
        self.repository.lock_write()
56
54
        try:
57
55
            return BranchWriteLockResult(self.unlock,
58
 
                self.control_files.lock_write(token=token))
 
56
                                         self.control_files.lock_write(token=token))
59
57
        except:
60
58
            self.repository.unlock()
61
59
            raise
148
146
        if not [isinstance(a_controldir._format, format) for format in
149
147
                self._compatible_bzrdirs]:
150
148
            raise errors.IncompatibleFormat(self, a_controldir._format)
151
 
        utf8_files = [('revision-history', ''),
152
 
                      ('branch-name', ''),
 
149
        utf8_files = [('revision-history', b''),
 
150
                      ('branch-name', b''),
153
151
                      ]
154
152
        mutter('creating branch %r in %s', self, a_controldir.user_url)
155
153
        branch_transport = a_controldir.get_branch_transport(self, name=name)
156
154
        control_files = lockable_files.LockableFiles(branch_transport,
157
 
            'branch-lock', lockable_files.TransportLock)
 
155
                                                     'branch-lock', lockable_files.TransportLock)
158
156
        control_files.create_lock()
159
157
        try:
160
158
            control_files.lock_write()
171
169
            if lock_taken:
172
170
                control_files.unlock()
173
171
        branch = self.open(a_controldir, name, _found=True,
174
 
                found_repository=None)
 
172
                           found_repository=None)
175
173
        self._run_post_branch_init_hooks(a_controldir, name, branch)
176
174
        return branch
177
175
 
182
180
            )
183
181
        self._matchingcontroldir = BzrDirFormat6()
184
182
        self._compatible_bzrdirs = [BzrDirFormat4, BzrDirFormat5,
185
 
            BzrDirFormat6]
 
183
                                    BzrDirFormat6]
186
184
 
187
185
    def network_name(self):
188
186
        """The network name for this format is the control dirs disk label."""
192
190
        return "Branch format 4"
193
191
 
194
192
    def open(self, a_controldir, name=None, _found=False, ignore_fallbacks=False,
195
 
            found_repository=None, possible_transports=None):
 
193
             found_repository=None, possible_transports=None):
196
194
        """See BranchFormat.open()."""
197
195
        if name is None:
198
196
            name = a_controldir._get_selected_branch()
204
202
        if found_repository is None:
205
203
            found_repository = a_controldir.open_repository()
206
204
        return BzrBranch4(_format=self,
207
 
                         _control_files=a_controldir._control_files,
208
 
                         a_controldir=a_controldir,
209
 
                         name=name,
210
 
                         _repository=found_repository,
211
 
                         possible_transports=possible_transports)
 
205
                          _control_files=a_controldir._control_files,
 
206
                          a_controldir=a_controldir,
 
207
                          name=name,
 
208
                          _repository=found_repository,
 
209
                          possible_transports=possible_transports)
212
210
 
213
211
    def __str__(self):
214
212
        return "Bazaar-NG branch format 4"
215
213
 
216
214
    def supports_leaving_lock(self):
217
215
        return False
 
216
 
 
217
    supports_reference_locations = False