← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/msgeditor.py
31
31
    ui,
32
32
    )
33
33
from bzrlib.errors import BzrError, BadCommitMessageEncoding
34
 
from bzrlib.hooks import HookPoint, Hooks
 
34
from bzrlib.hooks import Hooks
35
35
 
36
36
 
37
37
def _get_editor():
302
302
 
303
303
        These are all empty initially.
304
304
        """
305
 
        Hooks.__init__(self)
306
 
        self.create_hook(HookPoint('commit_message_template',
 
305
        Hooks.__init__(self, "bzrlib.msgeditor", "hooks")
 
306
        self.add_hook('commit_message_template',
307
307
            "Called when a commit message is being generated. "
308
308
            "commit_message_template is called with the bzrlib.commit.Commit "
309
309
            "object and the message that is known so far. "
310
310
            "commit_message_template must return a new message to use (which "
311
 
            "could be the same as it was given. When there are multiple "
 
311
            "could be the same as it was given). When there are multiple "
312
312
            "hooks registered for commit_message_template, they are chained "
313
313
            "with the result from the first passed into the second, and so "
314
 
            "on.", (1, 10), None))
 
314
            "on.", (1, 10))
315
315
 
316
316
 
317
317
hooks = MessageEditorHooks()