← 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
20
20
from bzrlib import (
21
21
    bencode,
22
22
    errors,
 
23
    revision as _mod_revision,
23
24
    )
24
 
from bzrlib.bzrdir import BzrDir
 
25
from bzrlib.controldir import ControlDir
25
26
from bzrlib.smart.request import (
26
27
    FailedSmartServerResponse,
27
28
    SmartServerRequest,
45
46
        :return: A SmartServerResponse from self.do_with_branch().
46
47
        """
47
48
        transport = self.transport_from_client_path(path)
48
 
        bzrdir = BzrDir.open_from_transport(transport)
49
 
        if bzrdir.get_branch_reference() is not None:
 
49
        controldir = ControlDir.open_from_transport(transport)
 
50
        if controldir.get_branch_reference() is not None:
50
51
            raise errors.NotBranchError(transport.base)
51
 
        branch = bzrdir.open_branch(ignore_fallbacks=True)
 
52
        branch = controldir.open_branch(ignore_fallbacks=True)
52
53
        return self.do_with_branch(branch, *args)
53
54
 
54
55
 
142
143
            self.branch.unlock()
143
144
 
144
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
 
145
160
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest):
146
161
 
147
162
    def do_with_branch(self, branch):
157
172
        The revision list is returned as the body content,
158
173
        with each revision utf8 encoded and \x00 joined.
159
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()
160
183
        return SuccessfulSmartServerResponse(
161
 
            ('ok', ), ('\x00'.join(branch.revision_history())))
 
184
            ('ok', ), ('\x00'.join(reversed(history))))
162
185
 
163
186
 
164
187
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest):
218
241
 
219
242
    def do_tip_change_with_locked_branch(self, branch, new_last_revision_id):
220
243
        if new_last_revision_id == 'null:':
221
 
            branch.set_revision_history([])
 
244
            branch._set_revision_history([])
222
245
        else:
223
246
            if not branch.repository.has_revision(new_last_revision_id):
224
247
                return FailedSmartServerResponse(
225
248
                    ('NoSuchRevision', new_last_revision_id))
226
 
            branch.set_revision_history(branch._lefthand_history(
 
249
            branch._set_revision_history(branch._lefthand_history(
227
250
                new_last_revision_id, None, None))
228
251
        return SuccessfulSmartServerResponse(('ok',))
229
252