← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

  • Committer: Martin
  • Date: 2011-05-21 16:29:38 UTC
  • mto: This revision was merged to the branch mainline in revision 5907.
  • Revision ID: gzlist@googlemail.com-20110521162938-1vrw3hp0197l3vrl
Add tests for non-ascii conflict serialisation

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hooks.py
72
72
    ('bzrlib.branch', 'Branch.hooks', 'BranchHooks'),
73
73
    ('bzrlib.bzrdir', 'BzrDir.hooks', 'BzrDirHooks'),
74
74
    ('bzrlib.commands', 'Command.hooks', 'CommandHooks'),
75
 
    ('bzrlib.config', 'ConfigHooks', '_ConfigHooks'),
76
75
    ('bzrlib.info', 'hooks', 'InfoHooks'),
77
76
    ('bzrlib.lock', 'Lock.hooks', 'LockHooks'),
78
77
    ('bzrlib.merge', 'Merger.hooks', 'MergeHooks'),
257
256
        try:
258
257
            uninstall = getattr(hook, "uninstall")
259
258
        except AttributeError:
260
 
            raise errors.UnsupportedOperation(self.uninstall_named_hook, self)
 
259
            raise errors.UnsupportedOperation(self.install_named_hook_lazy,
 
260
                self)
261
261
        else:
262
262
            uninstall(label)
263
263