← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Andrew Bennetts
  • Date: 2009-09-08 08:09:25 UTC
  • mto: (4634.6.27 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090908080925-ccmjw4kzzz7bepg7
Fix more tests to cope with new commit_write_group strictness.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
22
22
    BzrDir,
23
23
    BzrDirFormat,
24
24
    BzrDirMetaFormat1,
25
 
    BzrProber,
26
 
    )
27
 
from bzrlib.controldir import (
28
25
    network_format_registry,
29
26
    )
30
27
from bzrlib.smart.request import (
37
34
class SmartServerRequestOpenBzrDir(SmartServerRequest):
38
35
 
39
36
    def do(self, path):
 
37
        from bzrlib.bzrdir import BzrDirFormat
40
38
        try:
41
39
            t = self.transport_from_client_path(path)
42
40
        except errors.PathNotChild:
47
45
            # clients that don't anticipate errors from this method.
48
46
            answer = 'no'
49
47
        else:
50
 
            bzr_prober = BzrProber()
 
48
            default_format = BzrDirFormat.get_default_format()
 
49
            real_bzrdir = default_format.open(t, _found=True)
51
50
            try:
52
 
                bzr_prober.probe_transport(t)
 
51
                real_bzrdir._format.probe_transport(t)
53
52
            except (errors.NotBranchError, errors.UnknownFormatError):
54
53
                answer = 'no'
55
54
            else:
57
56
        return SuccessfulSmartServerResponse((answer,))
58
57
 
59
58
 
60
 
class SmartServerRequestOpenBzrDir_2_1(SmartServerRequest):
61
 
 
62
 
    def do(self, path):
63
 
        """Is there a BzrDir present, and if so does it have a working tree?
64
 
 
65
 
        New in 2.1.
66
 
        """
67
 
        try:
68
 
            t = self.transport_from_client_path(path)
69
 
        except errors.PathNotChild:
70
 
            # The client is trying to ask about a path that they have no access
71
 
            # to.
72
 
            return SuccessfulSmartServerResponse(('no',))
73
 
        try:
74
 
            bd = BzrDir.open_from_transport(t)
75
 
        except errors.NotBranchError:
76
 
            answer = ('no',)
77
 
        else:
78
 
            answer = ('yes',)
79
 
            if bd.has_workingtree():
80
 
                answer += ('yes',)
81
 
            else:
82
 
                answer += ('no',)
83
 
        return SuccessfulSmartServerResponse(answer)
84
 
 
85
 
 
86
59
class SmartServerRequestBzrDir(SmartServerRequest):
87
60
 
88
61
    def do(self, path, *args):
89
 
        """Open a BzrDir at path, and return `self.do_bzrdir_request(*args)`."""
 
62
        """Open a BzrDir at path, and return self.do_bzrdir_request(*args)."""
90
63
        try:
91
64
            self._bzrdir = BzrDir.open_from_transport(
92
65
                self.transport_from_client_path(path))
93
 
        except errors.NotBranchError, e:
94
 
            return FailedSmartServerResponse(('nobranch',))
 
66
        except errors.NotBranchError:
 
67
            return FailedSmartServerResponse(('nobranch', ))
95
68
        return self.do_bzrdir_request(*args)
96
69
 
97
70
    def _boolean_to_yes_no(self, a_boolean):
112
85
        """Get the relative path for repository from current_transport."""
113
86
        # the relpath of the bzrdir in the found repository gives us the
114
87
        # path segments to pop-out.
115
 
        relpath = repository.user_transport.relpath(
 
88
        relpath = repository.bzrdir.root_transport.relpath(
116
89
            current_transport.base)
117
90
        if len(relpath):
118
91
            segments = ['..'] * len(relpath.split('/'))
181
154
 
182
155
        :param path: The path to the bzrdir.
183
156
        :param network_name: The network name of the branch type to create.
184
 
        :return: ('ok', branch_format, repo_path, rich_root, tree_ref,
185
 
            external_lookup, repo_format)
 
157
        :return: (ok, network_name)
186
158
        """
187
159
        bzrdir = BzrDir.open_from_transport(
188
160
            self.transport_from_client_path(path))
432
404
            # It is returned locked, but we need to do the lock to get the lock
433
405
            # token.
434
406
            repo.unlock()
435
 
            repo_lock_token = repo.lock_write().repository_token or ''
 
407
            repo_lock_token = repo.lock_write() or ''
436
408
            if repo_lock_token:
437
409
                repo.leave_lock_in_place()
438
410
            repo.unlock()
468
440
                return SuccessfulSmartServerResponse(('ok', ''))
469
441
            else:
470
442
                return SuccessfulSmartServerResponse(('ok', reference_url))
471
 
        except errors.NotBranchError, e:
472
 
            return FailedSmartServerResponse(('nobranch',))
 
443
        except errors.NotBranchError:
 
444
            return FailedSmartServerResponse(('nobranch', ))
473
445
 
474
446
 
475
447
class SmartServerRequestOpenBranchV2(SmartServerRequestBzrDir):
484
456
                return SuccessfulSmartServerResponse(('branch', format))
485
457
            else:
486
458
                return SuccessfulSmartServerResponse(('ref', reference_url))
487
 
        except errors.NotBranchError, e:
488
 
            return FailedSmartServerResponse(('nobranch',))
489
 
 
490
 
 
491
 
class SmartServerRequestOpenBranchV3(SmartServerRequestBzrDir):
492
 
 
493
 
    def do_bzrdir_request(self):
494
 
        """Open a branch at path and return the reference or format.
495
 
        
496
 
        This version introduced in 2.1.
497
 
 
498
 
        Differences to SmartServerRequestOpenBranchV2:
499
 
          * can return 2-element ('nobranch', extra), where 'extra' is a string
500
 
            with an explanation like 'location is a repository'.  Previously
501
 
            a 'nobranch' response would never have more than one element.
502
 
        """
503
 
        try:
504
 
            reference_url = self._bzrdir.get_branch_reference()
505
 
            if reference_url is None:
506
 
                br = self._bzrdir.open_branch(ignore_fallbacks=True)
507
 
                format = br._format.network_name()
508
 
                return SuccessfulSmartServerResponse(('branch', format))
509
 
            else:
510
 
                return SuccessfulSmartServerResponse(('ref', reference_url))
511
 
        except errors.NotBranchError, e:
512
 
            # Stringify the exception so that its .detail attribute will be
513
 
            # filled out.
514
 
            str(e)
515
 
            resp = ('nobranch',)
516
 
            detail = e.detail
517
 
            if detail:
518
 
                if detail.startswith(': '):
519
 
                    detail = detail[2:]
520
 
                resp += (detail,)
521
 
            return FailedSmartServerResponse(resp)
522
 
 
 
459
        except errors.NotBranchError:
 
460
            return FailedSmartServerResponse(('nobranch', ))