← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

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