Support juju-gui-source=branch:revno

hooks/utils.py

 """Juju GUI charm utilities."""
 
 __all__ = [
     'AGENT',
     'APACHE',
     'API_PORT',
     'CURRENT_DIR',
     'HAPROXY',
     'IMPROV',
     'JUJU_DIR',
@@ skipping 26 matching lines @@
     'start_gui',
     'start_improv',
     'write_apache_config',
 ]
 
 from contextlib import contextmanager
 import errno
 import json
 import os
 import logging
+import re
 import shutil
 from subprocess import CalledProcessError
 import tempfile
 from urlparse import urlparse
 
 import apt
 import tempita
 
 from launchpadlib.launchpad import Launchpad
 from shelltoolbox import (
@@ skipping 147 matching lines @@
     try:
         yield
     except CalledProcessError as err:
         log('Exception caught:')
         log(err.output)
         raise
     finally:
         log("<<< Exiting {}".format(script))
 
 
+bzr_url_expression = re.compile(r"""
+    ^  # Beginning of line.
+    ((?:lp:|http:\/\/)[^:]+)  # Branch URL (scheme + domain/path).
+    (?::(\d+))?  # Optional branch revision.
+    $  # End of line.
+""", re.VERBOSE)
+
+
 def parse_source(source):
     """Parse the ``juju-gui-source`` option.
 
     Return a tuple of two elements representing info on how to deploy Juju GUI.
     Examples:
        - ('stable', None): latest stable release;
        - ('stable', '0.1.0'): stable release v0.1.0;
        - ('trunk', None): latest trunk release;
        - ('trunk', '0.1.0+build.1'): trunk release v0.1.0 bzr revision 1;
-       - ('branch', 'lp:juju-gui'): release is made from a branch;
+       - ('branch', ('lp:juju-gui', 42): release is made from a branch -
+         in this case the second element includes the branch URL and revision;
+       - ('branch', ('lp:juju-gui', None): no revision is specified;
        - ('url', 'http://example.com/gui'): release from a downloaded file.
     """
     if source.startswith('url:'):
         source = source[4:]
         # Support file paths, including relative paths.
         if urlparse(source).scheme == '':
             if not source.startswith('/'):
                 source = os.path.join(os.path.abspath(CURRENT_DIR), source)
             source = "file://%s" % source
         return 'url', source
     if source in ('stable', 'trunk'):
         return source, None
-    if source.startswith('lp:') or source.startswith('http://'):
-        return 'branch', source
+    match = bzr_url_expression.match(source)
+    if match is not None:
+        return 'branch', match.groups()
     if 'build' in source:
         return 'trunk', source
     return 'stable', source
 
 
 def render_to_file(template_name, context, destination):
     """Render the given *template_name* into *destination* using *context*.
 
     The tempita template language is used to render contents
     (see http://pythonpaste.org/tempita/).
@@ skipping 183 matching lines @@
             raise
     uncompress = command('tar', '-x', '-z', '-C', npm_cache_dir, '-f')
     cmd_log(uncompress(npm_cache_archive))
 
 
 def fetch_gui(juju_gui_source, logpath):
     """Retrieve the Juju GUI release/branch."""
     # Retrieve a Juju GUI release.
     origin, version_or_branch = parse_source(juju_gui_source)
     if origin == 'branch':
+        branch_url, revision = version_or_branch
         # Make sure we have the dependencies necessary for us to actually make
         # a build.
         _get_build_dependencies()
         # Create a release starting from a branch.
         juju_gui_source_dir = os.path.join(CURRENT_DIR, 'juju-gui-source')
-        log('Retrieving Juju GUI source checkout from %s.' % version_or_branch)
+        if revision is None:
+            checkout_args = []
+            revno = 'latest revno'
+        else:
+            checkout_args = ['--revision', revision]
+            revno = 'revno {}'.format(revision)
+        log('Retrieving Juju GUI source checkout from {} ({}).'.format(
+            branch_url, revno))
         cmd_log(run('rm', '-rf', juju_gui_source_dir))
-        cmd_log(bzr_checkout(version_or_branch, juju_gui_source_dir))
+        checkout_args.extend([branch_url, juju_gui_source_dir])
+        cmd_log(bzr_checkout(*checkout_args))
         log('Preparing a Juju GUI release.')
         logdir = os.path.dirname(logpath)
         fd, name = tempfile.mkstemp(prefix='make-distfile-', dir=logdir)
         log('Output from "make distfile" sent to %s' % name)
         with environ(NO_BZR='1'):
             run('make', '-C', juju_gui_source_dir, 'distfile',
                 stdout=fd, stderr=fd)
         release_tarball = first_path_in_dir(
             os.path.join(juju_gui_source_dir, 'releases'))
     else:
@@ skipping 134 matching lines @@
     @property
     def method(self):
         result = set()
         for mixin in self.mixins:
             segment = getattr(type(mixin), name, None)
             if segment and isinstance(segment, (list, tuple, set)):
                 result |= set(segment)
 
         return result
     return method