← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Server-side branch related request implmentations."""
18
18
 
19
19
 
20
 
from bzrlib import errors
21
 
from bzrlib.bzrdir import BzrDir
 
20
from bzrlib import (
 
21
    bencode,
 
22
    errors,
 
23
    revision as _mod_revision,
 
24
    )
 
25
from bzrlib.controldir import ControlDir
22
26
from bzrlib.smart.request import (
23
27
    FailedSmartServerResponse,
24
28
    SmartServerRequest,
42
46
        :return: A SmartServerResponse from self.do_with_branch().
43
47
        """
44
48
        transport = self.transport_from_client_path(path)
45
 
        bzrdir = BzrDir.open_from_transport(transport)
46
 
        if bzrdir.get_branch_reference() is not None:
 
49
        controldir = ControlDir.open_from_transport(transport)
 
50
        if controldir.get_branch_reference() is not None:
47
51
            raise errors.NotBranchError(transport.base)
48
 
        branch = bzrdir.open_branch(ignore_fallbacks=True)
 
52
        branch = controldir.open_branch(ignore_fallbacks=True)
49
53
        return self.do_with_branch(branch, *args)
50
54
 
51
55
 
105
109
 
106
110
class SmartServerBranchSetTagsBytes(SmartServerLockedBranchRequest):
107
111
 
108
 
    def __init__(self, backing_transport, root_client_path='/'):
 
112
    def __init__(self, backing_transport, root_client_path='/', jail_root=None):
109
113
        SmartServerLockedBranchRequest.__init__(
110
 
            self, backing_transport, root_client_path)
 
114
            self, backing_transport, root_client_path, jail_root)
111
115
        self.locked = False
112
116
        
113
117
    def do_with_locked_branch(self, branch):
139
143
            self.branch.unlock()
140
144
 
141
145
 
 
146
class SmartServerBranchHeadsToFetch(SmartServerBranchRequest):
 
147
 
 
148
    def do_with_branch(self, branch):
 
149
        """Return the heads-to-fetch for a Branch as two bencoded lists.
 
150
        
 
151
        See Branch.heads_to_fetch.
 
152
 
 
153
        New in 2.4.
 
154
        """
 
155
        must_fetch, if_present_fetch = branch.heads_to_fetch()
 
156
        return SuccessfulSmartServerResponse(
 
157
            (list(must_fetch), list(if_present_fetch)))
 
158
 
 
159
 
142
160
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
143
161
 
144
162
    def do_with_branch(self, branch):
154
172
        The revision list is returned as the body content,
155
173
        with each revision utf8 encoded and \x00 joined.
156
174
        """
 
175
        branch.lock_read()
 
176
        try:
 
177
            graph = branch.repository.get_graph()
 
178
            stop_revisions = (None, _mod_revision.NULL_REVISION)
 
179
            history = list(graph.iter_lefthand_ancestry(
 
180
                branch.last_revision(), stop_revisions))
 
181
        finally:
 
182
            branch.unlock()
157
183
        return SuccessfulSmartServerResponse(
158
 
            ('ok', ), ('\x00'.join(branch.revision_history())))
 
184
            ('ok', ), ('\x00'.join(reversed(history))))
159
185
 
160
186
 
161
187
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
194
220
        return SuccessfulSmartServerResponse(())
195
221
 
196
222
 
 
223
class SmartServerBranchRequestSetConfigOptionDict(SmartServerLockedBranchRequest):
 
224
    """Set an option in the branch configuration.
 
225
    
 
226
    New in 2.2.
 
227
    """
 
228
 
 
229
    def do_with_locked_branch(self, branch, value_dict, name, section):
 
230
        utf8_dict = bencode.bdecode(value_dict)
 
231
        value_dict = {}
 
232
        for key, value in utf8_dict.items():
 
233
            value_dict[key.decode('utf8')] = value.decode('utf8')
 
234
        if not section:
 
235
            section = None
 
236
        branch._get_config().set_option(value_dict, name, section)
 
237
        return SuccessfulSmartServerResponse(())
 
238
 
 
239
 
197
240
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest):
198
241
 
199
242
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
200
243
        if new_last_revision_id == 'null:':
201
 
            branch.set_revision_history([])
 
244
            branch._set_revision_history([])
202
245
        else:
203
246
            if not branch.repository.has_revision(new_last_revision_id):
204
247
                return FailedSmartServerResponse(
205
248
                    ('NoSuchRevision', new_last_revision_id))
206
 
            branch.set_revision_history(branch._lefthand_history(
 
249
            branch._set_revision_history(branch._lefthand_history(
207
250
                new_last_revision_id, None, None))
208
251
        return SuccessfulSmartServerResponse(('ok',))
209
252
 
292
335
        if repo_token == '':
293
336
            repo_token = None
294
337
        try:
295
 
            repo_token = branch.repository.lock_write(token=repo_token)
 
338
            repo_token = branch.repository.lock_write(
 
339
                token=repo_token).repository_token
296
340
            try:
297
 
                branch_token = branch.lock_write(token=branch_token)
 
341
                branch_token = branch.lock_write(
 
342
                    token=branch_token).branch_token
298
343
            finally:
299
344
                # this leaves the repository with 1 lock
300
345
                branch.repository.unlock()