[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r227: Use the last entry from the changelog entry when importing a .diff.gz.

[James Westby]

------------------------------------------------------------
revno: 227
committer: James Westby <jw+debian at jameswestby.net>
branch nick: import
timestamp: Thu 2008-04-10 19:04:54 +0100
message:
  Use the last entry from the changelog entry when importing a .diff.gz.
modified:
  import_dsc.py
-------------- next part --------------
=== modified file 'import_dsc.py'
--- a/import_dsc.py	2008-03-05 17:00:51 +0000
+++ b/import_dsc.py	2008-04-10 18:04:54 +0000
@@ -32,7 +32,7 @@
 import tarfile
 
 from debian_bundle import deb822
-from debian_bundle.changelog import Version
+from debian_bundle.changelog import Version, Changelog
 
 from bzrlib import (bzrdir,
                     generate_ids,
@@ -491,8 +491,20 @@
       self._update_path_info(tree, touched_paths, current_tree, up_tree)
       if (not no_add_extra_parent and dangling_revid is not None):
         tree.add_parent_tree_id(dangling_revid)
-      tree.commit('merge packaging changes from %s' % \
-                  (os.path.basename(diffname)))
+      message = 'merge packaging changes from %s' % \
+                  (os.path.basename(diffname))
+      changelog_path = os.path.join(tree.basedir, 'debian', 'changelog')
+      if os.path.exists(changelog_path):
+        changelog_contents = open(changelog_path).read()
+        changelog = Changelog(file=changelog_contents, max_blocks=1)
+        if changelog._blocks:
+          changes = changelog._blocks[0].changes()
+          message = ''
+          sep = ''
+          for change in reversed(changes):
+            message = change + sep + message
+            sep = "\n"
+      tree.commit(message)
     finally:
       f.close()