← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-08-18 04:25:42 UTC
  • Revision ID: mbp@sourcefrog.net-20050818042542-6af9da978f695195
- check for email address in BRANCH_ROOT/.bzr/email, so you can 
  easily use different per-project personas

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
104
104
    It is not necessary that f exists.
105
105
 
106
106
    Basically we keep looking up until we find the control directory or
107
 
    run into the root."""
 
107
    run into the root.  If there isn't one, raises NotBranchError.
 
108
    """
108
109
    if f == None:
109
110
        f = os.getcwd()
110
111
    elif hasattr(os.path, 'realpath'):
123
124
        head, tail = os.path.split(f)
124
125
        if head == f:
125
126
            # reached the root, whatever that may be
126
 
            raise BzrError('%r is not in a branch' % orig_f)
 
127
            raise bzrlib.errors.NotBranchError('%r is not in a branch' % orig_f)
127
128
        f = head
128
 
    
 
129
 
 
130
 
 
131
 
 
132
# XXX: move into bzrlib.errors; subclass BzrError    
129
133
class DivergedBranches(Exception):
130
134
    def __init__(self, branch1, branch2):
131
135
        self.branch1 = branch1