bzr-xmloutput

Merge lp:~piastucki/bzr-xmloutput/xmltags-tag-rename into lp:bzr-xmloutput

  1. xmltags-tag-rename
  2. Merge into trunk
Proposed by Piotr Piastucki
Status: Merged
Approved by: Guillermo Gonzalez
Approved revision: 166
Merged at revision: 166
Proposed branch: lp:~piastucki/bzr-xmloutput/xmltags-tag-rename
Merge into: lp:bzr-xmloutput
Diff against target: 33 lines (+3/-3)
2 files modified
tagsxml.py (+1/-1)
tests/test_tags_xml.py (+2/-2)
To merge this branch: bzr merge lp:~piastucki/bzr-xmloutput/xmltags-tag-rename
Reviewer Review Type Date Requested Status
Guillermo Gonzalez Approve
Review via email: mp+150189@code.launchpad.net

Description of the change

A small change in the XML format to avoid nested <tag> elements which might look a bit confusing.
<tags><tag><tag/><revision/></tag></tags>
will change into
<tags><tag><name/><revision/></tag></tags>

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tagsxml.py'
--- tagsxml.py 2013-02-16 23:15:33 +0000
+++ tagsxml.py 2013-02-23 13:19:18 +0000
@@ -55,7 +55,7 @@
55 revno = '?'55 revno = '?'
56 tags[index] = (tag, revno)56 tags[index] = (tag, revno)
57 for tag, revspec in tags:57 for tag, revspec in tags:
58 outf.write('<tag><tag>%s</tag><revision>%s</revision></tag>' % (_escape_cdata(tag), _escape_cdata(revspec)))58 outf.write('<tag><name>%s</name><revision>%s</revision></tag>' % (_escape_cdata(tag), _escape_cdata(revspec)))
59 outf.write('</tags>')59 outf.write('</tags>')
6060
6161
6262
=== modified file 'tests/test_tags_xml.py'
--- tests/test_tags_xml.py 2013-02-16 23:15:33 +0000
+++ tests/test_tags_xml.py 2013-02-23 13:19:18 +0000
@@ -56,7 +56,7 @@
56 i = 056 i = 0
57 for elem1 in list(tags_xml):57 for elem1 in list(tags_xml):
58 self.assertEquals(elem1.tag, 'tag')58 self.assertEquals(elem1.tag, 'tag')
59 self.assertEquals(elem1[0].tag, 'tag') 59 self.assertEquals(elem1[0].tag, 'name')
60 self.assertEquals(elem1[1].tag, 'revision') 60 self.assertEquals(elem1[1].tag, 'revision')
61 self.assertEquals(elem1[0].text, tags[i]) 61 self.assertEquals(elem1[0].text, tags[i])
62 self.assertEquals(elem1[1].text, revisions[i]) 62 self.assertEquals(elem1[1].text, revisions[i])
@@ -102,7 +102,7 @@
102 self.assertEquals(len(tags_xml), 4)102 self.assertEquals(len(tags_xml), 4)
103 self.assertEquals(tags_xml.tag, 'tags') 103 self.assertEquals(tags_xml.tag, 'tags')
104 self.assertEquals(tags_xml[3].tag, 'tag')104 self.assertEquals(tags_xml[3].tag, 'tag')
105 self.assertEquals(tags_xml[3][0].tag, 'tag') 105 self.assertEquals(tags_xml[3][0].tag, 'name')
106 self.assertEquals(tags_xml[3][1].tag, 'revision') 106 self.assertEquals(tags_xml[3][1].tag, 'revision')
107 self.assertEquals(tags_xml[3][1].text, '3') 107 self.assertEquals(tags_xml[3][1].text, '3')
108108

Subscribers

People subscribed via source and target branches

to all changes: