← Back to branch summary

~jelmer/bzr-builddeb/depapt

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: James Westby
  • Date: 2010-02-02 02:44:11 UTC
  • mfrom: (393.4.15 changelog-hook)
  • Revision ID: james.westby@canonical.com-20100202024411-s3am0giofzybncqx
Merge John's merge-changelog work, thanks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
__init__.py
25
25
 
26
26
import os
27
27
 
28
 
from bzrlib import msgeditor
 
28
import bzrlib
 
29
from bzrlib import (
 
30
    merge,
 
31
    msgeditor,
 
32
    )
29
33
from bzrlib.commands import plugin_cmds
30
34
from bzrlib.directory_service import directories
31
35
 
110
114
        "the commit message")
111
115
 
112
116
 
 
117
if getattr(merge, 'ConfigurableFileMerger', None) is None:
 
118
    raise ImportError(
 
119
        'need at least bzr 2.1.0rc2 (you use %r)', bzrlib.version_info)
 
120
else:
 
121
    def changelog_merge_hook_factory(merger):
 
122
        from bzrlib.plugins.builddeb import merge_changelog
 
123
        return merge_changelog.ChangeLogFileMerge(merger)
 
124
 
 
125
    merge.Merger.hooks.install_named_hook(
 
126
        'merge_file_content', changelog_merge_hook_factory,
 
127
        'Debian Changelog file merge')
 
128
 
 
129
 
113
130
try:
114
131
    from bzrlib.revisionspec import revspec_registry
115
 
    revspec_registry.register_lazy("package:", "bzrlib.plugins.builddeb.revspec", "RevisionSpec_package")
 
132
    revspec_registry.register_lazy("package:",
 
133
        "bzrlib.plugins.builddeb.revspec", "RevisionSpec_package")
116
134
except ImportError:
117
135
    from bzrlib.revisionspec import SPEC_TYPES
118
136
    from bzrlib.plugins.builddeb.revspec import RevisionSpec_package