Merge lp:~jelmer/bzr-builddeb/lazy-changelog into lp:bzr-builddeb

[Jelmer Vernooij]

Trivial patch to lazily import changelog from debian_bundle since merge_changelog.py gets imported every time bzr is run.

[Robert Collins (lifeless)]

Looks fine to me - though you'll want the debian/debian_bundle support
here too, won't you? Might be trickier...

=== modified file 'merge_changelog.py'
--- merge_changelog.py	2010-02-04 16:31:42 +0000
+++ merge_changelog.py	2010-05-23 15:00:47 +0000
@@ -20,11 +20,8 @@
 
 from bzrlib import (
     merge,
-    merge3,
     )
 
-from debian_bundle import changelog
-
 class ChangeLogFileMerge(merge.ConfigurableFileMerger):
 
     name_prefix = 'deb_changelog'
@@ -41,6 +38,7 @@
 
 def merge_changelog(this_lines, other_lines, base_lines=[]):
     """Merge a changelog file."""
+    from debian_bundle import changelog
 
     try:
         left_cl = read_changelog(this_lines)
@@ -128,6 +126,7 @@
 
 def read_changelog(lines, strict=True):
     """Return a parsed changelog file."""
+    from debian_bundle import changelog
     # Note: There appears to be a bug in Changelog if you pass it an iterable
     #       of lines (like a file obj, or a list of lines). Specifically, it
     #       does not strip trailing newlines, and it adds ones back in, so you