← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: INADA Naoki
  • Date: 2011-05-18 06:01:08 UTC
  • mto: This revision was merged to the branch mainline in revision 5894.
  • Revision ID: songofacandy@gmail.com-20110518060108-86t2kffcrzu0nf6i
Update Japanese docs.

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
22
22
    BzrDir,
23
23
    BzrDirFormat,
24
24
    BzrDirMetaFormat1,
 
25
    BzrProber,
 
26
    )
 
27
from bzrlib.controldir import (
25
28
    network_format_registry,
26
29
    )
27
30
from bzrlib.smart.request import (
34
37
class SmartServerRequestOpenBzrDir(SmartServerRequest):
35
38
 
36
39
    def do(self, path):
37
 
        from bzrlib.bzrdir import BzrDirFormat
38
40
        try:
39
41
            t = self.transport_from_client_path(path)
40
42
        except errors.PathNotChild:
45
47
            # clients that don't anticipate errors from this method.
46
48
            answer = 'no'
47
49
        else:
48
 
            default_format = BzrDirFormat.get_default_format()
49
 
            real_bzrdir = default_format.open(t, _found=True)
 
50
            bzr_prober = BzrProber()
50
51
            try:
51
 
                real_bzrdir._format.probe_transport(t)
 
52
                bzr_prober.probe_transport(t)
52
53
            except (errors.NotBranchError, errors.UnknownFormatError):
53
54
                answer = 'no'
54
55
            else:
56
57
        return SuccessfulSmartServerResponse((answer,))
57
58
 
58
59
 
 
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
 
59
86
class SmartServerRequestBzrDir(SmartServerRequest):
60
87
 
61
88
    def do(self, path, *args):
63
90
        try:
64
91
            self._bzrdir = BzrDir.open_from_transport(
65
92
                self.transport_from_client_path(path))
66
 
        except errors.NotBranchError:
67
 
            return FailedSmartServerResponse(('nobranch', ))
 
93
        except errors.NotBranchError, e:
 
94
            return FailedSmartServerResponse(('nobranch',))
68
95
        return self.do_bzrdir_request(*args)
69
96
 
70
97
    def _boolean_to_yes_no(self, a_boolean):
85
112
        """Get the relative path for repository from current_transport."""
86
113
        # the relpath of the bzrdir in the found repository gives us the
87
114
        # path segments to pop-out.
88
 
        relpath = repository.bzrdir.root_transport.relpath(
 
115
        relpath = repository.user_transport.relpath(
89
116
            current_transport.base)
90
117
        if len(relpath):
91
118
            segments = ['..'] * len(relpath.split('/'))
154
181
 
155
182
        :param path: The path to the bzrdir.
156
183
        :param network_name: The network name of the branch type to create.
157
 
        :return: (ok, network_name)
 
184
        :return: ('ok', branch_format, repo_path, rich_root, tree_ref,
 
185
            external_lookup, repo_format)
158
186
        """
159
187
        bzrdir = BzrDir.open_from_transport(
160
188
            self.transport_from_client_path(path))
404
432
            # It is returned locked, but we need to do the lock to get the lock
405
433
            # token.
406
434
            repo.unlock()
407
 
            repo_lock_token = repo.lock_write() or ''
 
435
            repo_lock_token = repo.lock_write().repository_token or ''
408
436
            if repo_lock_token:
409
437
                repo.leave_lock_in_place()
410
438
            repo.unlock()
440
468
                return SuccessfulSmartServerResponse(('ok', ''))
441
469
            else:
442
470
                return SuccessfulSmartServerResponse(('ok', reference_url))
443
 
        except errors.NotBranchError:
444
 
            return FailedSmartServerResponse(('nobranch', ))
 
471
        except errors.NotBranchError, e:
 
472
            return FailedSmartServerResponse(('nobranch',))
445
473
 
446
474
 
447
475
class SmartServerRequestOpenBranchV2(SmartServerRequestBzrDir):
456
484
                return SuccessfulSmartServerResponse(('branch', format))
457
485
            else:
458
486
                return SuccessfulSmartServerResponse(('ref', reference_url))
459
 
        except errors.NotBranchError:
460
 
            return FailedSmartServerResponse(('nobranch', ))
 
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