/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: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
55
55
        self.repository.lock_write()
56
56
        try:
57
57
            return BranchWriteLockResult(self.unlock,
58
 
                self.control_files.lock_write(token=token))
 
58
                                         self.control_files.lock_write(token=token))
59
59
        except:
60
60
            self.repository.unlock()
61
61
            raise
154
154
        mutter('creating branch %r in %s', self, a_controldir.user_url)
155
155
        branch_transport = a_controldir.get_branch_transport(self, name=name)
156
156
        control_files = lockable_files.LockableFiles(branch_transport,
157
 
            'branch-lock', lockable_files.TransportLock)
 
157
                                                     'branch-lock', lockable_files.TransportLock)
158
158
        control_files.create_lock()
159
159
        try:
160
160
            control_files.lock_write()
171
171
            if lock_taken:
172
172
                control_files.unlock()
173
173
        branch = self.open(a_controldir, name, _found=True,
174
 
                found_repository=None)
 
174
                           found_repository=None)
175
175
        self._run_post_branch_init_hooks(a_controldir, name, branch)
176
176
        return branch
177
177
 
182
182
            )
183
183
        self._matchingcontroldir = BzrDirFormat6()
184
184
        self._compatible_bzrdirs = [BzrDirFormat4, BzrDirFormat5,
185
 
            BzrDirFormat6]
 
185
                                    BzrDirFormat6]
186
186
 
187
187
    def network_name(self):
188
188
        """The network name for this format is the control dirs disk label."""
192
192
        return "Branch format 4"
193
193
 
194
194
    def open(self, a_controldir, name=None, _found=False, ignore_fallbacks=False,
195
 
            found_repository=None, possible_transports=None):
 
195
             found_repository=None, possible_transports=None):
196
196
        """See BranchFormat.open()."""
197
197
        if name is None:
198
198
            name = a_controldir._get_selected_branch()
204
204
        if found_repository is None:
205
205
            found_repository = a_controldir.open_repository()
206
206
        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)
 
207
                          _control_files=a_controldir._control_files,
 
208
                          a_controldir=a_controldir,
 
209
                          name=name,
 
210
                          _repository=found_repository,
 
211
                          possible_transports=possible_transports)
212
212
 
213
213
    def __str__(self):
214
214
        return "Bazaar-NG branch format 4"