← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.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
16
16
 
17
17
"""Server-side bzrdir related request implmentations."""
18
18
 
 
19
from __future__ import absolute_import
19
20
 
20
 
from bzrlib import branch, errors, repository, urlutils
 
21
from bzrlib import (
 
22
    bencode,
 
23
    branch,
 
24
    errors,
 
25
    repository,
 
26
    urlutils,
 
27
    )
21
28
from bzrlib.bzrdir import (
22
29
    BzrDir,
23
30
    BzrDirFormat,
24
 
    BzrDirMetaFormat1,
 
31
    BzrProber,
 
32
    )
 
33
from bzrlib.controldir import (
25
34
    network_format_registry,
26
35
    )
27
36
from bzrlib.smart.request import (
44
53
            # clients that don't anticipate errors from this method.
45
54
            answer = 'no'
46
55
        else:
47
 
            default_format = BzrDirFormat.get_default_format()
48
 
            real_bzrdir = default_format.open(t, _found=True)
 
56
            bzr_prober = BzrProber()
49
57
            try:
50
 
                real_bzrdir._format.probe_transport(t)
 
58
                bzr_prober.probe_transport(t)
51
59
            except (errors.NotBranchError, errors.UnknownFormatError):
52
60
                answer = 'no'
53
61
            else:
84
92
class SmartServerRequestBzrDir(SmartServerRequest):
85
93
 
86
94
    def do(self, path, *args):
87
 
        """Open a BzrDir at path, and return self.do_bzrdir_request(*args)."""
 
95
        """Open a BzrDir at path, and return `self.do_bzrdir_request(*args)`."""
88
96
        try:
89
97
            self._bzrdir = BzrDir.open_from_transport(
90
98
                self.transport_from_client_path(path))
91
 
        except errors.NotBranchError:
92
 
            return FailedSmartServerResponse(('nobranch', ))
 
99
        except errors.NotBranchError, e:
 
100
            return FailedSmartServerResponse(('nobranch',))
93
101
        return self.do_bzrdir_request(*args)
94
102
 
95
103
    def _boolean_to_yes_no(self, a_boolean):
110
118
        """Get the relative path for repository from current_transport."""
111
119
        # the relpath of the bzrdir in the found repository gives us the
112
120
        # path segments to pop-out.
113
 
        relpath = repository.bzrdir.root_transport.relpath(
 
121
        relpath = repository.user_transport.relpath(
114
122
            current_transport.base)
115
123
        if len(relpath):
116
124
            segments = ['..'] * len(relpath.split('/'))
119
127
        return '/'.join(segments)
120
128
 
121
129
 
 
130
class SmartServerBzrDirRequestDestroyBranch(SmartServerRequestBzrDir):
 
131
 
 
132
    def do_bzrdir_request(self, name=None):
 
133
        """Destroy the branch with the specified name.
 
134
 
 
135
        New in 2.5.0.
 
136
        :return: On success, 'ok'.
 
137
        """
 
138
        try:
 
139
            self._bzrdir.destroy_branch(name)
 
140
        except errors.NotBranchError, e:
 
141
            return FailedSmartServerResponse(('nobranch',))
 
142
        return SuccessfulSmartServerResponse(('ok',))
 
143
 
 
144
 
 
145
class SmartServerBzrDirRequestHasWorkingTree(SmartServerRequestBzrDir):
 
146
 
 
147
    def do_bzrdir_request(self, name=None):
 
148
        """Check whether there is a working tree present.
 
149
 
 
150
        New in 2.5.0.
 
151
 
 
152
        :return: If there is a working tree present, 'yes'.
 
153
            Otherwise 'no'.
 
154
        """
 
155
        if self._bzrdir.has_workingtree():
 
156
            return SuccessfulSmartServerResponse(('yes', ))
 
157
        else:
 
158
            return SuccessfulSmartServerResponse(('no', ))
 
159
 
 
160
 
 
161
class SmartServerBzrDirRequestDestroyRepository(SmartServerRequestBzrDir):
 
162
 
 
163
    def do_bzrdir_request(self, name=None):
 
164
        """Destroy the repository.
 
165
 
 
166
        New in 2.5.0.
 
167
 
 
168
        :return: On success, 'ok'.
 
169
        """
 
170
        try:
 
171
            self._bzrdir.destroy_repository()
 
172
        except errors.NoRepositoryPresent, e:
 
173
            return FailedSmartServerResponse(('norepository',))
 
174
        return SuccessfulSmartServerResponse(('ok',))
 
175
 
 
176
 
122
177
class SmartServerBzrDirRequestCloningMetaDir(SmartServerRequestBzrDir):
123
178
 
124
179
    def do_bzrdir_request(self, require_stacking):
148
203
        control_format = self._bzrdir.cloning_metadir(
149
204
            require_stacking=require_stacking)
150
205
        control_name = control_format.network_name()
151
 
        # XXX: There should be a method that tells us that the format does/does
152
 
        # not have subformats.
153
 
        if isinstance(control_format, BzrDirMetaFormat1):
 
206
        if not control_format.fixed_components:
154
207
            branch_name = ('branch',
155
208
                control_format.get_branch_format().network_name())
156
209
            repository_name = control_format.repository_format.network_name()
162
215
            branch_name))
163
216
 
164
217
 
 
218
class SmartServerBzrDirRequestCheckoutMetaDir(SmartServerRequestBzrDir):
 
219
    """Get the format to use for checkouts.
 
220
 
 
221
    New in 2.5.
 
222
 
 
223
    :return: on success, a 3-tuple of network names for (control,
 
224
        repository, branch) directories, where '' signifies "not present".
 
225
        If this BzrDir contains a branch reference then this will fail with
 
226
        BranchReference; clients should resolve branch references before
 
227
        calling this RPC (they should not try to create a checkout of a
 
228
        checkout).
 
229
    """
 
230
 
 
231
    def do_bzrdir_request(self):
 
232
        try:
 
233
            branch_ref = self._bzrdir.get_branch_reference()
 
234
        except errors.NotBranchError:
 
235
            branch_ref = None
 
236
        if branch_ref is not None:
 
237
            # The server shouldn't try to resolve references, and it quite
 
238
            # possibly can't reach them anyway.  The client needs to resolve
 
239
            # the branch reference to determine the cloning_metadir.
 
240
            return FailedSmartServerResponse(('BranchReference',))
 
241
        control_format = self._bzrdir.checkout_metadir()
 
242
        control_name = control_format.network_name()
 
243
        if not control_format.fixed_components:
 
244
            branch_name = control_format.get_branch_format().network_name()
 
245
            repo_name = control_format.repository_format.network_name()
 
246
        else:
 
247
            branch_name = ''
 
248
            repo_name = ''
 
249
        return SuccessfulSmartServerResponse(
 
250
            (control_name, repo_name, branch_name))
 
251
 
 
252
 
165
253
class SmartServerRequestCreateBranch(SmartServerRequestBzrDir):
166
254
 
167
255
    def do(self, path, network_name):
179
267
 
180
268
        :param path: The path to the bzrdir.
181
269
        :param network_name: The network name of the branch type to create.
182
 
        :return: (ok, network_name)
 
270
        :return: ('ok', branch_format, repo_path, rich_root, tree_ref,
 
271
            external_lookup, repo_format)
183
272
        """
184
273
        bzrdir = BzrDir.open_from_transport(
185
274
            self.transport_from_client_path(path))
186
275
        format = branch.network_format_registry.get(network_name)
187
276
        bzrdir.branch_format = format
188
 
        result = format.initialize(bzrdir)
 
277
        result = format.initialize(bzrdir, name="")
189
278
        rich_root, tree_ref, external_lookup = self._format_to_capabilities(
190
279
            result.repository._format)
191
280
        branch_format = result._format.network_name()
342
431
        return SuccessfulSmartServerResponse((), content)
343
432
 
344
433
 
 
434
class SmartServerBzrDirRequestGetBranches(SmartServerRequestBzrDir):
 
435
 
 
436
    def do_bzrdir_request(self):
 
437
        """Get the branches in a control directory.
 
438
        
 
439
        The body is a bencoded dictionary, with values similar to the return
 
440
        value of the open branch request.
 
441
        """
 
442
        branches = self._bzrdir.get_branches()
 
443
        ret = {}
 
444
        for name, b in branches.iteritems():
 
445
            if name is None:
 
446
                name = ""
 
447
            ret[name] = ("branch", b._format.network_name())
 
448
        return SuccessfulSmartServerResponse(
 
449
            ("success", ), bencode.bencode(ret))
 
450
 
 
451
 
345
452
class SmartServerRequestInitializeBzrDir(SmartServerRequest):
346
453
 
347
454
    def do(self, path):
429
536
            # It is returned locked, but we need to do the lock to get the lock
430
537
            # token.
431
538
            repo.unlock()
432
 
            repo_lock_token = repo.lock_write() or ''
 
539
            repo_lock_token = repo.lock_write().repository_token or ''
433
540
            if repo_lock_token:
434
541
                repo.leave_lock_in_place()
435
542
            repo.unlock()
465
572
                return SuccessfulSmartServerResponse(('ok', ''))
466
573
            else:
467
574
                return SuccessfulSmartServerResponse(('ok', reference_url))
468
 
        except errors.NotBranchError:
469
 
            return FailedSmartServerResponse(('nobranch', ))
 
575
        except errors.NotBranchError, e:
 
576
            return FailedSmartServerResponse(('nobranch',))
470
577
 
471
578
 
472
579
class SmartServerRequestOpenBranchV2(SmartServerRequestBzrDir):
481
588
                return SuccessfulSmartServerResponse(('branch', format))
482
589
            else:
483
590
                return SuccessfulSmartServerResponse(('ref', reference_url))
484
 
        except errors.NotBranchError:
485
 
            return FailedSmartServerResponse(('nobranch', ))
 
591
        except errors.NotBranchError, e:
 
592
            return FailedSmartServerResponse(('nobranch',))
 
593
 
 
594
 
 
595
class SmartServerRequestOpenBranchV3(SmartServerRequestBzrDir):
 
596
 
 
597
    def do_bzrdir_request(self):
 
598
        """Open a branch at path and return the reference or format.
 
599
        
 
600
        This version introduced in 2.1.
 
601
 
 
602
        Differences to SmartServerRequestOpenBranchV2:
 
603
          * can return 2-element ('nobranch', extra), where 'extra' is a string
 
604
            with an explanation like 'location is a repository'.  Previously
 
605
            a 'nobranch' response would never have more than one element.
 
606
        """
 
607
        try:
 
608
            reference_url = self._bzrdir.get_branch_reference()
 
609
            if reference_url is None:
 
610
                br = self._bzrdir.open_branch(ignore_fallbacks=True)
 
611
                format = br._format.network_name()
 
612
                return SuccessfulSmartServerResponse(('branch', format))
 
613
            else:
 
614
                return SuccessfulSmartServerResponse(('ref', reference_url))
 
615
        except errors.NotBranchError, e:
 
616
            # Stringify the exception so that its .detail attribute will be
 
617
            # filled out.
 
618
            str(e)
 
619
            resp = ('nobranch',)
 
620
            detail = e.detail
 
621
            if detail:
 
622
                if detail.startswith(': '):
 
623
                    detail = detail[2:]
 
624
                resp += (detail,)
 
625
            return FailedSmartServerResponse(resp)
 
626