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

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
1=== modified file 'tagsxml.py'
2--- tagsxml.py 2013-02-16 23:15:33 +0000
3+++ tagsxml.py 2013-02-23 13:19:18 +0000
4@@ -55,7 +55,7 @@
5 revno = '?'
6 tags[index] = (tag, revno)
7 for tag, revspec in tags:
8- outf.write('<tag><tag>%s</tag><revision>%s</revision></tag>' % (_escape_cdata(tag), _escape_cdata(revspec)))
9+ outf.write('<tag><name>%s</name><revision>%s</revision></tag>' % (_escape_cdata(tag), _escape_cdata(revspec)))
10 outf.write('</tags>')
11
12
13
14=== modified file 'tests/test_tags_xml.py'
15--- tests/test_tags_xml.py 2013-02-16 23:15:33 +0000
16+++ tests/test_tags_xml.py 2013-02-23 13:19:18 +0000
17@@ -56,7 +56,7 @@
18 i = 0
19 for elem1 in list(tags_xml):
20 self.assertEquals(elem1.tag, 'tag')
21- self.assertEquals(elem1[0].tag, 'tag')
22+ self.assertEquals(elem1[0].tag, 'name')
23 self.assertEquals(elem1[1].tag, 'revision')
24 self.assertEquals(elem1[0].text, tags[i])
25 self.assertEquals(elem1[1].text, revisions[i])
26@@ -102,7 +102,7 @@
27 self.assertEquals(len(tags_xml), 4)
28 self.assertEquals(tags_xml.tag, 'tags')
29 self.assertEquals(tags_xml[3].tag, 'tag')
30- self.assertEquals(tags_xml[3][0].tag, 'tag')
31+ self.assertEquals(tags_xml[3][0].tag, 'name')
32 self.assertEquals(tags_xml[3][1].tag, 'revision')
33 self.assertEquals(tags_xml[3][1].text, '3')
34

Subscribers

People subscribed via source and target branches

to all changes: