← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2016-04-03 16:32:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6617.
  • Revision ID: jelmer@jelmer.uk-20160403163231-h72bo0uyek2gikw0
https://launchpad.net/bugs/1565503
Don't put French text in doc/en/user-reference when LANGUAGE=fr_CH.UTF_8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/branch.py
16
16
 
17
17
"""Weave-era branch implementations."""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
from bzrlib import (
20
22
    errors,
21
23
    lockable_files,
22
24
    )
23
25
 
 
26
from bzrlib.decorators import (
 
27
    needs_read_lock,
 
28
    needs_write_lock,
 
29
    only_raises,
 
30
    )
 
31
from bzrlib.lock import LogicalLockResult
24
32
from bzrlib.trace import mutter
25
33
 
26
34
from bzrlib.branch import (
27
35
    BranchFormat,
 
36
    BranchWriteLockResult,
 
37
    )
 
38
from bzrlib.branchfmt.fullhistory import (
28
39
    FullHistoryBzrBranch,
29
40
    )
30
41
 
32
43
class BzrBranch4(FullHistoryBzrBranch):
33
44
    """Branch format 4."""
34
45
 
35
 
    def _get_checkout_format(self):
 
46
    def lock_write(self, token=None):
 
47
        """Lock the branch for write operations.
 
48
 
 
49
        :param token: A token to permit reacquiring a previously held and
 
50
            preserved lock.
 
51
        :return: A BranchWriteLockResult.
 
52
        """
 
53
        if not self.is_locked():
 
54
            self._note_lock('w')
 
55
        # All-in-one needs to always unlock/lock.
 
56
        self.repository._warn_if_deprecated(self)
 
57
        self.repository.lock_write()
 
58
        try:
 
59
            return BranchWriteLockResult(self.unlock,
 
60
                self.control_files.lock_write(token=token))
 
61
        except:
 
62
            self.repository.unlock()
 
63
            raise
 
64
 
 
65
    def lock_read(self):
 
66
        """Lock the branch for read operations.
 
67
 
 
68
        :return: A bzrlib.lock.LogicalLockResult.
 
69
        """
 
70
        if not self.is_locked():
 
71
            self._note_lock('r')
 
72
        # All-in-one needs to always unlock/lock.
 
73
        self.repository._warn_if_deprecated(self)
 
74
        self.repository.lock_read()
 
75
        try:
 
76
            self.control_files.lock_read()
 
77
            return LogicalLockResult(self.unlock)
 
78
        except:
 
79
            self.repository.unlock()
 
80
            raise
 
81
 
 
82
    @only_raises(errors.LockNotHeld, errors.LockBroken)
 
83
    def unlock(self):
 
84
        if self.control_files._lock_count == 2 and self.conf_store is not None:
 
85
            self.conf_store.save_changes()
 
86
        try:
 
87
            self.control_files.unlock()
 
88
        finally:
 
89
            # All-in-one needs to always unlock/lock.
 
90
            self.repository.unlock()
 
91
            if not self.control_files.is_locked():
 
92
                # we just released the lock
 
93
                self._clear_cached_state()
 
94
 
 
95
    def _get_checkout_format(self, lightweight=False):
36
96
        """Return the most suitable metadir for a checkout of this branch.
37
97
        """
38
98
        from bzrlib.plugins.weave_fmt.repository import RepositoryFormat7
39
99
        from bzrlib.bzrdir import BzrDirMetaFormat1
40
100
        format = BzrDirMetaFormat1()
41
 
        format.repository_format = RepositoryFormat7()
 
101
        if lightweight:
 
102
            format.set_branch_format(self._format)
 
103
            format.repository_format = self.bzrdir._format.repository_format
 
104
        else:
 
105
            format.repository_format = RepositoryFormat7()
42
106
        return format
43
107
 
44
108
    def unbind(self):
70
134
    It does not support binding.
71
135
    """
72
136
 
73
 
    def initialize(self, a_bzrdir, name=None, repository=None):
 
137
    def initialize(self, a_bzrdir, name=None, repository=None,
 
138
                   append_revisions_only=None):
74
139
        """Create a branch of this format in a_bzrdir.
75
140
 
76
141
        :param a_bzrdir: The bzrdir to initialize the branch in
77
142
        :param name: Name of colocated branch to create, if any
78
143
        :param repository: Repository for this branch (unused)
79
144
        """
 
145
        if append_revisions_only:
 
146
            raise errors.UpgradeRequired(a_bzrdir.user_url)
80
147
        if repository is not None:
81
148
            raise NotImplementedError(
82
149
                "initialize(repository=<not None>) on %r" % (self,))
127
194
        return "Branch format 4"
128
195
 
129
196
    def open(self, a_bzrdir, name=None, _found=False, ignore_fallbacks=False,
130
 
            found_repository=None):
 
197
            found_repository=None, possible_transports=None):
131
198
        """See BranchFormat.open()."""
132
 
        if name is not None:
 
199
        if name is None:
 
200
            name = a_bzrdir._get_selected_branch()
 
201
        if name != "":
133
202
            raise errors.NoColocatedBranchSupport(self)
134
203
        if not _found:
135
204
            # we are being called directly and must probe.
140
209
                         _control_files=a_bzrdir._control_files,
141
210
                         a_bzrdir=a_bzrdir,
142
211
                         name=name,
143
 
                         _repository=found_repository)
 
212
                         _repository=found_repository,
 
213
                         possible_transports=possible_transports)
144
214
 
145
215
    def __str__(self):
146
216
        return "Bazaar-NG branch format 4"