bzr commit into mysql_plugins branch (joerg:128)

[Joerg Bruehe]

#At file:///home/joerg/.bazaar/plugins/mysql_plugins/

  128 Joerg Bruehe	2008-07-03 [merge]
      Merge from main.
modified:
  __init__.py
  directory.py

=== modified file '__init__.py'
--- a/__init__.py	2008-06-26 16:20:46 +0000
+++ b/__init__.py	2008-07-03 12:19:08 +0000
@@ -35,7 +35,7 @@ import sanity
 import unmerged
 """)
 
-version_info = (0, 3, 11)
+version_info = (0, 3, 12)
 
 register_command(parent.cmd_parent)
 register_command(collapse.cmd_collapse)

=== modified file 'directory.py'
--- a/directory.py	2008-05-30 21:43:58 +0000
+++ b/directory.py	2008-07-02 16:08:48 +0000
@@ -12,16 +12,14 @@ class MysqlDirectory(object):
         return self._resolve(url)
 
     def _resolve(self, url):
-        url_pieces = urlsplit(url)
+        scheme, netloc, path, query, fragment = urlsplit(url)
 
-        # It smells like we're throwing away information here.  reconsider.  TODO
-
-        if url_pieces.path == "":
+        if path == "":
             raise errors.InvalidURL(path=url, extra='empty branch name is illegal')
-        elif url_pieces.path.startswith("/"):
-            branchpath = url_pieces.path
+        elif path.startswith("/"):
+            branchpath = path
         else:
-            branchpath = "/server/mysql-%s" % (url_pieces.path,)
+            branchpath = "/server/mysql-%s" % (path,)
 
         mysql_user = os.getenv("MYSQL_USER")
         if mysql_user is not None: