~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Alexander Belchenko
  • Date: 2008-02-16 10:03:17 UTC
  • mfrom: (3224 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3230.
  • Revision ID: bialix@ukr.net-20080216100317-xg1hdw306evlgt94
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
748
748
    def _get_tree_branch(self):
749
749
        """Return the branch and tree, if any, for this bzrdir.
750
750
 
751
 
        Return None for tree if not present.
 
751
        Return None for tree if not present or inaccessible.
752
752
        Raise NotBranchError if no branch is present.
753
753
        :return: (tree, branch)
754
754
        """