/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Martin Pool
  • Date: 2011-11-29 00:50:36 UTC
  • mto: This revision was merged to the branch mainline in revision 6320.
  • Revision ID: mbp@canonical.com-20111129005036-1vopao4wm0yo9ekn
Slight cleanup of TimeoutFixture

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
21
21
from bzrlib.bzrdir import (
22
22
    BzrDir,
23
23
    BzrDirFormat,
24
 
    BzrDirMetaFormat1,
 
24
    BzrProber,
 
25
    )
 
26
from bzrlib.controldir import (
25
27
    network_format_registry,
26
28
    )
27
29
from bzrlib.smart.request import (
44
46
            # clients that don't anticipate errors from this method.
45
47
            answer = 'no'
46
48
        else:
47
 
            default_format = BzrDirFormat.get_default_format()
48
 
            real_bzrdir = default_format.open(t, _found=True)
 
49
            bzr_prober = BzrProber()
49
50
            try:
50
 
                real_bzrdir._format.probe_transport(t)
 
51
                bzr_prober.probe_transport(t)
51
52
            except (errors.NotBranchError, errors.UnknownFormatError):
52
53
                answer = 'no'
53
54
            else:
84
85
class SmartServerRequestBzrDir(SmartServerRequest):
85
86
 
86
87
    def do(self, path, *args):
87
 
        """Open a BzrDir at path, and return self.do_bzrdir_request(*args)."""
 
88
        """Open a BzrDir at path, and return `self.do_bzrdir_request(*args)`."""
88
89
        try:
89
90
            self._bzrdir = BzrDir.open_from_transport(
90
91
                self.transport_from_client_path(path))
119
120
        return '/'.join(segments)
120
121
 
121
122
 
 
123
class SmartServerBzrDirRequestDestroyBranch(SmartServerRequestBzrDir):
 
124
 
 
125
    def do_bzrdir_request(self, name=None):
 
126
        """Destroy the branch with the specified name.
 
127
 
 
128
        New in 2.5.0.
 
129
        :return: On success, 'ok'.
 
130
        """
 
131
        try:
 
132
            self._bzrdir.destroy_branch(name)
 
133
        except errors.NotBranchError, e:
 
134
            return FailedSmartServerResponse(('nobranch',))
 
135
        return SuccessfulSmartServerResponse(('ok',))
 
136
 
 
137
 
 
138
class SmartServerBzrDirRequestHasWorkingTree(SmartServerRequestBzrDir):
 
139
 
 
140
    def do_bzrdir_request(self, name=None):
 
141
        """Check whether there is a working tree present.
 
142
 
 
143
        New in 2.5.0.
 
144
 
 
145
        :return: If there is a working tree present, 'yes'.
 
146
            Otherwise 'no'.
 
147
        """
 
148
        if self._bzrdir.has_workingtree():
 
149
            return SuccessfulSmartServerResponse(('yes', ))
 
150
        else:
 
151
            return SuccessfulSmartServerResponse(('no', ))
 
152
 
 
153
 
 
154
class SmartServerBzrDirRequestDestroyRepository(SmartServerRequestBzrDir):
 
155
 
 
156
    def do_bzrdir_request(self, name=None):
 
157
        """Destroy the repository.
 
158
 
 
159
        New in 2.5.0.
 
160
 
 
161
        :return: On success, 'ok'.
 
162
        """
 
163
        try:
 
164
            self._bzrdir.destroy_repository()
 
165
        except errors.NoRepositoryPresent, e:
 
166
            return FailedSmartServerResponse(('norepository',))
 
167
        return SuccessfulSmartServerResponse(('ok',))
 
168
 
 
169
 
122
170
class SmartServerBzrDirRequestCloningMetaDir(SmartServerRequestBzrDir):
123
171
 
124
172
    def do_bzrdir_request(self, require_stacking):
148
196
        control_format = self._bzrdir.cloning_metadir(
149
197
            require_stacking=require_stacking)
150
198
        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):
 
199
        if not control_format.fixed_components:
154
200
            branch_name = ('branch',
155
201
                control_format.get_branch_format().network_name())
156
202
            repository_name = control_format.repository_format.network_name()
179
225
 
180
226
        :param path: The path to the bzrdir.
181
227
        :param network_name: The network name of the branch type to create.
182
 
        :return: (ok, network_name)
 
228
        :return: ('ok', branch_format, repo_path, rich_root, tree_ref,
 
229
            external_lookup, repo_format)
183
230
        """
184
231
        bzrdir = BzrDir.open_from_transport(
185
232
            self.transport_from_client_path(path))
429
476
            # It is returned locked, but we need to do the lock to get the lock
430
477
            # token.
431
478
            repo.unlock()
432
 
            repo_lock_token = repo.lock_write() or ''
 
479
            repo_lock_token = repo.lock_write().repository_token or ''
433
480
            if repo_lock_token:
434
481
                repo.leave_lock_in_place()
435
482
            repo.unlock()