Merge lp:~alex-idereal/bzr-xmloutput/fix-xmlmissing-exception into lp:bzr-xmloutput

[Piotr Piastucki]

missingxml: Don't throw exception if local branch has no parent.
Use other_branch to fill in <last_location> URL instead of parent.
This seems correct since it's the branch being used to calculate what's missing, and it avoids an exception when parent is None. Hopefully nothing depends on the previous broken behaviour.

Unmerged revisions

183. By Alexander Taler on 2013-10-25

missingxml: Don't throw exception if local branch has no parent.

Use other_branch to fill in <last_location> URL instead of parent.

This seems correct since it's the branch being used to calculate what's missing, and it avoids an exception when parent is None. Hopefully nothing depends on the previous broken behaviour.

182. By Piotr Piastucki on 2013-09-12

Increase version number to 0.9.1

181. By Piotr Piastucki on 2013-09-10

Merge lp:~rom1-chal/bzr-xmloutput/bugfix-persistent-ssh
Add an experimental workaround for bzr not closing ssh connections.
This is not a real fix but it seems to work.

180. By Piotr Piastucki on 2013-09-04

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

179. By Piotr Piastucki on 2013-09-04

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

178. By Piotr Piastucki on 2013-09-04

Sync with main branch

177. By Piotr Piastucki on 2013-08-12

Merge lp:~piastucki/bzr-xmloutput/fix-551351-ignored-in-symlink-root

176. By Piotr Piastucki on 2013-08-12

Fix handling of files with execute bit changed in xmlstatus
Introduce new attribute called meta_modfied instead of changing the file path and appending an asterisk for files with changes in execute bit.

175. By Piotr Piastucki on 2013-06-21

Fix no _encoding attribute issue due to changes between bzr 2.6b1 and 2.6b3

174. By Alexander Taler on 2013-06-21

Increase version number to 0.9.0.

To support bzr-eclipse release 1.2.0

=== modified file 'info.py'
--- info.py	2013-03-05 12:38:17 +0000
+++ info.py	2013-10-27 06:44:02 +0000
@@ -17,7 +17,7 @@
 bzr_plugin_name = "xmloutput"
 
 # See bzrlib/__init__.py for the definition of version tuple format
-bzr_plugin_version = (0, 8, 9, 'final', 0)
+bzr_plugin_version = (0, 9, 1, 'final', 0)
 
 bzr_commands = ['xmlannotate', 'xmlconflicts', 'xmlinfo', 'xmlmissing', 'xmllog', 'xmlls',
                 'xmlplugins', 'xmlshelvelist', 'xmltags', 'xmlversion', 'start-xmlrpc', 'stop-xmlrpc']

=== modified file 'installer/bzr-xmloutput-setup.nsi'
--- installer/bzr-xmloutput-setup.nsi	2011-11-05 05:17:49 +0000
+++ installer/bzr-xmloutput-setup.nsi	2013-10-27 06:44:02 +0000
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME "bzr-xmloutput"
-!define PRODUCT_VERSION "0.8.8"
+!define PRODUCT_VERSION "0.9.1"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 

=== modified file 'lsxml.py'
--- lsxml.py	2013-07-04 21:31:29 +0000
+++ lsxml.py	2013-10-27 06:44:02 +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 'missingxml.py'
--- missingxml.py	2010-02-08 04:37:36 +0000
+++ missingxml.py	2013-10-27 06:44:02 +0000
@@ -52,7 +52,7 @@
         if other_branch is None:
             raise errors.BzrCommandError("No peer location known"
                                           " or specified.")
-    display_url = urlutils.unescape_for_display(parent,
+    display_url = urlutils.unescape_for_display(other_branch,
                                             self.outf.encoding)
 
     remote_branch = Branch.open(other_branch)

=== modified file 'service.py'
--- service.py	2013-02-16 15:30:39 +0000
+++ service.py	2013-10-27 06:44:02 +0000
@@ -36,20 +36,49 @@
 import logging
 import traceback
 from cStringIO import StringIO
+import gc
 """)
 
 from bzrlib.plugins.xmloutput.xml_errors import XMLError
 from xmlrpclib import Fault, Binary
 from SimpleXMLRPCServer import SimpleXMLRPCServer
+import threading
 
 run_dir = os.getcwdu()
 
+class BzrXMLRPCProgressServer(SimpleXMLRPCServer):
+    """ Very simple xmlrpc server to handle progress reporting"""
+
+    finished = False
+
+    def __init__(self, addr, logRequests=False, to_file=None):
+        SimpleXMLRPCServer.__init__(self, addr=addr,
+            logRequests=logRequests)
+        self.register_function(self.get_bzr_progress)
+
+    def shutdown(self):
+        """ stop serving and return 1 """
+        self.finished = True
+        self.server_close()
+        return 1
+
+    def serve_forever(self):
+        """Start serving, and block"""
+        while not self.finished:
+            self.handle_request()
+
+    def get_bzr_progress(self, argv):
+        """get bzr command progress"""
+        import uifactory
+        progress = uifactory.current_progress.get('|'.join(argv), '')
+        return progress
 
 class BzrXMLRPCServer(SimpleXMLRPCServer):
     """ Very simple xmlrpc server to handle bzr commands and search"""
 
     finished = False
-
+    progress_server = None
+    
     def __init__(self, addr, logRequests=False, to_file=None):
         SimpleXMLRPCServer.__init__(self, addr=addr,
             logRequests=logRequests)
@@ -74,10 +103,18 @@
         """ stop serving and return 1 """
         self.finished = True
         self.server_close()
+        if self.progress_server is not None:
+            self.progress_server.shutdown()
         return 1
 
     def serve_forever(self):
         """Start serving, and block"""
+        if os.environ.get('BZR_PROGRESS_BAR') == 'xmlrpc':
+            host, port = self.socket.getsockname()
+            self.progress_server = BzrXMLRPCProgressServer((host, port + 1), False)
+            thread = threading.Thread(target=self.progress_server.serve_forever)
+            thread.setDaemon(True)
+            thread.start()
         import bzrlib.osutils
         default_encoding = 'UTF-8'
         if hasattr(bzrlib, 'user_encoding'):
@@ -95,7 +132,6 @@
         """ simple reply to hello request, 'world!'"""
         return 'world!'
 
-
 class redirect_output(object):
     """decorator to redirect stdout/err to a StringIO"""
 
@@ -136,7 +172,6 @@
     """run a regular bzr command"""
     return _run_bzr(argv, workdir, False)
 
-
 @redirect_output
 def run_bzr_xml(argv, workdir):
     """run a bzr command, but handle errors using XMLError"""
@@ -155,6 +190,7 @@
             exitval = custom_commands_main(argv, username, password)
         else:
             exitval = commands.main(argv)
+        gc.collect()
         sys.stderr.flush()
         sys.stdout.flush()
         if isinstance(exitval, Fault):
@@ -171,12 +207,11 @@
         traceback.print_exc(file=sys.__stderr__)
         raise
 
-
 def custom_commands_main(argv, username=None, password=None):
     """custom commands.main that handle errors using XMLError"""
     import bzrlib.ui
     from uifactory import AuthenticatingUIFactory
-    bzrlib.ui.ui_factory = AuthenticatingUIFactory(sys.stdin, sys.stdout, sys.stderr, username, password)
+    bzrlib.ui.ui_factory = AuthenticatingUIFactory(sys.stdin, sys.stdout, sys.stderr, username, password, argv)
     try:
         _argv = []
         for a in argv[1:]:
@@ -192,7 +227,6 @@
         traceback.print_exc(file=sys.__stderr__)
         raise Fault(32, str(XMLError(e)))
 
-
 def register_functions(server):
     """register functions exposed via xmlrpc."""
     server.register_function(run_bzr, 'run_bzr_command')

=== modified file 'shelvexml.py'
--- shelvexml.py	2013-02-27 13:38:55 +0000
+++ shelvexml.py	2013-10-27 06:44:02 +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-10-27 06:44:02 +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>')
 
 

=== 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-10-27 06:44:02 +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,57 @@
                            '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'))
+
+    def test_lsxml_ignored_symlink(self):
+        # Ignored files inside a symlink directory
+        self.wt.add(['a', '.bzrignore'], ['a-id', 'bzrignore-id'])
+        self.build_tree(['blah.py', 'blah.pyo', 'user-ignore'])
+        symlink = self.test_dir + '_symlink'
+        os.symlink(self.test_dir, symlink)
+        expected_items = [{'kind': 'file',
+                           'path': os.path.join(symlink, 'blah.pyo'),
+                           'pattern': '*.pyo',
+                           'status_kind': 'ignored'},
+                          {'kind': 'file',
+                           'path': os.path.join(symlink, 'user-ignore'),
+                           'pattern': 'user-ignore',
+                           'status_kind': 'ignored'}]
+        self.assertEquals(expected_items, self.run_xmlls('--ignored ' + symlink))
+        
 

=== added file 'tests/test_progress.py'
--- tests/test_progress.py	1970-01-01 00:00:00 +0000
+++ tests/test_progress.py	2013-10-27 06:44:02 +0000
@@ -0,0 +1,48 @@
+# -*- encoding: utf-8 -*-
+
+import xmlrpclib
+import threading
+
+from bzrlib import (
+    tests,
+    ui
+    )
+from bzrlib.plugins.xmloutput.service import *
+from bzrlib.plugins.xmloutput.uifactory import current_progress
+
+class TestXmlRpcServer(tests.TestCase):
+
+    def setUp(self):
+        tests.TestCase.setUp(self)
+        self.host = 'localhost'
+        self.port = 0
+        self._start_server()
+        self.client = xmlrpclib.Server("http://%s:%s" % (self.host,
+                                                         str(self.port)))
+
+    def _start_server(self):
+        os.environ['BZR_PROGRESS_BAR'] = 'xmlrpc'
+        self.server =  BzrXMLRPCServer((self.host, self.port))
+        self.thread = threading.Thread(target=self.server.serve_forever)
+        self.thread.setDaemon(True)
+        self.thread.start()
+        self.host, self.port = self.server.socket.getsockname()
+
+    def tearDown(self):
+        response = self.client.quit()
+        self.thread.join()
+        tests.TestCase.tearDown(self)
+
+    def test_hello(self):
+        response = self.client.hello()
+        self.assertEquals(response, "world!")
+
+    def test_get_bzr_progress(self):
+        global current_progress
+        client = xmlrpclib.Server("http://%s:%s" % (self.host, str(self.port + 1)))
+        current_progress['TEST'] = '123'
+        cmdline = []
+        cmdline.append('TEST')
+        progress = client.get_bzr_progress(cmdline)
+        self.assertEquals(progress, '123')
+

=== modified file 'uifactory.py'
--- uifactory.py	2013-02-16 15:30:39 +0000
+++ uifactory.py	2013-10-27 06:44:02 +0000
@@ -17,8 +17,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-from bzrlib import ui
 from bzrlib.ui.text import TextUIFactory
+from bzrlib.ui.text import TextProgressView
+from bzrlib.ui import NullProgressView
+from cStringIO import StringIO
+
+current_progress = {}
 
 class AuthenticatingUIFactory(TextUIFactory):
 
@@ -27,7 +31,12 @@
                  stdout=None,
                  stderr=None,
                  username=None,
-                 password=None):
+                 password=None,
+                 argv=None):
+        if argv is not None:
+            self.cmd_id = '|'.join(argv)
+        else:
+            self.cmd_id = ''
         super(AuthenticatingUIFactory, self).__init__(stdin, stdout, stderr)
         self.username = username
         self.password = password
@@ -49,3 +58,18 @@
             raise ValueError('XMLRPC authentication username:' + self.get_prompt_text(prompt, **kwargs))
         return self.username
 
+    def make_progress_view(self):
+        return XmlRpcProgressView(self.cmd_id)
+
+class XmlRpcProgressView(TextProgressView):
+
+    def __init__(self, cmd_id):
+        self.cmd_id = cmd_id
+        super(XmlRpcProgressView, self).__init__(StringIO())
+
+    def _show_line(self, u):
+        global current_progress
+        #s = u.encode(self._encoding, self._encoding_errors)
+        current_progress.clear()
+        current_progress[self.cmd_id] = u
+