← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1103
1103
        params = ChangeBranchTipParams(
1104
1104
            self, old_revno, new_revno, old_revid, new_revid)
1105
1105
        for hook in hooks:
1106
 
            try:
1107
 
                hook(params)
1108
 
            except errors.TipChangeRejected:
1109
 
                raise
1110
 
            except Exception:
1111
 
                exc_info = sys.exc_info()
1112
 
                hook_name = Branch.hooks.get_hook_name(hook)
1113
 
                raise errors.HookFailed(
1114
 
                    'pre_change_branch_tip', hook_name, exc_info)
 
1106
            hook(params)
1115
1107
 
1116
1108
    @needs_write_lock
1117
1109
    def update(self):
1449
1441
            format_string = transport.get_bytes("format")
1450
1442
            return klass._formats[format_string]
1451
1443
        except errors.NoSuchFile:
1452
 
            raise errors.NotBranchError(path=transport.base)
 
1444
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1453
1445
        except KeyError:
1454
1446
            raise errors.UnknownFormatError(format=format_string, kind='branch')
1455
1447
 
1804
1796
                              _repository=a_bzrdir.find_repository(),
1805
1797
                              ignore_fallbacks=ignore_fallbacks)
1806
1798
        except errors.NoSuchFile:
1807
 
            raise errors.NotBranchError(path=transport.base)
 
1799
            raise errors.NotBranchError(path=transport.base, bzrdir=a_bzrdir)
1808
1800
 
1809
1801
    def __init__(self):
1810
1802
        super(BranchFormatMetadir, self).__init__()