Merge lp:~piastucki/bzr-xmloutput/emit_authors into lp:bzr-xmloutput

[Piotr Piastucki]

This is a fixed version of the changes proposed in lp:~amujumdar/bzr-xmloutput/emit_authors.

[Guillermo Gonzalez (verterok)]

Hi Piotr,

Thanks for working on this. Looks like there is an identation issue at line 10 of the diff that trigger a lot of test failures:

FAILED (failures=27, errors=2)

I'll push it with the fixes.

Thanks.

review: Needs Fixing

=== modified file 'logxml.py'
--- logxml.py	2011-12-12 15:11:38 +0000
+++ logxml.py	2013-04-26 15:14:26 +0000
@@ -48,8 +48,8 @@
         actions = []
         # to handle merge revision as childs
         if revision.merge_depth > 0 and not self.start_with_merge:
-            if self.previous_merge_depth < revision.merge_depth:
-                if self.log_count > 0:
+        if self.previous_merge_depth < revision.merge_depth:
+            if self.log_count > 0:
                     merge_depth_diference = revision.merge_depth - \
                         self.previous_merge_depth
                     for m in range(merge_depth_diference):
@@ -66,7 +66,7 @@
                                                    revision.merge_depth})
                 if self.nested_merge_count > 0:
                     self.nested_merge_count -= 1
-                else:
+        else:
                     actions.append(self.__close_log)
             else:
                 if self.open_logs > 0:
@@ -100,9 +100,9 @@
         self.previous_merge_depth = revision.merge_depth
 
     def __open_merge(self):
-        self.to_file.write('<merge>')
+            self.to_file.write('<merge>')
         self.open_merges += 1
-        self.stack.append('merge')
+            self.stack.append('merge')
 
     def __close_merge(self, num=1):
         for item in self.stack.__reversed__():
@@ -152,6 +152,13 @@
         self.to_file.write('<committer>%s</committer>' % \
                         _escape_cdata(revision.rev.committer))
 
+        authors = revision.rev.get_apparent_authors()
+        if authors != [revision.rev.committer]:
+            self.to_file.write('<authors>')
+            for a in authors:
+                self.to_file.write('<author>%s</author>' % _escape_cdata(a))
+            self.to_file.write('</authors>')
+
         try:
             self.to_file.write('<branch-nick>%s</branch-nick>' % \
                 _escape_cdata(revision.rev.properties['branch-nick']))

=== modified file 'tests/test_log_xml.py'
--- tests/test_log_xml.py	2012-02-21 10:14:16 +0000
+++ tests/test_log_xml.py	2013-04-26 15:14:26 +0000
@@ -40,7 +40,7 @@
         tree.add('goodbye.txt')
         tree.commit(message='message2')
         tree.add('meep.txt')
-        tree.commit(message='message3')
+        tree.commit(message='message3', authors=['John Doe <[e-mail]>'])
         self.full_log_xml = fromstring(self.run_bzr(["xmllog", path])[0])
         return tree
 
@@ -208,6 +208,13 @@
         #self.assertTrue('revno: 2\n' in log)
         #self.assertTrue('revno: 3\n' in log)
 
+    def test_log_author(self):
+        self._prepare()
+        log_xml = fromstring(self.run_bzr("xmllog -r 3..3")[0])
+        authors = log_xml.findall('log/authors/author')
+        self.assertEquals(1, len(authors))
+        self.assertEquals(authors[0].text, 'John Doe <[e-mail]>')
+
 class TestLogMerges(ExternalBase):
 
     def _prepare(self):