Merge lp:~bzr-eclipse/bzr-xmloutput/xmlls-verbose-mode into lp:bzr-xmloutput

[Piotr Piastucki]

This patch adds support for --verbose flag to xmlls command. Verbose output contains additional information about the most recent revision of each file listed by xmlls including: revision number, committer name and timestamp as shown below.
This enhancement is crucial to make text file decorator work efficiently in bzr-eclipse.

<item>
<id>xml_errors.py-20080619205226-dorz3pen7q1idbwj-1</id>
<kind>file</kind><path>xml_errors.py</path>
<status_kind>versioned</status_kind>
<log>
<revno>148.1.3</revno>
<committer>Jelmer Vernooij &lt;<email address hidden>&gt;</committer>
<timestamp>Wed 2010-12-15 19:27:12 +0100</timestamp>
</log>
</item>

[lp:~bzr-eclipse/bzr-xmloutput/xmlls-verbose-mode]

176. By Piotr Piastucki on 2013-09-04

Minor cleanup

Unmerged revisions

176. By Piotr Piastucki on 2013-09-04

Minor cleanup

175. By Piotr Piastucki on 2013-09-04

Add verbose mode to xmlls command
When --verbose flag is set xmlls will print additional information about the most recent revision of each file including:
revision number, timestamp and committer

=== modified file 'lsxml.py'
--- lsxml.py	2013-07-04 21:31:29 +0000
+++ lsxml.py	2013-09-04 11:13:44 +0000
@@ -57,10 +57,13 @@
         prefix = fs_path + '/'
 
     if revision is not None:
-        tree = branch.repository.revision_tree(
+        tree = r_tree = branch.repository.revision_tree(
             revision[0].as_revision_id(branch))
-    elif tree is None:
-        tree = branch.basis_tree()
+    else:
+        if tree is None:
+            tree = branch.basis_tree()
+        if verbose:
+            r_tree = branch.basis_tree()
 
     tree.lock_read()
     try:
@@ -79,15 +82,29 @@
                 pattern = ''
             if prefix:
                 fp = osutils.pathjoin(prefix, fp)
+            verbosestr = ''
             if fid is None:
                 fid = ''
             else:
+                if verbose:
+                    try:
+                        revid = r_tree.get_file_revision(fid)
+                        revno = branch.revision_id_to_dotted_revno(revid)
+                        if isinstance(revno, tuple):
+                            revno = '.'.join(map(str, revno))
+                        rev = branch.repository.get_revision(revid)
+                        date_str = osutils.format_date(rev.timestamp, rev.timezone or 0)
+                        verbosestr='<log><revno>%s</revno><committer>%s</committer><timestamp>%s</timestamp></log>' \
+                            % (revno, _escape_cdata(rev.committer), date_str)
+                    except:
+                        # e.g. newly added file not existing in any revision yet
+                        pass
                 fid = '<id>%s</id>' % _escape_cdata(fid)
             fkind = '<kind>%s</kind>' % fkind
             status_kind = '<status_kind>%s</status_kind>' % long_status_kind[fc]
             fpath = '<path>%s</path>' % _escape_cdata(fp)
-            outstring = '<item>%s%s%s%s%s</item>' % (fid, fkind, fpath,
-                                                   status_kind, pattern)
+            outstring = '<item>%s%s%s%s%s%s</item>' % (fid, fkind, fpath,
+                                                   status_kind, pattern, verbosestr)
             outf.write(outstring)
     finally:
         outf.write('</list>')

=== modified file 'tests/test_ls_xml.py'
--- tests/test_ls_xml.py	2013-08-26 18:53:37 +0000
+++ tests/test_ls_xml.py	2013-09-04 11:13:44 +0000
@@ -51,7 +51,12 @@
         for item_elem in lst.findall('item'):
             item = {}
             for attr in item_elem:
-                item[attr.tag] = attr.text
+                if attr.tag == 'log':
+                    for log_item_elem in attr:
+                        if log_item_elem.tag != 'timestamp':
+                            item['log.' + log_item_elem.tag] = log_item_elem.text
+                else:
+                    item[attr.tag] = attr.text
             items.append(item)
         return items
 
@@ -335,4 +340,40 @@
                            'status_kind': 'ignored'}]
         self.assertEquals(expected_items, self.run_xmlls('--ignored ' + symlink))
         
+    def test_lsxml_verbose(self):
+        self.build_tree(['b', 'c', 'd', 'blah.pyo'])
+        self.wt.add(['a', '.bzrignore'], ['a-id', 'bzrignore-id'])
+        self.wt.commit('commit 1', committer='Paul')
+        self.wt.add(['d'], ['d-id'])
+        self.wt.commit('commit 2', committer='John')
+        self.wt.add(['c'], ['c-id'])
+        expected_items = [{'id': 'bzrignore-id',
+                           'kind': 'file',
+                           'log.committer': 'Paul',
+                           'log.revno': '1',
+                           'path': '.bzrignore',
+                           'status_kind': 'versioned'},
+                          {'id': 'a-id',
+                           'kind': 'file',
+                           'log.committer': 'Paul',
+                           'log.revno': '1',
+                           'path': 'a',
+                           'status_kind': 'versioned'},
+                          {'kind': 'file',
+                           'path': 'b',
+                           'status_kind': 'unknown'},
+                          {'kind': 'file',
+                           'path': 'blah.pyo',
+                           'status_kind': 'ignored'},
+                          {'id': 'c-id',
+                           'kind': 'file',
+                           'path': 'c',
+                           'status_kind': 'versioned'},
+                          {'id': 'd-id',
+                           'kind': 'file',
+                           'log.committer': 'John',
+                           'log.revno': '2',
+                           'path': 'd',
+                           'status_kind': 'versioned'}]
+        self.assertEquals(expected_items, self.run_xmlls('--verbose'))