← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-12 02:48:41 UTC
  • mfrom: (4948 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4965.
  • Revision ID: andrew.bennetts@canonical.com-20100112024841-vbudg5ayivfzcwok
Merge lp:bzr, resolving NEWS conflict.

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):