Merge lp:~piastucki/bzr-xmloutput/fix-399067-incorrect-paths-if-execute-bit-changed into lp:bzr-xmloutput

[Piotr Piastucki]

xmlstatus returns incorrect file paths when permission bits are changed because it appends an '*' in this case - see https://bugs.launchpad.net/bzr-xmloutput/+bug/399067 for more details.
The fix introduce a new attribute called 'meta_modified' instead of changing the file path in statusxml.py.

[Guillermo Gonzalez (verterok)]

thanks!

review: Approve

=== modified file 'statusxml.py'
--- statusxml.py	2011-12-12 15:11:38 +0000
+++ statusxml.py	2013-08-12 19:55:44 +0000
@@ -271,16 +271,14 @@
                 path += '/'
             elif kind == 'symlink':
                 path += '@'
+            meta_modified = ''
             if len(item) == 5 and item[4]:
-                path += '*'
-            if show_ids:
-                kind_id = ''
-                if fid:
-                    kind_id = get_kind_id_element(kind, fid)
-                to_file.write('<%s %s>%s</%s>' % (kind, kind_id,
+                meta_modified = ' meta_modified="true"'
+            kind_id = ''
+            if show_ids and fid:
+                kind_id = ' ' + get_kind_id_element(kind, fid)
+            to_file.write('<%s%s%s>%s</%s>' % (kind, kind_id, meta_modified,
                                                   _escape_cdata(path), kind))
-            else:
-                to_file.write('<%s>%s</%s>' % (kind, _escape_cdata(path), kind))
 
     if delta.removed:
         to_file.write('<removed>')