~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/branch.py

Committer: mbp at sourcefrog
Date: 2005-10-17 07:48:02 UTC
mto: (1185.41.1 bzr.sftp) (1464.1.1) (1534.1.1 integration) (1495.1.4) (1505.1.16 bzr-bound-branch) (1508.1.15) (1526.1.3 run_tests_twice_for_i18n) (1540.1.3 bzr.dev (Main development branch)) (1685.1.1 bzr-encoding) (1553.5.1 bzr.dev (Main development branch)) (1608.2.1 bzr.mbp.escape-stores)
mto: This revision was merged to the branch mainline in revision 1464.
Revision ID: mbp@sourcefrog.net-20051017074802-4b70a1bb4d5c4194

- start introducing hct error classes

added added

removed removed

112

new_t = t.clone('..')

113

if new_t.base == t.base:

114

# reached the root, whatever that may be

115

raise NotBranchError('%s is not in a branch' % url)

115

raise NotBranchError(path=url)

116

t = new_t

117

118

@staticmethod

471

try:

472

fmt = self.controlfile('branch-format', 'r').read()

473

except NoSuchFile:

474

raise NotBranchError(self.base)

474

raise NotBranchError(path=self.base)

475

mutter("got branch format %r", fmt)

476

if fmt == BZR_BRANCH_FORMAT_6:

477

self._branch_format = 6