Merge lp:~germar/bzr-fastimport/bzr-fastimport into lp:bzr-fastimport

[Germar]

Inspired by http://www.fusonic.net/en/blog/2013/03/26/migrating-from-bazaar-to-git/ this will add the bug properties to the commit message if running with --plain. So you will not loose that information anymore if you export to GIT.

[Jelmer Vernooij (jelmer)]

Please also add a test for this behaviour.

review: Needs Fixing

Unmerged revisions

361. By Germar on 2015-10-14

write bug property into commit message if running with --plain

=== modified file 'exporter.py'
--- exporter.py	2014-05-15 09:26:03 +0000
+++ exporter.py	2015-10-14 22:56:18 +0000
@@ -422,10 +422,20 @@
             from_ = None
             merges = None
 
+        message = revobj.message
+
         # Filter the revision properties. Some metadata (like the
         # author information) is already exposed in other ways so
         # don't repeat it here.
         if self.plain_format:
+            if 'bugs' in revobj.properties:
+                m = re.match(r'(http.*/\d+)', revobj.properties['bugs'])
+                if m:
+                    message += ' (fixed %s)' %m.group(1)
+                    if self.verbose:
+                        self.note('Added bug note to message: %s' %message)
+                else:
+                    self.warning("Found bug property but wasn't able to extract link: %s" %revobj.properties['bugs'])
             properties = None
         else:
             properties = revobj.properties
@@ -437,7 +447,7 @@
 
         # Build and return the result
         return commands.CommitCommand(git_ref, mark, author_info,
-            committer_info, revobj.message.encode("utf-8"), from_, merges, iter(file_cmds),
+            committer_info, message.encode("utf-8"), from_, merges, iter(file_cmds),
             more_authors=more_author_info, properties=properties)
 
     def _get_revision_trees(self, parent, revision_id):