~bzr-pqm/bzr/bzr.dev

5218.2.2 by John Arbash Meinel
Bring in the global chk change, which includes some more bzr.dev code.
1
# Copyright (C) 2006-2010 Canonical Ltd
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
16
17
"""Server-side branch related request implmentations."""
18
19
5227.1.2 by Andrew Bennetts
Add Branch.set_config_option_dict RPC (and VFS fallback), fixes #430382.
20
from bzrlib import (
21
    bencode,
22
    errors,
23
    )
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
24
from bzrlib.bzrdir import BzrDir
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
25
from bzrlib.smart.request import (
26
    FailedSmartServerResponse,
27
    SmartServerRequest,
28
    SuccessfulSmartServerResponse,
29
    )
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
30
31
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
32
class SmartServerBranchRequest(SmartServerRequest):
2692.1.10 by Andrew Bennetts
More docstring polish
33
    """Base class for handling common branch request logic.
34
    """
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
35
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
36
    def do(self, path, *args):
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
37
        """Execute a request for a branch at path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
38
2692.1.10 by Andrew Bennetts
More docstring polish
39
        All Branch requests take a path to the branch as their first argument.
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
40
41
        If the branch is a branch reference, NotBranchError is raised.
2692.1.10 by Andrew Bennetts
More docstring polish
42
43
        :param path: The path for the repository as received from the
44
            client.
45
        :return: A SmartServerResponse from self.do_with_branch().
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
46
        """
2692.1.1 by Andrew Bennetts
Add translate_client_path method to SmartServerRequest.
47
        transport = self.transport_from_client_path(path)
2018.5.38 by Robert Collins
Implement RemoteBranch.revision_history().
48
        bzrdir = BzrDir.open_from_transport(transport)
49
        if bzrdir.get_branch_reference() is not None:
50
            raise errors.NotBranchError(transport.base)
4160.2.6 by Andrew Bennetts
Add ignore_fallbacks flag.
51
        branch = bzrdir.open_branch(ignore_fallbacks=True)
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
52
        return self.do_with_branch(branch, *args)
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
53
54
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
55
class SmartServerLockedBranchRequest(SmartServerBranchRequest):
56
    """Base class for handling common branch request logic for requests that
57
    need a write lock.
58
    """
59
60
    def do_with_branch(self, branch, branch_token, repo_token, *args):
61
        """Execute a request for a branch.
62
63
        A write lock will be acquired with the given tokens for the branch and
64
        repository locks.  The lock will be released once the request is
65
        processed.  The physical lock state won't be changed.
66
        """
67
        # XXX: write a test for LockContention
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
68
        branch.repository.lock_write(token=repo_token)
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
69
        try:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
70
            branch.lock_write(token=branch_token)
71
            try:
72
                return self.do_with_locked_branch(branch, *args)
73
            finally:
74
                branch.unlock()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
75
        finally:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
76
            branch.repository.unlock()
2018.14.1 by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures.
77
78
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
79
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
80
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
81
    def do_with_branch(self, branch):
3407.2.1 by Martin Pool
Deprecate LockableFiles.get
82
        """Return the content of branch.conf
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
83
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
84
        The body is not utf8 decoded - its the literal bytestream from disk.
85
        """
86
        try:
3407.2.14 by Martin Pool
Remove more cases of getting transport via control_files
87
            content = branch._transport.get_bytes('branch.conf')
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
88
        except errors.NoSuchFile:
89
            content = ''
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
90
        return SuccessfulSmartServerResponse( ('ok', ), content)
2018.5.59 by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil).
91
92
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
93
class SmartServerBranchGetParent(SmartServerBranchRequest):
94
95
    def do_with_branch(self, branch):
96
        """Return the parent of branch."""
97
        parent = branch._get_parent_location() or ''
4083.1.4 by Andrew Bennetts
Fix trivial bug in get_parent RPC.
98
        return SuccessfulSmartServerResponse((parent,))
4078.2.1 by Robert Collins
Add a Branch.get_parent remote call for RemoteBranch.
99
100
4084.2.1 by Robert Collins
Make accessing a branch.tags.get_tag_dict use a smart[er] method rather than VFS calls and real objects.
101
class SmartServerBranchGetTagsBytes(SmartServerBranchRequest):
102
103
    def do_with_branch(self, branch):
104
        """Return the _get_tags_bytes for a branch."""
105
        bytes = branch._get_tags_bytes()
106
        return SuccessfulSmartServerResponse((bytes,))
107
108
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
109
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):
110
4760.1.1 by Andrew Bennetts
Add optional jail_root argument to SmartServerRequest and friends, and use it in the WSGI glue. Allows opening branches in shared repos via bzr+http (assuming the repo should be accessible).
111
    def __init__(self, backing_transport, root_client_path='/', jail_root=None):
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
112
        SmartServerLockedBranchRequest.__init__(
4760.1.1 by Andrew Bennetts
Add optional jail_root argument to SmartServerRequest and friends, and use it in the WSGI glue. Allows opening branches in shared repos via bzr+http (assuming the repo should be accessible).
113
            self, backing_transport, root_client_path, jail_root)
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
114
        self.locked = False
115
        
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
116
    def do_with_locked_branch(self, branch):
4556.2.4 by Andrew Bennetts
Add NEWS entry, docstring.
117
        """Call _set_tags_bytes for a branch.
118
119
        New in 1.18.
120
        """
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
121
        # We need to keep this branch locked until we get a body with the tags
122
        # bytes.
123
        self.branch = branch
124
        self.branch.lock_write()
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
125
        self.locked = True
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
126
127
    def do_body(self, bytes):
128
        self.branch._set_tags_bytes(bytes)
129
        return SuccessfulSmartServerResponse(())
130
131
    def do_end(self):
4556.2.8 by Andrew Bennetts
Add TODO comment.
132
        # TODO: this request shouldn't have to do this housekeeping manually.
133
        # Some of this logic probably belongs in a base class.
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
134
        if not self.locked:
135
            # We never acquired the branch successfully in the first place, so
136
            # there's nothing more to do.
137
            return
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
138
        try:
139
            return SmartServerLockedBranchRequest.do_end(self)
140
        finally:
4556.2.2 by Andrew Bennetts
Handle failures more gracefully.
141
            # Only try unlocking if we locked successfully in the first place
4556.2.1 by Andrew Bennetts
Add Branch.set_tags_bytes RPC, with HPSS call count acceptance test. Also fixes serialisation of LockDir, and uses external_url() in LockDir's repr and contention message.
142
            self.branch.unlock()
143
144
3691.2.5 by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same
145
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
146
147
    def do_with_branch(self, branch):
148
        stacked_on_url = branch.get_stacked_on_url()
149
        return SuccessfulSmartServerResponse(('ok', stacked_on_url))
150
151
2018.5.49 by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to
152
class SmartServerRequestRevisionHistory(SmartServerBranchRequest):
153
154
    def do_with_branch(self, branch):
155
        """Get the revision history for the branch.
156
157
        The revision list is returned as the body content,
158
        with each revision utf8 encoded and \x00 joined.
159
        """
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
160
        return SuccessfulSmartServerResponse(
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
161
            ('ok', ), ('\x00'.join(branch.revision_history())))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
162
163
164
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
165
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
166
    def do_with_branch(self, branch):
167
        """Return branch.last_revision_info().
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
168
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
169
        The revno is encoded in decimal, the revision_id is encoded as utf8.
170
        """
171
        revno, last_revision = branch.last_revision_info()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
172
        return SuccessfulSmartServerResponse(('ok', str(revno), last_revision))
2018.5.50 by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method.
173
174
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
175
class SmartServerSetTipRequest(SmartServerLockedBranchRequest):
176
    """Base class for handling common branch request logic for requests that
177
    update the branch tip.
178
    """
179
180
    def do_with_locked_branch(self, branch, *args):
181
        try:
182
            return self.do_tip_change_with_locked_branch(branch, *args)
183
        except errors.TipChangeRejected, e:
184
            msg = e.msg
185
            if isinstance(msg, unicode):
186
                msg = msg.encode('utf-8')
187
            return FailedSmartServerResponse(('TipChangeRejected', msg))
188
189
4226.2.1 by Robert Collins
Set branch config options via a smart method.
190
class SmartServerBranchRequestSetConfigOption(SmartServerLockedBranchRequest):
191
    """Set an option in the branch configuration."""
192
193
    def do_with_locked_branch(self, branch, value, name, section):
194
        if not section:
195
            section = None
4226.2.2 by Robert Collins
Fix setting config options to support unicode values and don't attempt to reset repositories _fallback_repositories as the simple approach fails to work.
196
        branch._get_config().set_option(value.decode('utf8'), name, section)
4226.2.1 by Robert Collins
Set branch config options via a smart method.
197
        return SuccessfulSmartServerResponse(())
198
199
5227.1.2 by Andrew Bennetts
Add Branch.set_config_option_dict RPC (and VFS fallback), fixes #430382.
200
class SmartServerBranchRequestSetConfigOptionDict(SmartServerLockedBranchRequest):
201
    """Set an option in the branch configuration.
202
    
203
    New in 2.2.
204
    """
205
206
    def do_with_locked_branch(self, branch, value_dict, name, section):
207
        utf8_dict = bencode.bdecode(value_dict)
208
        value_dict = {}
209
        for key, value in utf8_dict.items():
210
            value_dict[key.decode('utf8')] = value.decode('utf8')
211
        if not section:
212
            section = None
213
        branch._get_config().set_option(value_dict, name, section)
214
        return SuccessfulSmartServerResponse(())
215
216
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
217
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
218
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
219
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
2018.5.170 by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire.
220
        if new_last_revision_id == 'null:':
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
221
            branch.set_revision_history([])
222
        else:
2018.5.83 by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs.
223
            if not branch.repository.has_revision(new_last_revision_id):
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
224
                return FailedSmartServerResponse(
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
225
                    ('NoSuchRevision', new_last_revision_id))
4005.2.1 by Robert Collins
Fix RemoteBranch to be used correctly in tests using bzr+ssh, to fire off Branch hooks correctly, and improve the branch_implementations tests to check that making a branch gets the right format under test.
226
            branch.set_revision_history(branch._lefthand_history(
227
                new_last_revision_id, None, None))
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
228
        return SuccessfulSmartServerResponse(('ok',))
2018.12.3 by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it.
229
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
230
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
231
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
232
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
233
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id,
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
234
            allow_divergence, allow_overwrite_descendant):
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
235
        """Set the last revision of the branch.
236
237
        New in 1.6.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
238
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
239
        :param new_last_revision_id: the revision ID to set as the last
240
            revision of the branch.
241
        :param allow_divergence: A flag.  If non-zero, change the revision ID
242
            even if the new_last_revision_id's ancestry has diverged from the
243
            current last revision.  If zero, a 'Diverged' error will be
244
            returned if new_last_revision_id is not a descendant of the current
245
            last revision.
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
246
        :param allow_overwrite_descendant:  A flag.  If zero and
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
247
            new_last_revision_id is not a descendant of the current last
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
248
            revision, then the last revision will not be changed.  If non-zero
249
            and there is no divergence, then the last revision is always
250
            changed.
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
251
252
        :returns: on success, a tuple of ('ok', revno, revision_id), where
253
            revno and revision_id are the new values of the current last
254
            revision info.  The revision_id might be different to the
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
255
            new_last_revision_id if allow_overwrite_descendant was not set.
3441.5.25 by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading.
256
        """
3441.5.28 by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant.
257
        do_not_overwrite_descendant = not allow_overwrite_descendant
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
258
        try:
3441.5.18 by Andrew Bennetts
Fix some test failures.
259
            last_revno, last_rev = branch.last_revision_info()
260
            graph = branch.repository.get_graph()
261
            if not allow_divergence or do_not_overwrite_descendant:
262
                relation = branch._revision_relations(
263
                    last_rev, new_last_revision_id, graph)
264
                if relation == 'diverged' and not allow_divergence:
265
                    return FailedSmartServerResponse(('Diverged',))
266
                if relation == 'a_descends_from_b' and do_not_overwrite_descendant:
267
                    return SuccessfulSmartServerResponse(
268
                        ('ok', last_revno, last_rev))
269
            new_revno = graph.find_distance_to_null(
270
                new_last_revision_id, [(last_rev, last_revno)])
271
            branch.set_last_revision_info(new_revno, new_last_revision_id)
3441.5.23 by Andrew Bennetts
Fix test failures.
272
        except errors.GhostRevisionsHaveNoRevno:
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
273
            return FailedSmartServerResponse(
274
                ('NoSuchRevision', new_last_revision_id))
3441.5.18 by Andrew Bennetts
Fix some test failures.
275
        return SuccessfulSmartServerResponse(
276
            ('ok', new_revno, new_last_revision_id))
3441.5.6 by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests.
277
278
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
279
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest):
3297.4.2 by Andrew Bennetts
Add backwards compatibility for servers older than 1.4.
280
    """Branch.set_last_revision_info.  Sets the revno and the revision ID of
281
    the specified branch.
282
283
    New in bzrlib 1.4.
284
    """
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
285
3577.1.1 by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
286
    def do_tip_change_with_locked_branch(self, branch, new_revno,
287
            new_last_revision_id):
3297.4.3 by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it.
288
        try:
289
            branch.set_last_revision_info(int(new_revno), new_last_revision_id)
290
        except errors.NoSuchRevision:
291
            return FailedSmartServerResponse(
292
                ('NoSuchRevision', new_last_revision_id))
2892.2.1 by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it.
293
        return SuccessfulSmartServerResponse(('ok',))
294
295
4288.1.7 by Robert Collins
Add new remote server verb Branch.set_parent_location, dropping roundtrips further on push operations.
296
class SmartServerBranchRequestSetParentLocation(SmartServerLockedBranchRequest):
297
    """Set the parent location for a branch.
298
    
299
    Takes a location to set, which must be utf8 encoded.
300
    """
301
302
    def do_with_locked_branch(self, branch, location):
303
        branch._set_parent_location(location)
304
        return SuccessfulSmartServerResponse(())
305
306
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
307
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
308
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
309
    def do_with_branch(self, branch, branch_token='', repo_token=''):
310
        if branch_token == '':
311
            branch_token = None
312
        if repo_token == '':
313
            repo_token = None
314
        try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
315
            repo_token = branch.repository.lock_write(
316
                token=repo_token).repository_token
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
317
            try:
5200.3.3 by Robert Collins
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
318
                branch_token = branch.lock_write(
319
                    token=branch_token).branch_token
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
320
            finally:
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
321
                # this leaves the repository with 1 lock
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
322
                branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
323
        except errors.LockContention:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
324
            return FailedSmartServerResponse(('LockContention',))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
325
        except errors.TokenMismatch:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
326
            return FailedSmartServerResponse(('TokenMismatch',))
2018.5.95 by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes.
327
        except errors.UnlockableTransport:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
328
            return FailedSmartServerResponse(('UnlockableTransport',))
2872.5.3 by Martin Pool
Pass back LockFailed from smart server lock methods
329
        except errors.LockFailed, e:
330
            return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why)))
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
331
        if repo_token is None:
332
            repo_token = ''
333
        else:
334
            branch.repository.leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
335
        branch.leave_lock_in_place()
336
        branch.unlock()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
337
        return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
338
339
340
class SmartServerBranchRequestUnlock(SmartServerBranchRequest):
341
342
    def do_with_branch(self, branch, branch_token, repo_token):
343
        try:
2018.5.142 by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens).
344
            branch.repository.lock_write(token=repo_token)
345
            try:
346
                branch.lock_write(token=branch_token)
347
            finally:
348
                branch.repository.unlock()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
349
        except errors.TokenMismatch:
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
350
            return FailedSmartServerResponse(('TokenMismatch',))
3015.2.6 by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories.
351
        if repo_token:
352
            branch.repository.dont_leave_lock_in_place()
2018.5.79 by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations.
353
        branch.dont_leave_lock_in_place()
354
        branch.unlock()
2432.4.5 by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic.
355
        return SuccessfulSmartServerResponse(('ok',))
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
356