Merge lp:~piastucki/bzr-xmloutput/missing-locks into lp:bzr-xmloutput

[Piotr Piastucki]

I have recently noticed that some locks are actually missing in xmltags and xmlshelvelist commands. It does not seem to break anything, but to improve the code I suggest the following changes.

Unmerged revisions

175. By Piotr Piastucki on 2013-09-03

Add missing locks

=== modified file 'shelvexml.py'
--- shelvexml.py	2013-02-27 13:38:55 +0000
+++ shelvexml.py	2013-09-03 15:25:13 +0000
@@ -29,16 +29,20 @@
 
 def list_xml(outf, directory='.'):
     tree = WorkingTree.open_containing(directory)[0]
-    manager = tree.get_shelf_manager()
-    shelves = manager.active_shelves()
-    outf.write('<?xml version="1.0" encoding="%s"?>' % \
-            bzrlib.osutils.get_user_encoding())
-    outf.write('<shelves>')
-    for shelf_id in reversed(shelves):
-        message = manager.get_metadata(shelf_id).get('message')
-        if message is None:
-            message = ''
-        outf.write('<shelf><id>%s</id><message>%s</message></shelf>' % (shelf_id, _escape_cdata(message)))
-    outf.write('</shelves>')
+    tree.lock_read()
+    try:
+        manager = tree.get_shelf_manager()
+        shelves = manager.active_shelves()
+        outf.write('<?xml version="1.0" encoding="%s"?>' % \
+                bzrlib.osutils.get_user_encoding())
+        outf.write('<shelves>')
+        for shelf_id in reversed(shelves):
+            message = manager.get_metadata(shelf_id).get('message')
+            if message is None:
+                message = ''
+            outf.write('<shelf><id>%s</id><message>%s</message></shelf>' % (shelf_id, _escape_cdata(message)))
+        outf.write('</shelves>')
+    finally:
+        tree.unlock()        
 
 

=== modified file 'tagsxml.py'
--- tagsxml.py	2013-02-22 21:13:54 +0000
+++ tagsxml.py	2013-09-03 15:25:13 +0000
@@ -37,25 +37,29 @@
             bzrlib.osutils.get_user_encoding())
     outf.write('<tags>')
     if tags:
-        if sort is None:
-            sort = tag_sort_methods.get()
-        sort(branch, tags)
-        if not show_ids:
-            # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
-            for index, (tag, revid) in enumerate(tags):
-                try:
-                    revno = branch.revision_id_to_dotted_revno(revid)
-                    if isinstance(revno, tuple):
-                        revno = '.'.join(map(str, revno))
-                except (errors.NoSuchRevision,
-                        errors.GhostRevisionsHaveNoRevno,
-                        errors.UnsupportedOperation):
-                    # Bad tag data/merges can lead to tagged revisions
-                    # which are not in this branch. Fail gracefully ...
-                    revno = '?'
-                tags[index] = (tag, revno)
-        for tag, revspec in tags:
-            outf.write('<tag><name>%s</name><revision>%s</revision></tag>' % (_escape_cdata(tag), _escape_cdata(revspec)))
+        branch.lock_read()
+        try:
+            if sort is None:
+                sort = tag_sort_methods.get()
+            sort(branch, tags)
+            if not show_ids:
+                # [ (tag, revid), ... ] -> [ (tag, dotted_revno), ... ]
+                for index, (tag, revid) in enumerate(tags):
+                    try:
+                        revno = branch.revision_id_to_dotted_revno(revid)
+                        if isinstance(revno, tuple):
+                            revno = '.'.join(map(str, revno))
+                    except (errors.NoSuchRevision,
+                            errors.GhostRevisionsHaveNoRevno,
+                            errors.UnsupportedOperation):
+                        # Bad tag data/merges can lead to tagged revisions
+                        # which are not in this branch. Fail gracefully ...
+                        revno = '?'
+                    tags[index] = (tag, revno)
+            for tag, revspec in tags:
+                outf.write('<tag><name>%s</name><revision>%s</revision></tag>' % (_escape_cdata(tag), _escape_cdata(revspec)))
+        finally:
+            branch.unlock()
     outf.write('</tags>')