~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

Merge bzr.dev (and fix NEWS)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
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
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
"""Server-side branch related request implmentations."""
18
 
 
19
 
from __future__ import absolute_import
20
 
 
21
 
from bzrlib import (
22
 
    bencode,
23
 
    errors,
24
 
    revision as _mod_revision,
25
 
    )
26
 
from bzrlib.controldir import ControlDir
27
 
from bzrlib.smart.request import (
28
 
    FailedSmartServerResponse,
29
 
    SmartServerRequest,
30
 
    SuccessfulSmartServerResponse,
31
 
    )
32
 
 
33
 
 
34
 
class SmartServerBranchRequest(SmartServerRequest):
35
 
    """Base class for handling common branch request logic.
36
 
    """
37
 
 
38
 
    def do(self, path, *args):
39
 
        """Execute a request for a branch at path.
40
 
 
41
 
        All Branch requests take a path to the branch as their first argument.
42
 
 
43
 
        If the branch is a branch reference, NotBranchError is raised.
44
 
 
45
 
        :param path: The path for the repository as received from the
46
 
            client.
47
 
        :return: A SmartServerResponse from self.do_with_branch().
48
 
        """
49
 
        transport = self.transport_from_client_path(path)
50
 
        controldir = ControlDir.open_from_transport(transport)
51
 
        if controldir.get_branch_reference() is not None:
52
 
            raise errors.NotBranchError(transport.base)
53
 
        branch = controldir.open_branch(ignore_fallbacks=True)
54
 
        return self.do_with_branch(branch, *args)
55
 
 
56
 
 
57
 
class SmartServerLockedBranchRequest(SmartServerBranchRequest):
58
 
    """Base class for handling common branch request logic for requests that
59
 
    need a write lock.
60
 
    """
61
 
 
62
 
    def do_with_branch(self, branch, branch_token, repo_token, *args):
63
 
        """Execute a request for a branch.
64
 
 
65
 
        A write lock will be acquired with the given tokens for the branch and
66
 
        repository locks.  The lock will be released once the request is
67
 
        processed.  The physical lock state won't be changed.
68
 
        """
69
 
        # XXX: write a test for LockContention
70
 
        branch.repository.lock_write(token=repo_token)
71
 
        try:
72
 
            branch.lock_write(token=branch_token)
73
 
            try:
74
 
                return self.do_with_locked_branch(branch, *args)
75
 
            finally:
76
 
                branch.unlock()
77
 
        finally:
78
 
            branch.repository.unlock()
79
 
 
80
 
 
81
 
class SmartServerBranchBreakLock(SmartServerBranchRequest):
82
 
 
83
 
    def do_with_branch(self, branch):
84
 
        """Break a branch lock.
85
 
        """
86
 
        branch.break_lock()
87
 
        return SuccessfulSmartServerResponse(('ok', ), )
88
 
 
89
 
 
90
 
class SmartServerBranchGetConfigFile(SmartServerBranchRequest):
91
 
 
92
 
    def do_with_branch(self, branch):
93
 
        """Return the content of branch.conf
94
 
 
95
 
        The body is not utf8 decoded - its the literal bytestream from disk.
96
 
        """
97
 
        try:
98
 
            content = branch.control_transport.get_bytes('branch.conf')
99
 
        except errors.NoSuchFile:
100
 
            content = ''
101
 
        return SuccessfulSmartServerResponse( ('ok', ), content)
102
 
 
103
 
 
104
 
class SmartServerBranchPutConfigFile(SmartServerBranchRequest):
105
 
    """Set the configuration data for a branch.
106
 
 
107
 
    New in 2.5.
108
 
    """
109
 
 
110
 
    def do_with_branch(self, branch, branch_token, repo_token):
111
 
        """Set the content of branch.conf.
112
 
 
113
 
        The body is not utf8 decoded - its the literal bytestream for disk.
114
 
        """
115
 
        self._branch = branch
116
 
        self._branch_token = branch_token
117
 
        self._repo_token = repo_token
118
 
        # Signal we want a body
119
 
        return None
120
 
 
121
 
    def do_body(self, body_bytes):
122
 
        self._branch.repository.lock_write(token=self._repo_token)
123
 
        try:
124
 
            self._branch.lock_write(token=self._branch_token)
125
 
            try:
126
 
                self._branch.control_transport.put_bytes(
127
 
                    'branch.conf', body_bytes)
128
 
            finally:
129
 
                self._branch.unlock()
130
 
        finally:
131
 
            self._branch.repository.unlock()
132
 
        return SuccessfulSmartServerResponse(('ok', ))
133
 
 
134
 
 
135
 
class SmartServerBranchGetParent(SmartServerBranchRequest):
136
 
 
137
 
    def do_with_branch(self, branch):
138
 
        """Return the parent of branch."""
139
 
        parent = branch._get_parent_location() or ''
140
 
        return SuccessfulSmartServerResponse((parent,))
141
 
 
142
 
 
143
 
class SmartServerBranchGetTagsBytes(SmartServerBranchRequest):
144
 
 
145
 
    def do_with_branch(self, branch):
146
 
        """Return the _get_tags_bytes for a branch."""
147
 
        bytes = branch._get_tags_bytes()
148
 
        return SuccessfulSmartServerResponse((bytes,))
149
 
 
150
 
 
151
 
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):
152
 
 
153
 
    def __init__(self, backing_transport, root_client_path='/', jail_root=None):
154
 
        SmartServerLockedBranchRequest.__init__(
155
 
            self, backing_transport, root_client_path, jail_root)
156
 
        self.locked = False
157
 
        
158
 
    def do_with_locked_branch(self, branch):
159
 
        """Call _set_tags_bytes for a branch.
160
 
 
161
 
        New in 1.18.
162
 
        """
163
 
        # We need to keep this branch locked until we get a body with the tags
164
 
        # bytes.
165
 
        self.branch = branch
166
 
        self.branch.lock_write()
167
 
        self.locked = True
168
 
 
169
 
    def do_body(self, bytes):
170
 
        self.branch._set_tags_bytes(bytes)
171
 
        return SuccessfulSmartServerResponse(())
172
 
 
173
 
    def do_end(self):
174
 
        # TODO: this request shouldn't have to do this housekeeping manually.
175
 
        # Some of this logic probably belongs in a base class.
176
 
        if not self.locked:
177
 
            # We never acquired the branch successfully in the first place, so
178
 
            # there's nothing more to do.
179
 
            return
180
 
        try:
181
 
            return SmartServerLockedBranchRequest.do_end(self)
182
 
        finally:
183
 
            # Only try unlocking if we locked successfully in the first place
184
 
            self.branch.unlock()
185
 
 
186
 
 
187
 
class SmartServerBranchHeadsToFetch(SmartServerBranchRequest):
188
 
 
189
 
    def do_with_branch(self, branch):
190
 
        """Return the heads-to-fetch for a Branch as two bencoded lists.
191
 
        
192
 
        See Branch.heads_to_fetch.
193
 
 
194
 
        New in 2.4.
195
 
        """
196
 
        must_fetch, if_present_fetch = branch.heads_to_fetch()
197
 
        return SuccessfulSmartServerResponse(
198
 
            (list(must_fetch), list(if_present_fetch)))
199
 
 
200
 
 
201
 
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
202
 
 
203
 
    def do_with_branch(self, branch):
204
 
        stacked_on_url = branch.get_stacked_on_url()
205
 
        return SuccessfulSmartServerResponse(('ok', stacked_on_url))
206
 
 
207
 
 
208
 
class SmartServerRequestRevisionHistory(SmartServerBranchRequest):
209
 
 
210
 
    def do_with_branch(self, branch):
211
 
        """Get the revision history for the branch.
212
 
 
213
 
        The revision list is returned as the body content,
214
 
        with each revision utf8 encoded and \x00 joined.
215
 
        """
216
 
        branch.lock_read()
217
 
        try:
218
 
            graph = branch.repository.get_graph()
219
 
            stop_revisions = (None, _mod_revision.NULL_REVISION)
220
 
            history = list(graph.iter_lefthand_ancestry(
221
 
                branch.last_revision(), stop_revisions))
222
 
        finally:
223
 
            branch.unlock()
224
 
        return SuccessfulSmartServerResponse(
225
 
            ('ok', ), ('\x00'.join(reversed(history))))
226
 
 
227
 
 
228
 
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
229
 
 
230
 
    def do_with_branch(self, branch):
231
 
        """Return branch.last_revision_info().
232
 
 
233
 
        The revno is encoded in decimal, the revision_id is encoded as utf8.
234
 
        """
235
 
        revno, last_revision = branch.last_revision_info()
236
 
        return SuccessfulSmartServerResponse(('ok', str(revno), last_revision))
237
 
 
238
 
 
239
 
class SmartServerBranchRequestRevisionIdToRevno(SmartServerBranchRequest):
240
 
 
241
 
    def do_with_branch(self, branch, revid):
242
 
        """Return branch.revision_id_to_revno().
243
 
 
244
 
        New in 2.5.
245
 
 
246
 
        The revno is encoded in decimal, the revision_id is encoded as utf8.
247
 
        """
248
 
        try:
249
 
            dotted_revno = branch.revision_id_to_dotted_revno(revid)
250
 
        except errors.NoSuchRevision:
251
 
            return FailedSmartServerResponse(('NoSuchRevision', revid))
252
 
        return SuccessfulSmartServerResponse(
253
 
            ('ok', ) + tuple(map(str, dotted_revno)))
254
 
 
255
 
 
256
 
class SmartServerSetTipRequest(SmartServerLockedBranchRequest):
257
 
    """Base class for handling common branch request logic for requests that
258
 
    update the branch tip.
259
 
    """
260
 
 
261
 
    def do_with_locked_branch(self, branch, *args):
262
 
        try:
263
 
            return self.do_tip_change_with_locked_branch(branch, *args)
264
 
        except errors.TipChangeRejected, e:
265
 
            msg = e.msg
266
 
            if isinstance(msg, unicode):
267
 
                msg = msg.encode('utf-8')
268
 
            return FailedSmartServerResponse(('TipChangeRejected', msg))
269
 
 
270
 
 
271
 
class SmartServerBranchRequestSetConfigOption(SmartServerLockedBranchRequest):
272
 
    """Set an option in the branch configuration."""
273
 
 
274
 
    def do_with_locked_branch(self, branch, value, name, section):
275
 
        if not section:
276
 
            section = None
277
 
        branch._get_config().set_option(value.decode('utf8'), name, section)
278
 
        return SuccessfulSmartServerResponse(())
279
 
 
280
 
 
281
 
class SmartServerBranchRequestSetConfigOptionDict(SmartServerLockedBranchRequest):
282
 
    """Set an option in the branch configuration.
283
 
    
284
 
    New in 2.2.
285
 
    """
286
 
 
287
 
    def do_with_locked_branch(self, branch, value_dict, name, section):
288
 
        utf8_dict = bencode.bdecode(value_dict)
289
 
        value_dict = {}
290
 
        for key, value in utf8_dict.items():
291
 
            value_dict[key.decode('utf8')] = value.decode('utf8')
292
 
        if not section:
293
 
            section = None
294
 
        branch._get_config().set_option(value_dict, name, section)
295
 
        return SuccessfulSmartServerResponse(())
296
 
 
297
 
 
298
 
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
299
 
 
300
 
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
301
 
        if new_last_revision_id == 'null:':
302
 
            branch.set_last_revision_info(0, new_last_revision_id)
303
 
        else:
304
 
            if not branch.repository.has_revision(new_last_revision_id):
305
 
                return FailedSmartServerResponse(
306
 
                    ('NoSuchRevision', new_last_revision_id))
307
 
            branch.generate_revision_history(new_last_revision_id, None, None)
308
 
        return SuccessfulSmartServerResponse(('ok',))
309
 
 
310
 
 
311
 
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest):
312
 
 
313
 
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id,
314
 
            allow_divergence, allow_overwrite_descendant):
315
 
        """Set the last revision of the branch.
316
 
 
317
 
        New in 1.6.
318
 
 
319
 
        :param new_last_revision_id: the revision ID to set as the last
320
 
            revision of the branch.
321
 
        :param allow_divergence: A flag.  If non-zero, change the revision ID
322
 
            even if the new_last_revision_id's ancestry has diverged from the
323
 
            current last revision.  If zero, a 'Diverged' error will be
324
 
            returned if new_last_revision_id is not a descendant of the current
325
 
            last revision.
326
 
        :param allow_overwrite_descendant:  A flag.  If zero and
327
 
            new_last_revision_id is not a descendant of the current last
328
 
            revision, then the last revision will not be changed.  If non-zero
329
 
            and there is no divergence, then the last revision is always
330
 
            changed.
331
 
 
332
 
        :returns: on success, a tuple of ('ok', revno, revision_id), where
333
 
            revno and revision_id are the new values of the current last
334
 
            revision info.  The revision_id might be different to the
335
 
            new_last_revision_id if allow_overwrite_descendant was not set.
336
 
        """
337
 
        do_not_overwrite_descendant = not allow_overwrite_descendant
338
 
        try:
339
 
            last_revno, last_rev = branch.last_revision_info()
340
 
            graph = branch.repository.get_graph()
341
 
            if not allow_divergence or do_not_overwrite_descendant:
342
 
                relation = branch._revision_relations(
343
 
                    last_rev, new_last_revision_id, graph)
344
 
                if relation == 'diverged' and not allow_divergence:
345
 
                    return FailedSmartServerResponse(('Diverged',))
346
 
                if relation == 'a_descends_from_b' and do_not_overwrite_descendant:
347
 
                    return SuccessfulSmartServerResponse(
348
 
                        ('ok', last_revno, last_rev))
349
 
            new_revno = graph.find_distance_to_null(
350
 
                new_last_revision_id, [(last_rev, last_revno)])
351
 
            branch.set_last_revision_info(new_revno, new_last_revision_id)
352
 
        except errors.GhostRevisionsHaveNoRevno:
353
 
            return FailedSmartServerResponse(
354
 
                ('NoSuchRevision', new_last_revision_id))
355
 
        return SuccessfulSmartServerResponse(
356
 
            ('ok', new_revno, new_last_revision_id))
357
 
 
358
 
 
359
 
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest):
360
 
    """Branch.set_last_revision_info.  Sets the revno and the revision ID of
361
 
    the specified branch.
362
 
 
363
 
    New in bzrlib 1.4.
364
 
    """
365
 
 
366
 
    def do_tip_change_with_locked_branch(self, branch, new_revno,
367
 
            new_last_revision_id):
368
 
        try:
369
 
            branch.set_last_revision_info(int(new_revno), new_last_revision_id)
370
 
        except errors.NoSuchRevision:
371
 
            return FailedSmartServerResponse(
372
 
                ('NoSuchRevision', new_last_revision_id))
373
 
        return SuccessfulSmartServerResponse(('ok',))
374
 
 
375
 
 
376
 
class SmartServerBranchRequestSetParentLocation(SmartServerLockedBranchRequest):
377
 
    """Set the parent location for a branch.
378
 
    
379
 
    Takes a location to set, which must be utf8 encoded.
380
 
    """
381
 
 
382
 
    def do_with_locked_branch(self, branch, location):
383
 
        branch._set_parent_location(location)
384
 
        return SuccessfulSmartServerResponse(())
385
 
 
386
 
 
387
 
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest):
388
 
 
389
 
    def do_with_branch(self, branch, branch_token='', repo_token=''):
390
 
        if branch_token == '':
391
 
            branch_token = None
392
 
        if repo_token == '':
393
 
            repo_token = None
394
 
        try:
395
 
            repo_token = branch.repository.lock_write(
396
 
                token=repo_token).repository_token
397
 
            try:
398
 
                branch_token = branch.lock_write(
399
 
                    token=branch_token).branch_token
400
 
            finally:
401
 
                # this leaves the repository with 1 lock
402
 
                branch.repository.unlock()
403
 
        except errors.LockContention:
404
 
            return FailedSmartServerResponse(('LockContention',))
405
 
        except errors.TokenMismatch:
406
 
            return FailedSmartServerResponse(('TokenMismatch',))
407
 
        except errors.UnlockableTransport:
408
 
            return FailedSmartServerResponse(('UnlockableTransport',))
409
 
        except errors.LockFailed, e:
410
 
            return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why)))
411
 
        if repo_token is None:
412
 
            repo_token = ''
413
 
        else:
414
 
            branch.repository.leave_lock_in_place()
415
 
        branch.leave_lock_in_place()
416
 
        branch.unlock()
417
 
        return SuccessfulSmartServerResponse(('ok', branch_token, repo_token))
418
 
 
419
 
 
420
 
class SmartServerBranchRequestUnlock(SmartServerBranchRequest):
421
 
 
422
 
    def do_with_branch(self, branch, branch_token, repo_token):
423
 
        try:
424
 
            branch.repository.lock_write(token=repo_token)
425
 
            try:
426
 
                branch.lock_write(token=branch_token)
427
 
            finally:
428
 
                branch.repository.unlock()
429
 
        except errors.TokenMismatch:
430
 
            return FailedSmartServerResponse(('TokenMismatch',))
431
 
        if repo_token:
432
 
            branch.repository.dont_leave_lock_in_place()
433
 
        branch.dont_leave_lock_in_place()
434
 
        branch.unlock()
435
 
        return SuccessfulSmartServerResponse(('ok',))
436
 
 
437
 
 
438
 
class SmartServerBranchRequestGetPhysicalLockStatus(SmartServerBranchRequest):
439
 
    """Get the physical lock status for a branch.
440
 
 
441
 
    New in 2.5.
442
 
    """
443
 
 
444
 
    def do_with_branch(self, branch):
445
 
        if branch.get_physical_lock_status():
446
 
            return SuccessfulSmartServerResponse(('yes',))
447
 
        else:
448
 
            return SuccessfulSmartServerResponse(('no',))