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

[Piotr Piastucki]

I think this is a nice improvement and the changes look good. Please review.

[Guillermo Gonzalez (verterok)]

Hi, the change looks good, just 2 notes:

1) please leave 1 empty line between methods
2) the test doesn't work, it's just a typo.

======================================================================
ERROR: bzrlib.plugins.xmloutput.tests.test_log_xml.TestLog.test_log_author
----------------------------------------------------------------------
_StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/home/guillermo/.bazaar/plugins/xmloutput/tests/test_log_xml.py", line 211, in test_log_author
    self_prepare()
NameError: global name 'self_prepare' is not defined

----------------------------------------------------------------------
Ran 96 tests in 6.139s

FAILED (errors=1)
1 test skipped

review: Needs Fixing

[lp:~amujumdar/bzr-xmloutput/emit_authors]

159. By Abhay Mujumdar on 2013-05-16

Incorporates review commentswq

[Abhay Mujumdar (amujumdar)]

I fixed the two things. I feel bad pushing it though; I couldn't get tests to work at all on my install.

=== modified file 'logxml.py'
--- logxml.py	2011-12-12 15:11:38 +0000
+++ logxml.py	2013-05-16 19:43:26 +0000
@@ -148,9 +148,14 @@
                 self.to_file.write('<parent>%s</parent>' % parent_id)
             if len(revision.rev.parent_ids) > 0:
                 self.to_file.write('</parents>')
-
         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>' % \

=== 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-05-16 19:43: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', author='John Doe <[e-mail]>')
         self.full_log_xml = fromstring(self.run_bzr(["xmllog", path])[0])
         return tree
 
@@ -208,6 +208,12 @@
         #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])
+        author  = log_xml.findall('log/authors/author')[0]
+        self.assertEquals(author.text, 'John Doe <[e-mail]>')
+
 class TestLogMerges(ExternalBase):
 
     def _prepare(self):