Merge lp:~leonardr/launchpad/multiversion-integration into lp:launchpad/db-devel

[Leonard Richardson]

[Leonard Richardson (leonardr)]

This branch depends on updated releases of httplib2, lazr.restful, lazr.restfulclient, and launchpadlib. The new launchpadlib release has not been finalized yet, but you can find the code here: https://code.edge.launchpad.net/~leonardr/launchpadlib/multiversion/+merge/19343

This branch integrates the multi-versioning lazr.restful code into Launchpad.

0. I change IWebServiceApplication so it subclasses IServiceRootResource; lazr.restful now requires the root resource to be registered as a utility, and the IWSA is already a utility.

1. I run grok on the canonical.launchpad.rest directory so that certain code will run. This is the code that looks in IWebServiceConfiguration.active_versions and generates a marker interface for each version.

2. I create a "1.0" web service between "beta" and "devel". To avoid massive changes to tests due to changed URLs, I change the LaunchpadWebServiceCaller so that it still makes requests to the 'beta' web service.

3. I changed Launchpad's test request object to take a version name as an argument, and stamp the request object with that version name and with the corresponding marker interface. lazr.restful takes care of this for normal HTTP requests, but test requests don't go through the normal traversal code.

4. I changed bugcomment_to_entry from a simple IEntry adapter to a multi-adapter that adapts an object and a version marker interface. (All IEntry lookups are now multi-adapter lookups.)

5. I added a test that proves Launchpad responds to all the versions. Since there are as yet no differences between the versions, that's all it tests.

[Eleanor Berger (intellectronica)]

review: Approve (code)

[Leonard Richardson (leonardr)]

I'm afraid I need a follow-up review. I had some Javascript test failures because lazr.restful was generating URLs to the most recent version of the web service ("/api/devel/bugs/15"). Launchpad's client.js would look at these URLs, notice that there was no "/api/beta" at the beginning, and slap "/api/beta" on the beginning, creating the invalid URL "/api/beta/api/devel/bugs/15".

After consultation with flacoste, gary, and mars, we decided to make Launchpad start using the bleeding edge version of the web serice. flacoste says our test coverage is good enough that when we make a backwards-incompatible change to 'devel', some Windmill test will start failing and we'll know to change our usage. So this update to the branch changes all /api/beta stuff to use /api/devel.

The two advantages of using /api/devel in the future are that 1) we won't have to have "porting sessions" where we're about to deprecate version N so we have to port all of Launchpad to version N+1. It'll happen over time as we make the backwards-incompatible changes. 2) we won't have to keep changing the version name, because 'devel' will always refer to the bleeding edge.

I'll also be changing versions.txt to use lazr.restful 0.9.20, but I haven't actually created that version yet--the branch is still in review.

[Leonard Richardson (leonardr)]

Unfortunately I'm experiencing still more test failures. The work continues!

[Leonard Richardson (leonardr)]

OK, ready for another review. The changes:

1. The folder tests were creating a FakeRequest that wasn't associated with any particular version. This was croaking lazr.restful, which always needs to know the version of an incoming request.

2. The Javascript widgets were poking into the lazr.restful internals and looking at the annotations. The 'mutated_by' annotation was changed in the multiversion code to a dict of 'mutator_annotations'.

3. Changed Launchpad to use the new 0.9.21 release of lazr.restful, which fixes many other test failures.

[Leonard Richardson (leonardr)]

4. The new version of lazr.restful changed the implementation of get_current_browser_request. If there is no current request, it now returns None instead of crashing. However, there was a test in menus.txt that depended on the crash. Now the same code crashes, but at a later point (when it tries to access an attribute of the request that's actually None). Rather than change get_current_browser_request to crash, I changed the test to detect the later crash.

[Leonard Richardson (leonardr)]

http://pastebin.ubuntu.com/383025/

Hopefully this will be the last one. The other times I had to go back and do a new release of lazr.restful, and the changes in that new release broke some additional tests in Launchpad. This time I have only made changes to Launchpad, so this shouldn't happen again. (Though I should be making changes to lazr.restful eventually, it doesn't have to be now.)

The major failure here was in servers.py, the unit test of the web service traversal code. This was a subclass of DummyConfigurationTestCase, a class which sets up a small IWebServiceConfiguration object so that the lazr.restful traversal code won't choke.

In the new version of lazr.restful, a small IWebServiceConfiguration object is not good enough. You need an environment that's much more similar to a real web service.

Fortunately, I already ran into this problem with lazr.restful's unit tests, and created a test class that sets up a fake web service, WebServiceTestCase. In this branch, I replace DummyConfigurationTestCase with lazr.restful's WebServiceTestCase, and add a little more stuff (like a top-level collection) to the TestWebServiceRequestTraversal test class, so that traversal will work.

Since WebServiceTestCase has everything found in DummyConfigurationTest, I changed the only other test case that uses DummyConfigurationTest, and removed the DummyConfigurationTest class from Launchpad altogether.

However, WebServiceTestCase (along with IGenericCollection and everything else imported from lazr.restful.tests.test_webservice) is not packaged for import by other code. It was written for use with the unit tests in test_webservice.py, and now that it's being used more generally it should be moved to lazr.restful.testing.webservice.

I plan to move that code to lazr.restful.testing.webservice, but I don't want to do that as part of this branch. I'm working on another lazr.restful release that will immediately have to be integrated into Launchpad, and I can move the code in that release.

=== modified file 'lib/canonical/launchpad/configure.zcml'
--- lib/canonical/launchpad/configure.zcml	2010-02-18 17:00:54 +0000
+++ lib/canonical/launchpad/configure.zcml	2010-02-25 00:40:51 +0000
@@ -8,6 +8,8 @@
   xmlns:i18n="http://namespaces.zope.org/i18n"
   i18n_domain="launchpad">
 
+  <include package="grokcore.component" file="meta.zcml" />
+
   <include package="canonical.launchpad.webapp" />
   <include package="canonical.launchpad.vocabularies" />
   <include file="links.zcml" />

=== modified file 'lib/canonical/launchpad/interfaces/launchpad.py'
--- lib/canonical/launchpad/interfaces/launchpad.py	2010-01-20 19:33:29 +0000
+++ lib/canonical/launchpad/interfaces/launchpad.py	2010-02-25 00:40:50 +0000
@@ -14,6 +14,7 @@
 from zope.schema import Bool, Choice, Int, TextLine
 from persistent import IPersistent
 
+from lazr.restful.interfaces import IServiceRootResource
 from canonical.launchpad import _
 from canonical.launchpad.fields import PublicPersonChoice
 from canonical.launchpad.webapp.interfaces import ILaunchpadApplication
@@ -402,7 +403,7 @@
         """Removes annotation at the given namespace."""
 
 
-class IWebServiceApplication(ILaunchpadApplication):
+class IWebServiceApplication(ILaunchpadApplication, IServiceRootResource):
     """Launchpad web service application root."""
 
 

=== modified file 'lib/canonical/launchpad/javascript/bugs/bugtask-index.js'
--- lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2010-01-29 16:00:43 +0000
+++ lib/canonical/launchpad/javascript/bugs/bugtask-index.js	2010-02-25 00:40:50 +0000
@@ -1416,7 +1416,7 @@
                 // an API object. Once such a solution is available we should
                 // fix this.
                 milestone_content.one('.value').setAttribute(
-                    'href', new_value.replace('/api/beta', ''));
+                    'href', new_value.replace('/api/devel', ''));
             }
             // Set the inline form control's value, so that submitting
             // it won't override the value we just set.

=== modified file 'lib/canonical/launchpad/javascript/client/client.js'
--- lib/canonical/launchpad/javascript/client/client.js	2009-12-07 12:26:37 +0000
+++ lib/canonical/launchpad/javascript/client/client.js	2010-02-25 00:40:50 +0000
@@ -101,15 +101,15 @@
     var host_start = uri.indexOf('//');
     if (host_start != -1) {
         var host_end = uri.indexOf('/', host_start+2);
-        // eg. "http://www.example.com/api/beta/foo";
+        // eg. "http://www.example.com/api/devel/foo";
         // Don't try to insert the service base into what was an
         // absolute URL. So "http://www.example.com/foo" becomes "/foo"
         return uri.substring(host_end, uri.length);
     }
 
-    var base = "/api/beta";
+    var base = "/api/devel";
     if (uri.indexOf(base.substring(1, base.length)) === 0) {
-        // eg. "api/beta/foo"
+        // eg. "api/devel/foo"
         return '/' + uri;
     }
     if (uri.indexOf(base) !== 0) {

=== modified file 'lib/canonical/launchpad/javascript/lp/comment.js'
--- lib/canonical/launchpad/javascript/lp/comment.js	2010-01-15 02:35:41 +0000
+++ lib/canonical/launchpad/javascript/lp/comment.js	2010-02-25 00:40:51 +0000
@@ -317,7 +317,7 @@
         var reply_link = LP.client.normalize_uri(e.target.get('href'));
         var root_url = reply_link.substr(0,
             reply_link.length - '+reply'.length);
-        var object_url = '/api/beta' + root_url;
+        var object_url = '/api/devel' + root_url;
         this.activateProgressUI('Loading...');
         window.scrollTo(0, Y.one('#add-comment').getY());
         this.lp_client.get(object_url, {

=== modified file 'lib/canonical/launchpad/pagetests/webservice/xx-service.txt'
--- lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2009-12-16 16:30:00 +0000
+++ lib/canonical/launchpad/pagetests/webservice/xx-service.txt	2010-02-25 00:40:51 +0000
@@ -1,10 +1,37 @@
-= Introduction =
+************
+Introduction
+************
 
 Some standard behavior is defined by the web service itself, not by
 the individual resources.
 
-
-== No beta team redirection ==
+Multiple versions
+=================
+
+The Launchpad web service defines three versions: 'beta', '1.0', and
+'devel'.
+
+    >>> def me_link_for_version(version):
+    ...     response = webservice.get("/", api_version=version)
+    ...     print response.jsonBody()['me_link']
+
+    >>> me_link_for_version('beta')
+    http://api.launchpad.dev/beta/people/+me
+
+    >>> me_link_for_version('1.0')
+    http://api.launchpad.dev/1.0/people/+me
+
+    >>> me_link_for_version('devel')
+    http://api.launchpad.dev/devel/people/+me
+
+No other versions are available.
+
+    >>> print webservice.get("/", api_version="nosuchversion")
+    HTTP/1.1 404 Not Found
+    ...
+
+No beta team redirection
+========================
 
 Members of the beta team aren't redirected to the beta site on API call.
 
@@ -46,17 +73,18 @@
 
     >>> ignored = config.pop('beta_data')
 
-
-== Resources not exposed on the web service ==
-
-Soyuz build set (exposed on the web at builders) are not available on the
+Resources not exposed on the web service
+========================================
+
+Soyuz build set (exposed on the web at /builders) are not available on the
 web service:
 
     >>> print webservice.get("/builders")
     HTTP/1.1 404 Not Found
     ...
 
-== Anonymous requests ==
+Anonymous requests
+==================
 
 A properly signed web service request whose OAuth token key is empty
 is treated as an anonymous request.
@@ -128,7 +156,8 @@
     (<Person at...>, 'displayname', 'launchpad.Edit')
     ...
 
-== API Requests to other hosts ==
+API Requests to other hosts
+===========================
 
 JavaScript working with the API must deal with the browser's Same Origin
 Policy - requests may only be made to the host that the page was loaded
@@ -144,15 +173,15 @@
 rather than the api host.  The canonical_url() function also returns
 links to the current host.
 
-The ServiceRoot for http://bugs.launchpad.dev/api/beta/ is the same as a
+The ServiceRoot for http://bugs.launchpad.dev/api/devel/ is the same as a
 request to http://api.launchpad.net/beta/, but with the links pointing
 to a different host.
 
     >>> webservice.domain = 'bugs.launchpad.dev'
     >>> root = webservice.get(
-    ...     'http://bugs.launchpad.dev/api/beta/').jsonBody()
+    ...     'http://bugs.launchpad.dev/api/devel/').jsonBody()
     >>> print root['people_collection_link']
-    http://bugs.launchpad.dev/api/beta/people
+    http://bugs.launchpad.dev/api/devel/people
 
 Requests on these hosts also honor the standard Launchpad authorization
 scheme (and don't require OAuth).
@@ -163,11 +192,11 @@
     ...     domain='bugs.launchpad.dev')
     >>> sample_auth = 'Basic %s' % '[e-mail]:test'.encode('base64')
     >>> print noauth_webservice.get(
-    ...     'http://bugs.launchpad.dev/api/beta/people/+me',
+    ...     'http://bugs.launchpad.dev/api/devel/people/+me',
     ...     headers={'Authorization': sample_auth})
     HTTP/1.1 303 See Other
     ...
-    Location: http://bugs.launchpad.dev/api/beta/~name12...
+    Location: http://bugs.launchpad.dev/api/devel/~name12...
     ...
 
 But the regular authentication still doesn't work on the normal API

=== modified file 'lib/canonical/launchpad/rest/configuration.py'
--- lib/canonical/launchpad/rest/configuration.py	2009-10-16 01:54:41 +0000
+++ lib/canonical/launchpad/rest/configuration.py	2010-02-25 00:40:50 +0000
@@ -9,10 +9,10 @@
 ]
 
 from zope.component import getUtility
-from zope.interface import implements
+
+from lazr.restful.simple import BaseWebServiceConfiguration
 
 from canonical.config import config
-from lazr.restful.interfaces import IWebServiceConfiguration
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.launchpad.webapp.servers import (
     WebServiceClientRequest, WebServicePublication)
@@ -20,11 +20,10 @@
 from canonical.launchpad import versioninfo
 
 
-class LaunchpadWebServiceConfiguration:
-    implements(IWebServiceConfiguration)
+class LaunchpadWebServiceConfiguration(BaseWebServiceConfiguration):
 
     path_override = "api"
-    service_version_uri_prefix = "beta"
+    active_versions = ["beta", "1.0", "devel"]
     view_permission = "launchpad.View"
     set_hop_by_hop_headers = True
 

=== modified file 'lib/canonical/launchpad/testing/pages.py'
--- lib/canonical/launchpad/testing/pages.py	2010-02-16 21:21:14 +0000
+++ lib/canonical/launchpad/testing/pages.py	2010-02-25 00:40:50 +0000
@@ -136,6 +136,8 @@
         self.handle_errors = handle_errors
         WebServiceCaller.__init__(self, handle_errors, domain, protocol)
 
+    default_api_version = "beta"
+
     def addHeadersTo(self, full_url, full_headers):
         if (self.consumer is not None and self.access_token is not None):
             request = OAuthRequest.from_consumer_and_token(

=== modified file 'lib/canonical/launchpad/webapp/servers.py'
--- lib/canonical/launchpad/webapp/servers.py	2010-02-12 19:26:23 +0000
+++ lib/canonical/launchpad/webapp/servers.py	2010-02-25 00:40:51 +0000
@@ -26,7 +26,7 @@
 from zope.app.server import wsgi
 from zope.app.wsgi import WSGIPublisherApplication
 from zope.component import getUtility
-from zope.interface import implements
+from zope.interface import alsoProvides, implements
 from zope.publisher.browser import (
     BrowserRequest, BrowserResponse, TestRequest)
 from zope.publisher.interfaces import NotFound
@@ -41,7 +41,8 @@
 from canonical.config import config
 
 from canonical.lazr.interfaces.feed import IFeed
-from lazr.restful.interfaces import IWebServiceConfiguration
+from lazr.restful.interfaces import (
+    IWebServiceConfiguration, IWebServiceVersion)
 from lazr.restful.publisher import (
     WebServicePublicationMixin, WebServiceRequestTraversal)
 
@@ -1277,7 +1278,7 @@
     """
     implements(canonical.launchpad.layers.WebServiceLayer)
 
-    def __init__(self, body_instream=None, environ=None, **kw):
+    def __init__(self, body_instream=None, environ=None, version=None, **kw):
         test_environ = {
             'SERVER_URL': 'http://api.launchpad.dev',
             'HTTP_HOST': 'api.launchpad.dev',
@@ -1286,6 +1287,11 @@
             test_environ.update(environ)
         super(WebServiceTestRequest, self).__init__(
             body_instream=body_instream, environ=test_environ, **kw)
+        if version is None:
+            version = getUtility(IWebServiceConfiguration).active_versions[-1]
+        self.version = version
+        version_marker = getUtility(IWebServiceVersion, name=version)
+        alsoProvides(self, version_marker)
 
 
 # ---- xmlrpc

=== modified file 'lib/canonical/launchpad/webapp/tests/__init__.py'
--- lib/canonical/launchpad/webapp/tests/__init__.py	2010-01-08 03:15:15 +0000
+++ lib/canonical/launchpad/webapp/tests/__init__.py	2010-02-25 00:40:51 +0000
@@ -2,30 +2,3 @@
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
-
-from lazr.restful.interfaces import IWebServiceConfiguration
-from zope.component import getGlobalSiteManager, provideUtility
-from zope.interface import implements
-
-from lp.testing import TestCase
-
-
-class DummyWebServiceConfiguration:
-    """A totally vanilla web service configuration."""
-    implements(IWebServiceConfiguration)
-    path_override = "api"
-    service_version_uri_prefix = "beta"
-
-
-class DummyConfigurationTestCase(TestCase):
-    """A test case that installs a DummyWebServiceConfiguration."""
-
-    def setUp(self):
-        super(DummyConfigurationTestCase, self).setUp()
-        self.config = DummyWebServiceConfiguration()
-        provideUtility(self.config, IWebServiceConfiguration)
-
-    def tearDown(self):
-        getGlobalSiteManager().unregisterUtility(
-            self.config, IWebServiceConfiguration)
-        super(DummyConfigurationTestCase, self).tearDown()

=== modified file 'lib/canonical/launchpad/webapp/tests/test_dbpolicy.py'
--- lib/canonical/launchpad/webapp/tests/test_dbpolicy.py	2010-02-17 15:12:21 +0000
+++ lib/canonical/launchpad/webapp/tests/test_dbpolicy.py	2010-02-25 00:40:51 +0000
@@ -172,7 +172,7 @@
             and will meltdown when the API becomes popular.
         """
         api_prefix = getUtility(
-            IWebServiceConfiguration).service_version_uri_prefix
+            IWebServiceConfiguration).active_versions[0]
         server_url = 'http://api.launchpad.dev/%s' % api_prefix
         request = LaunchpadTestRequest(SERVER_URL=server_url)
         setFirstLayer(request, WebServiceLayer)
@@ -185,7 +185,7 @@
         can be outsourced to a slave database when possible.
         """
         api_prefix = getUtility(
-            IWebServiceConfiguration).service_version_uri_prefix
+            IWebServiceConfiguration).active_versions[0]
         server_url = 'http://api.launchpad.dev/%s' % api_prefix
         request = LaunchpadTestRequest(SERVER_URL=server_url)
         newInteraction(request)
@@ -211,7 +211,7 @@
         touch_read_only_file()
         try:
             api_prefix = getUtility(
-                IWebServiceConfiguration).service_version_uri_prefix
+                IWebServiceConfiguration).active_versions[0]
             server_url = 'http://api.launchpad.dev/%s' % api_prefix
             request = LaunchpadTestRequest(SERVER_URL=server_url)
             setFirstLayer(request, WebServiceLayer)

=== modified file 'lib/canonical/launchpad/webapp/tests/test_servers.py'
--- lib/canonical/launchpad/webapp/tests/test_servers.py	2010-01-08 03:15:15 +0000
+++ lib/canonical/launchpad/webapp/tests/test_servers.py	2010-02-25 00:40:51 +0000
@@ -6,10 +6,17 @@
 import StringIO
 import unittest
 
+from zope.component import getGlobalSiteManager, getUtility
 from zope.publisher.base import DefaultPublication
 from zope.testing.doctest import DocTestSuite, NORMALIZE_WHITESPACE, ELLIPSIS
 from zope.interface import implements, Interface
 
+from lazr.restful.interfaces import (
+    IServiceRootResource, IWebServiceConfiguration)
+from lazr.restful.simple import RootResource
+from lazr.restful.tests.test_webservice import (
+    IGenericCollection, IGenericEntry, WebServiceTestCase)
+
 from lp.testing import TestCase
 
 from canonical.launchpad.webapp.servers import (
@@ -18,7 +25,6 @@
     TranslationsBrowserRequest, VHostWebServiceRequestPublicationFactory,
     VirtualHostRequestPublicationFactory, WebServiceRequestPublicationFactory,
     WebServiceClientRequest, WebServicePublication, WebServiceTestRequest)
-from canonical.launchpad.webapp.tests import DummyConfigurationTestCase
 
 
 class SetInWSGIEnvironmentTestCase(TestCase):
@@ -90,7 +96,7 @@
             "factory should not have set HTTPS env")
 
 
-class TestVhostWebserviceFactory(DummyConfigurationTestCase):
+class TestVhostWebserviceFactory(WebServiceTestCase):
 
     def setUp(self):
         super(TestVhostWebserviceFactory, self).setUp()
@@ -108,7 +114,7 @@
     @property
     def working_api_path(self):
         """A path to the webservice API that should work every time."""
-        return '/' + self.config.path_override
+        return '/' + getUtility(IWebServiceConfiguration).path_override
 
     @property
     def failing_api_path(self):
@@ -119,7 +125,8 @@
         """The factory should produce WebService request and publication
         objects for requests to the /api root URL.
         """
-        env = self.wsgi_env('/' + self.config.path_override)
+        env = self.wsgi_env(
+            '/' + getUtility(IWebServiceConfiguration).path_override)
 
         # Necessary preamble and sanity check.  We need to call
         # the factory's canHandle() method with an appropriate
@@ -206,7 +213,8 @@
         # This is a sanity check, so I can write '/api/foo' instead
         # of PATH_OVERRIDE + '/foo' in my tests.  The former's
         # intention is clearer.
-        self.assertEqual(self.config.path_override, 'api',
+        self.assertEqual(
+            getUtility(IWebServiceConfiguration).path_override, 'api',
             "Sanity check: The web service path override should be 'api'.")
 
         self.assert_(
@@ -241,7 +249,24 @@
             "/api.")
 
 
-class TestWebServiceRequestTraversal(DummyConfigurationTestCase):
+class TestWebServiceRequestTraversal(WebServiceTestCase):
+
+    testmodule_objects = [IGenericEntry, IGenericCollection]
+
+    def setUp(self):
+        super(TestWebServiceRequestTraversal, self).setUp()
+        # For this test we need to make the URL "/foo" resolve to a
+        # resource.  To this end, we'll define a top-level collection
+        # named 'foo'.
+        class GenericCollection:
+            implements(IGenericCollection)
+            pass
+
+        class MyRootResource(RootResource):
+            def _build_top_level_objects(self):
+                return ({'foo' : (IGenericEntry, GenericCollection())}, {})
+        getGlobalSiteManager().registerUtility(
+            MyRootResource(), IServiceRootResource)
 
     def test_traversal_of_api_path_urls(self):
         """Requests that have /api at the root of their path should trim
@@ -249,35 +274,26 @@
         """
         # First, we need to forge a request to the API.
         data = ''
-        api_url = ('/' + self.config.path_override +
-                   '/' + 'beta' + '/' + 'foo')
+        config = getUtility(IWebServiceConfiguration)
+        api_url = ('/' + config.path_override +
+                   '/' + '1.0' + '/' + 'foo')
         env = {'PATH_INFO': api_url}
-        request = WebServiceClientRequest(data, env)
-
-        # And we need a mock publication object to use during traversal.
-        class WebServicePublicationStub(DefaultPublication):
-            def getResource(self, request, obj):
-                pass
-
-        request.setPublication(WebServicePublicationStub(None))
-
-        # And we need a traversible object that knows about the 'foo' name.
-        root = {'foo': object()}
+        request = config.createRequest(data, env)
 
         stack = request.getTraversalStack()
-        self.assert_(self.config.path_override in stack,
+        self.assert_(config.path_override in stack,
             "Sanity check: the API path should show up in the request's "
             "traversal stack: %r" % stack)
 
-        request.traverse(root)
+        request.traverse(None)
 
         stack = request.getTraversalStack()
-        self.failIf(self.config.path_override in stack,
+        self.failIf(config.path_override in stack,
             "Web service paths should be dropped from the webservice "
             "request traversal stack: %r" % stack)
 
 
-class TestWebServiceRequest(TestCase):
+class TestWebServiceRequest(WebServiceTestCase):
 
     def test_application_url(self):
         """Requests to the /api path should return the original request's
@@ -286,14 +302,14 @@
         # Simulate a request to bugs.launchpad.net/api
         server_url = 'http://bugs.launchpad.dev'
         env = {
-            'PATH_INFO': '/api/beta',
+            'PATH_INFO': '/api/devel',
             'SERVER_URL': server_url,
             'HTTP_HOST': 'bugs.launchpad.dev',
             }
 
         # WebServiceTestRequest will suffice, as it too should conform to
         # the Same Origin web browser policy.
-        request = WebServiceTestRequest(environ=env)
+        request = WebServiceTestRequest(environ=env, version="1.0")
         self.assertEqual(request.getApplicationURL(), server_url)
 
     def test_response_should_vary_based_on_content_type(self):

=== modified file 'lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js'
--- lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js	2009-09-17 16:27:19 +0000
+++ lib/canonical/launchpad/windmill/jstests/launchpad_ajax.js	2010-02-25 00:40:50 +0000
@@ -35,19 +35,19 @@
         jum.assertNotUndefined(LP.client.cache.context);
         var context = LP.client.cache.context;
         jum.assertNotEquals(context.self_link.indexOf(
-                            "/api/beta/firefox/+bug/1"), -1);
+                            "/api/devel/firefox/+bug/1"), -1);
         jum.assertNotEquals(context.resource_type_link.indexOf(
-                            "/api/beta/#bug_task"), -1);
+                            "/api/devel/#bug_task"), -1);
         jum.assertNotEquals(context.owner_link.indexOf(
-                            "/api/beta/~name12"), -1);
+                            "/api/devel/~name12"), -1);
         jum.assertNotEquals(context.related_tasks_collection_link.indexOf(
-                            "/api/beta/firefox/+bug/1/related_tasks"), -1);
+                            "/api/devel/firefox/+bug/1/related_tasks"), -1);
 
         // Specific views may add additional objects to the object cache
         // or links to the link cache.
         var bug = LP.client.cache.bug;
         jum.assertNotUndefined(LP.client.cache.bug);
-        jum.assertNotEquals(bug.self_link.indexOf("/api/beta/bugs/1"), -1);
+        jum.assertNotEquals(bug.self_link.indexOf("/api/devel/bugs/1"), -1);
     }
     ]);
 
@@ -71,13 +71,13 @@
 
 var test_normalize_uri = function() {
     var normalize = LP.client.normalize_uri;
-    jum.assertEquals(normalize("http://www.example.com/api/beta/foo"),
-                     "/api/beta/foo");
+    jum.assertEquals(normalize("http://www.example.com/api/devel/foo"),
+                     "/api/devel/foo");
     jum.assertEquals(normalize("http://www.example.com/foo/bar"), "/foo/bar");
-    jum.assertEquals(normalize("/foo/bar"), "/api/beta/foo/bar");
-    jum.assertEquals(normalize("/api/beta/foo/bar"), "/api/beta/foo/bar");
-    jum.assertEquals(normalize("foo/bar"), "/api/beta/foo/bar");
-    jum.assertEquals(normalize("api/beta/foo/bar"), "/api/beta/foo/bar");
+    jum.assertEquals(normalize("/foo/bar"), "/api/devel/foo/bar");
+    jum.assertEquals(normalize("/api/devel/foo/bar"), "/api/devel/foo/bar");
+    jum.assertEquals(normalize("foo/bar"), "/api/devel/foo/bar");
+    jum.assertEquals(normalize("api/devel/foo/bar"), "/api/devel/foo/bar");
 };
 
 var test_append_qs = function() {
@@ -87,12 +87,12 @@
 };
 
 var test_field_uri = function() {
-    jum.assertEquals(LP.client.get_field_uri("http://www.example.com/api/beta/foo", "field"),
-                     "/api/beta/foo/field");
+    jum.assertEquals(LP.client.get_field_uri("http://www.example.com/api/devel/foo", "field"),
+                     "/api/devel/foo/field");
     jum.assertEquals(LP.client.get_field_uri("/no/slash", "field"),
-                     "/api/beta/no/slash/field");
+                     "/api/devel/no/slash/field");
     jum.assertEquals(LP.client.get_field_uri("/has/slash/", "field"),
-                     "/api/beta/has/slash/field");
+                     "/api/devel/has/slash/field");
 };
 
 // Test that retrieving a non-existent resource uses the failure handler.

=== modified file 'lib/canonical/launchpad/zcml/webservice.zcml'
--- lib/canonical/launchpad/zcml/webservice.zcml	2009-07-13 18:15:02 +0000
+++ lib/canonical/launchpad/zcml/webservice.zcml	2010-02-25 00:40:50 +0000
@@ -5,6 +5,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope"
     xmlns:browser="http://namespaces.zope.org/browser"
+    xmlns:grok="http://namespaces.zope.org/grok"
     xmlns:webservice="http://namespaces.canonical.com/webservice"
     xmlns:i18n="http://namespaces.zope.org/i18n"
     i18n_domain="launchpad">
@@ -46,11 +47,15 @@
         />
 
     <adapter
-        for="canonical.launchpad.interfaces.IBugComment"
+        for="canonical.launchpad.interfaces.IBugComment
+             lazr.restful.interfaces.IWebServiceClientRequest"
         provides="lazr.restful.interfaces.IEntry"
         factory="canonical.launchpad.rest.bugcomment_to_entry"
         />
 
+   <grok:grok package="lazr.restful.directives" />
+   <grok:grok package="canonical.launchpad.rest" />
+
    <webservice:register module="canonical.launchpad.interfaces" />
 
    <adapter

=== modified file 'lib/canonical/lazr/doc/folder.txt'
--- lib/canonical/lazr/doc/folder.txt	2009-04-17 10:32:16 +0000
+++ lib/canonical/lazr/doc/folder.txt	2010-02-25 00:40:51 +0000
@@ -32,7 +32,7 @@
     >>> from zope.publisher.interfaces.browser import IBrowserPublisher
     >>> from lazr.restful.testing.webservice import FakeRequest
 
-    >>> view = MyFolder(object(), FakeRequest())
+    >>> view = MyFolder(object(), FakeRequest(version="devel"))
     >>> verifyObject(IBrowserPublisher, view)
     True
 
@@ -54,7 +54,7 @@
 It accepts traversing to the file through an arbitrary revision
 identifier.
 
-    >>> view = MyFolder(object(), FakeRequest())
+    >>> view = MyFolder(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'rev6510')
     >>> view = view.publishTraverse(view.request, 'image1.gif')
     >>> print view()
@@ -62,7 +62,7 @@
 
 Requesting a directory raises a NotFound.
 
-    >>> view = MyFolder(object(), FakeRequest())
+    >>> view = MyFolder(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'a_dir')
     >>> view()
     Traceback (most recent call last):
@@ -72,7 +72,7 @@
 By default, subdirectories are not exported. (See below on how to enable
 this)
 
-    >>> view = MyFolder(object(), FakeRequest())
+    >>> view = MyFolder(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'a_dir')
     >>> view = view.publishTraverse(view.request, 'other.txt')
     >>> view()
@@ -82,7 +82,7 @@
 
 Not requesting any file, also raises NotFound.
 
-    >>> view = MyFolder(object(), FakeRequest())
+    >>> view = MyFolder(object(), FakeRequest(version="devel"))
     >>> view()
     Traceback (most recent call last):
       ...
@@ -90,7 +90,7 @@
 
 As requesting a non-existent file.
 
-    >>> view = MyFolder(object(), FakeRequest())
+    >>> view = MyFolder(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'image2')
     >>> view()
     Traceback (most recent call last):
@@ -111,7 +111,7 @@
     >>> class MyImageFolder(ExportedImageFolder):
     ...     folder = resource_dir
 
-    >>> view = MyImageFolder(object(), FakeRequest())
+    >>> view = MyImageFolder(object(), FakeRequest(version="devel"))
     >>> view.image_extensions
     ('.png', '.gif')
 
@@ -128,12 +128,12 @@
     >>> file(os.path.join(resource_dir, 'image3.gif'), 'w').write(
     ...     'Image with extension')
 
-    >>> view = MyImageFolder(object(), FakeRequest())
+    >>> view = MyImageFolder(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'image3')
     >>> print view()
     Image without extension
 
-    >>> view = MyImageFolder(object(), FakeRequest())
+    >>> view = MyImageFolder(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'image3.gif')
     >>> print view()
     Image with extension
@@ -159,7 +159,7 @@
 
 Traversing to a file in a subdirectory will now work.
 
-    >>> view = MyTree(object(), FakeRequest())
+    >>> view = MyTree(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'public')
     >>> view = view.publishTraverse(view.request, 'subdir1')
     >>> view = view.publishTraverse(view.request, 'test1.txt')
@@ -168,7 +168,7 @@
 
 But traversing to the subdirectory itself will raise a NotFound.
 
-    >>> view = MyTree(object(), FakeRequest())
+    >>> view = MyTree(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'public')
     >>> print view()
     Traceback (most recent call last):
@@ -177,7 +177,7 @@
 
 Trying to request a non-existent file, will also raise a NotFound.
 
-    >>> view = MyTree(object(), FakeRequest())
+    >>> view = MyTree(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'public')
     >>> view = view.publishTraverse(view.request, 'nosuchfile.txt')
     >>> view()
@@ -188,7 +188,7 @@
 Traversing beyond an existing file to a non-existant file raises a
 NotFound.
 
-    >>> view = MyTree(object(), FakeRequest())
+    >>> view = MyTree(object(), FakeRequest(version="devel"))
     >>> view = view.publishTraverse(view.request, 'public')
     >>> view = view.publishTraverse(view.request, 'subdir1')
     >>> view = view.publishTraverse(view.request, 'test1.txt')

=== modified file 'lib/canonical/lazr/doc/menus.txt'
--- lib/canonical/lazr/doc/menus.txt	2009-10-21 17:41:20 +0000
+++ lib/canonical/lazr/doc/menus.txt	2010-02-25 00:40:50 +0000
@@ -547,7 +547,7 @@
     >>> summarise_links(RecipeMenu(recipe))
     Traceback (most recent call last):
      ...
-    AttributeError: 'NoneType' object has no attribute 'participations'
+    AttributeError: 'NoneType' object has no attribute 'getURL'
 
 
 == Registering menus as adapters for content objects and views ==

=== modified file 'lib/canonical/widgets/lazrjs.py'
--- lib/canonical/widgets/lazrjs.py	2009-11-30 02:09:48 +0000
+++ lib/canonical/widgets/lazrjs.py	2010-02-25 00:40:50 +0000
@@ -329,11 +329,16 @@
             # The user may not have write access on the attribute itself, but
             # the REST API may have a mutator method configured, such as
             # transitionToAssignee.
-            exported_tag = self.interface_attribute.getTaggedValue(
+            #
+            # We look at the top of the annotation stack, since Ajax
+            # requests always go to the most recent version of the web
+            # service.
+            exported_tag_stack = self.interface_attribute.getTaggedValue(
                 'lazr.restful.exported')
-            mutator = exported_tag.get('mutated_by')
-            if mutator is not None:
-                return canAccess(self.context, mutator.__name__)
+            mutator_info = exported_tag_stack.get('mutator_annotations')
+            if mutator_info is not None:
+                mutator_method, mutator_extra = mutator_info
+                return canAccess(self.context, mutator_method.__name__)
             else:
                 return False
 

=== modified file 'lib/lp/bugs/adapters/bug.py'
--- lib/lp/bugs/adapters/bug.py	2009-06-25 00:40:31 +0000
+++ lib/lp/bugs/adapters/bug.py	2010-02-25 00:40:51 +0000
@@ -8,12 +8,15 @@
     'bugcomment_to_entry',
     ]
 
+from zope.component import getMultiAdapter
 from lazr.restful.interfaces import IEntry
 
-def bugcomment_to_entry(comment):
+
+def bugcomment_to_entry(comment, version):
     """Will adapt to the bugcomment to the real IMessage.
 
     This is needed because navigation to comments doesn't return
     real IMessage instances but IBugComment.
     """
-    return IEntry(comment.bugtask.bug.messages[comment.index])
+    return getMultiAdapter(
+        (comment.bugtask.bug.messages[comment.index], version), IEntry)

=== modified file 'lib/lp/code/browser/configure.zcml'
--- lib/lp/code/browser/configure.zcml	2010-02-23 21:48:53 +0000
+++ lib/lp/code/browser/configure.zcml	2010-02-25 00:40:50 +0000
@@ -1068,5 +1068,11 @@
         factory="lp.code.browser.diff.PreviewDiffFormatterAPI"
         name="fmt"
         />
+    <adapter
+        for="lp.code.interfaces.diff.IDiff"
+        provides="zope.traversing.interfaces.IPathAdapter"
+        factory="lp.code.browser.diff.DiffFormatterAPI"
+        name="fmt"
+        />
 
 </configure>

=== modified file 'lib/lp/code/browser/diff.py'
--- lib/lp/code/browser/diff.py	2010-02-19 16:31:54 +0000
+++ lib/lp/code/browser/diff.py	2010-02-25 00:40:50 +0000
@@ -23,8 +23,10 @@
     usedfor = IPreviewDiff
 
 
-class PreviewDiffFormatterAPI(ObjectFormatterAPI):
-    """Formatter for preview diffs."""
+class DiffFormatterAPI(ObjectFormatterAPI):
+
+    def _get_url(self, librarian_alias):
+        return librarian_alias.getURL()
 
     def url(self, view_name=None, rootsite=None):
         """Use the url of the librarian file containing the diff.
@@ -32,8 +34,7 @@
         librarian_alias = self._context.diff_text
         if librarian_alias is None:
             return None
-        else:
-            return canonical_url(self._context) + '/+files/preview.diff'
+        return self._get_url(librarian_alias)
 
     def link(self, view_name):
         """The link to the diff should show the line count.
@@ -85,3 +86,10 @@
                 '<a href="%(url)s" class="diff-link">'
                 '%(line_count)s%(count_text)s%(file_text)s%(conflict_text)s'
                 '</a>' % args)
+
+
+class PreviewDiffFormatterAPI(DiffFormatterAPI):
+    """Formatter for preview diffs."""
+
+    def _get_url(self, library_):
+        return canonical_url(self._context) + '/+files/preview.diff'

=== modified file 'lib/lp/code/browser/tests/test_tales.py'
--- lib/lp/code/browser/tests/test_tales.py	2010-02-18 17:23:49 +0000
+++ lib/lp/code/browser/tests/test_tales.py	2010-02-25 00:40:51 +0000
@@ -67,7 +67,7 @@
         self.assertEqual(False, preview.stale)
         self.assertEqual(True, self._createStalePreviewDiff().stale)
         self.assertEqual(u'conflicts', preview.conflicts)
-        self.assertEqual({'filename': (3,2)}, preview.diffstat)
+        self.assertEqual({'filename': (3, 2)}, preview.diffstat)
 
     def test_fmt_no_diff(self):
         # If there is no diff, there is no link.
@@ -159,6 +159,17 @@
             test_tales('preview/fmt:link', preview=preview))
 
 
+class TestDiffFormatter(TestCaseWithFactory):
+    """Test the DiffFormatterAPI class."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def test_url(self):
+        diff = self.factory.makeDiff()
+        self.assertEqual(
+            diff.diff_text.getURL(), test_tales('diff/fmt:url', diff=diff))
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-02-23 21:48:53 +0000
+++ lib/lp/code/model/branch.py	2010-02-25 00:40:51 +0000
@@ -606,7 +606,7 @@
 
         for bugbranch in self.bug_branches:
             deletion_operations.append(
-                DeletionCallable(bugbranch,
+                DeletionCallable(bugbranch.bug.default_bugtask,
                 _('This bug is linked to this branch.'),
                 bugbranch.destroySelf))
         for spec_link in self.spec_links:

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2010-02-19 02:15:27 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-02-25 00:40:51 +0000
@@ -867,7 +867,7 @@
         """Deletion requirements for a branch with a bug are right."""
         bug = self.factory.makeBug()
         bug.linkBranch(self.branch, self.branch.owner)
-        self.assertEqual({bug.linked_branches[0]:
+        self.assertEqual({bug.default_bugtask:
             ('delete', _('This bug is linked to this branch.'))},
             self.branch.deletionRequirements())
 

=== modified file 'lib/lp/code/stories/branches/xx-bug-branch-links.txt'
--- lib/lp/code/stories/branches/xx-bug-branch-links.txt	2009-11-17 09:08:17 +0000
+++ lib/lp/code/stories/branches/xx-bug-branch-links.txt	2010-02-25 00:40:51 +0000
@@ -1,10 +1,13 @@
-= Bug branch links =
+================
+Bug branch links
+================
 
 It is possible to link bugs and branches from both the bug page and the branch
 page.
 
 
-== From the branch page ==
+From the branch page
+====================
 
 There is a "Link to a bug report" item in the actions menu that is visible
 to everybody but which links to a page restricted with the
@@ -98,7 +101,8 @@
     No bug branch links
 
 
-== From the bug page ==
+From the bug page
+=================
 
 The action link on the bug page is "Link a related branch".  Again this
 links to a page restricted with the launchpad.AnyPerson permission.
@@ -129,7 +133,8 @@
     Bug #11: Make Jokosher use autoaudiosink (Undecided &ndash; New)
 
 
-=== Quick branch registration ===
+Quick branch registration
+=========================
 
 You can also register a branch at the same time as registering a bug-branch
 link. Instead of entering the unique name of a branch, you can enter a URL:
@@ -182,7 +187,8 @@
     No bug branch links
 
 
-== Deleting bug branch links ==
+Deleting bug branch links
+=========================
 
 The edit view for the bug branch also now has a delete button to unlink
 the bug from the branch.
@@ -192,3 +198,23 @@
     >>> browser.getLink(url="+delete").click()
     >>> printBugBranchLinks(browser)
     No bug branch links
+
+
+Deleting a branch with linked bugs
+==================================
+
+    >>> login('[e-mail]')
+    >>> grub = factory.makeAnyBranch()
+    >>> new_bug = factory.makeBug()
+    >>> grub_bug_link = grub.linkBug(new_bug, grub.owner)
+    >>> grub_url = canonical_url(grub)
+    >>> logout()
+
+    >>> admin_browser.open(grub_url)
+    >>> admin_browser.getLink('Delete branch').click()
+
+    >>> print find_tag_by_id(admin_browser.contents, 'deletion-items')
+    <ul ...
+    <a href="http://bugs.launchpad.dev/product-name.../+bug/..."
+    class="sprite bug-undecided">Bug #...: generic-string...</a>...
+

=== modified file 'lib/lp/code/templates/branch-delete.pt'
--- lib/lp/code/templates/branch-delete.pt	2009-08-12 00:47:32 +0000
+++ lib/lp/code/templates/branch-delete.pt	2010-02-25 00:40:51 +0000
@@ -24,7 +24,7 @@
 
   <tal:deletelist condition="view/branch_deletion_actions/delete">
     The following items must be <em>deleted</em>:
-    <ul>
+    <ul id="deletion-items">
       <tal:actions repeat="row view/branch_deletion_actions/delete">
         <li>
           <img src="/@@/no" title="Insufficient privileges"

=== modified file 'lib/lp/registry/doc/sourcepackage.txt'
--- lib/lp/registry/doc/sourcepackage.txt	2010-02-15 12:59:55 +0000
+++ lib/lp/registry/doc/sourcepackage.txt	2010-02-25 00:40:51 +0000
@@ -256,87 +256,64 @@
 
     >>> from lp.registry.model.sourcepackage import SourcePackage
     >>> sp = SourcePackage(sourcepackagename=firefox, distroseries=hoary)
-    >>> sp.productseries.name
-    u'1.0'
+    >>> print sp.productseries.name
+    1.0
 
-Now we make sure there is no Packaging data for a52dec in hoary.
+A source package's product series is None when it does not have a
+Packaging entry. Historical packaging does not affect the state of the
+productseries attribute.
 
     >>> from lp.registry.model.packaging import PackagingUtil
-    >>> a52decsp = SourcePackage(sourcepackagename=a52dec,
-    ...     distroseries=hoary)
-    >>> a52decsp.productseries.name
-    u'trunk'
-
-    >>> PackagingUtil().packagingEntryExists(
-    ...     productseries=a52decsp.productseries,
-    ...     sourcepackagename=a52dec,
-    ...     distroseries=hoary)
-    False
-
-So far so good.
-
-Now verify we still get a product for that source package, thanks to the
-fact that we have Warty data for it
-
-    >>> PackagingUtil().packagingEntryExists(
-    ...     productseries=a52decsp.productseries,
-    ...     sourcepackagename=a52dec,
-    ...     distroseries=warty)
-    True
-
-    >>> a52decsp.productseries.product.name
-    u'a52dec'
-
-Similarly, we should be able to get the packaging information from a
-parent distroseries, on the basis that a derivative is highly unlikely
-to change the packaging drastically without changing the name of the
-package.
-
-First, show there is no packging data for a52dec in g2k5:
-
-    >>> PackagingUtil().packagingEntryExists(
-    ...     productseries=a52decsp.productseries,
-    ...     sourcepackagename=a52dec,
-    ...     distroseries=g2k5)
-    False
-
-Now verify we still get a product for that source package
-
-    >>> sp = SourcePackage(sourcepackagename=a52dec, distroseries=g2k5)
-    >>> sp.productseries.product.name
-    u'a52dec'
-
-And if we want to link that productseries to a source package in that
-distroseries
+    >>> hoary_a52dec = SourcePackage(sourcepackagename=a52dec,
+    ...     distroseries=hoary)
+    >>> PackagingUtil().packagingEntryExists(
+    ...     productseries=hoary_a52dec.productseries,
+    ...     sourcepackagename=a52dec,
+    ...     distroseries=hoary)
+    False
+
+    >>> print hoary_a52dec.productseries
+    None
+
+Once a Packaging entry is created to link a distro series source package name
+to a product series, the source package does have a product series.
 
     >>> from lp.registry.interfaces.packaging import PackagingType
-    >>> from lp.registry.model.person import Person
-    >>> foobar = Person.byName('name16')
+
+    >>> user = factory.makePerson()
+    >>> a52dec_series = factory.makeProductSeries(name='ratty')
     >>> PackagingUtil().createPackaging(
-    ...     productseries=sp.productseries,
+    ...     productseries=a52dec_series,
     ...     sourcepackagename=a52dec,
-    ...     distroseries=g2k5,
+    ...     distroseries=hoary,
     ...     packaging=PackagingType.PRIME,
-    ...     owner=foobar)
+    ...     owner=user)
 
     >>> PackagingUtil().packagingEntryExists(
-    ...     productseries=sp.productseries,
+    ...     productseries=a52dec_series,
     ...     sourcepackagename=a52dec,
-    ...     distroseries=g2k5)
+    ...     distroseries=hoary)
     True
 
-Packaging entries can be deleted using PackagingUtil.deletePackaging.
+    >>> print hoary_a52dec.productseries.name
+    ratty
+
+Packaging entries can be deleted using PackagingUtil.deletePackaging. That
+also removes the source package product series.
 
     >>> PackagingUtil().deletePackaging(
-    ...     productseries=sp.productseries,
+    ...     productseries=a52dec_series,
     ...     sourcepackagename=a52dec,
-    ...     distroseries=g2k5)
+    ...     distroseries=hoary)
     >>> PackagingUtil().packagingEntryExists(
-    ...     productseries=sp.productseries,
+    ...     productseries=a52dec_series,
     ...     sourcepackagename=a52dec,
-    ...     distroseries=g2k5)
+    ...     distroseries=hoary)
     False
 
+    >>> print hoary_a52dec.productseries
+    None
+
 Linkified changelogs are available through SourcePackageReleaseView: XXX
 julian 2007-09-17 This is duplicating the page test. Instead it should
 be more like the bug number linkification just below.

=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2009-11-21 08:56:44 +0000
+++ lib/lp/registry/model/sourcepackage.py	2010-02-25 00:40:51 +0000
@@ -12,7 +12,6 @@
     ]
 
 from operator import attrgetter
-from warnings import warn
 from sqlobject.sqlbuilder import SQLConstant
 from zope.interface import classProvides, implements
 from zope.component import getUtility
@@ -337,8 +336,7 @@
 
         return IStore(SourcePackageRelease).find(
             SourcePackageRelease,
-            In(SourcePackageRelease.id, subselect)
-            ).order_by(Desc(
+            In(SourcePackageRelease.id, subselect)).order_by(Desc(
                 SQL("debversion_sort_key(SourcePackageRelease.version)")))
 
     @property
@@ -346,19 +344,9 @@
         return self.sourcepackagename.name
 
     @property
-    def product(self):
-        # we have moved to focusing on productseries as the linker
-        warn('SourcePackage.product is deprecated, use .productseries',
-             DeprecationWarning, stacklevel=2)
-        ps = self.productseries
-        if ps is not None:
-            return ps.product
-        return None
-
-    @property
     def productseries(self):
         # See if we can find a relevant packaging record
-        packaging = self.packaging
+        packaging = self.direct_packaging
         if packaging is None:
             return None
         return packaging.productseries
@@ -366,16 +354,11 @@
     @property
     def direct_packaging(self):
         """See `ISourcePackage`."""
-        # XXX flacoste 2008-02-28 For some crack reasons, it is possible
-        # for multiple productseries (of the same product) to state that they
-        # are packaged in the same source package. This creates all sort of
-        # weirdness documented in bug #196774. But in order to work around bug
-        # #181770, use a sort order that will be stable. I guess it makes the
-        # most sense to return the latest one.
-        return Packaging.selectFirstBy(
+        store = Store.of(self.sourcepackagename)
+        return store.find(
+            Packaging,
             sourcepackagename=self.sourcepackagename,
-            distroseries=self.distroseries,
-            orderBy=['packaging', '-datecreated'])
+            distroseries=self.distroseries).one()
 
     @property
     def packaging(self):
@@ -696,18 +679,16 @@
         uploads = [
             build.package_upload
             for build in builds
-            if build.package_upload
-            ]
+            if build.package_upload]
         custom_files = []
         for upload in uploads:
             custom_files += [
                 custom for custom in upload.customfiles
-                if custom.customformat == our_format
-                ]
+                if custom.customformat == our_format]
 
         custom_files.sort(key=attrgetter('id'))
         return [custom.libraryfilealias for custom in custom_files]
 
     def linkedBranches(self):
         """See `ISourcePackage`."""
-        return dict((p.name,b) for (p,b) in self.linked_branches)
+        return dict((p.name, b) for (p, b) in self.linked_branches)

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-02-24 13:37:51 +0000
+++ lib/lp/testing/factory.py	2010-02-25 00:40:50 +0000
@@ -83,6 +83,7 @@
 from lp.code.interfaces.codeimportmachine import ICodeImportMachineSet
 from lp.code.interfaces.codeimportresult import ICodeImportResultSet
 from lp.code.interfaces.revision import IRevisionSet
+<<<<<<< TREE
 from lp.code.interfaces.sourcepackagerecipe import ISourcePackageRecipeSource
 from lp.code.interfaces.sourcepackagerecipebuild import (
     ISourcePackageRecipeBuildSource,
@@ -91,6 +92,9 @@
 from lp.codehosting.codeimport.worker import CodeImportSourceDetails
 
 from lp.registry.interfaces.distribution import IDistributionSet
+=======
+from lp.code.model.diff import Diff, PreviewDiff, StaticDiff
+>>>>>>> MERGE-SOURCE
 from lp.registry.model.distributionsourcepackage import (
     DistributionSourcePackage)
 from lp.registry.interfaces.distroseries import IDistroSeries
@@ -1007,6 +1011,11 @@
         preview_diff.target_revision_id = self.getUniqueUnicode()
         return preview_diff
 
+    def makeStaticDiff(self):
+        return StaticDiff.acquireFromText(
+            self.getUniqueUnicode(), self.getUniqueUnicode(),
+            self.getUniqueString())
+
     def makeRevision(self, author=None, revision_date=None, parent_ids=None,
                      rev_id=None, log_body=None, date_created=None):
         """Create a single `Revision`."""

=== modified file 'lib/lp/testopenid/browser/server.py'
--- lib/lp/testopenid/browser/server.py	2010-02-01 12:38:31 +0000
+++ lib/lp/testopenid/browser/server.py	2010-02-25 00:40:50 +0000
@@ -34,19 +34,16 @@
 from canonical.launchpad.webapp.login import (
     allowUnauthenticatedSession, logInPrincipal, logoutPerson)
 from canonical.launchpad.webapp.publisher import Navigation, stepthrough
-from canonical.launchpad.webapp.url import urlappend
-from canonical.launchpad.webapp.vhosts import allvhosts
 
 from lp.services.openid.browser.openiddiscovery import (
     XRDSContentNegotiationMixin)
 from lp.testopenid.interfaces.server import (
-    ITestOpenIDApplication, ITestOpenIDLoginForm,
+    get_server_url, ITestOpenIDApplication, ITestOpenIDLoginForm,
     ITestOpenIDPersistentIdentity)
 
 
 OPENID_REQUEST_SESSION_KEY = 'testopenid.request'
 SESSION_PKG_KEY = 'TestOpenID'
-SERVER_URL = urlappend(allvhosts.configs['testopenid'].rooturl, '+openid')
 openid_store = MemoryStore()
 
 
@@ -85,7 +82,7 @@
     @property
     def openid_server_url(self):
         """The OpenID Server endpoint URL for Launchpad."""
-        return SERVER_URL
+        return get_server_url()
 
 
 class TestOpenIDIndexView(
@@ -101,7 +98,7 @@
 
     def __init__(self, context, request):
         super(OpenIDMixin, self).__init__(context, request)
-        self.server_url = SERVER_URL
+        self.server_url = get_server_url()
         self.openid_server = Server(openid_store, self.server_url)
 
     @property

=== modified file 'lib/lp/testopenid/interfaces/server.py'
--- lib/lp/testopenid/interfaces/server.py	2010-01-21 18:06:42 +0000
+++ lib/lp/testopenid/interfaces/server.py	2010-02-25 00:40:50 +0000
@@ -2,6 +2,7 @@
 
 __metaclass__ = type
 __all__ = [
+    'get_server_url',
     'ITestOpenIDApplication',
     'ITestOpenIDLoginForm',
     'ITestOpenIDPersistentIdentity',
@@ -12,6 +13,8 @@
 
 from canonical.launchpad.fields import PasswordField
 from canonical.launchpad.webapp.interfaces import ILaunchpadApplication
+from canonical.launchpad.webapp.url import urlappend
+from canonical.launchpad.webapp.vhosts import allvhosts
 
 from lp.services.openid.interfaces.openid import IOpenIDPersistentIdentity
 
@@ -27,3 +30,12 @@
 
 class ITestOpenIDPersistentIdentity(IOpenIDPersistentIdentity):
     """Marker interface for IOpenIDPersistentIdentity on testopenid."""
+
+
+def get_server_url():
+    """Return the URL for this server's OpenID endpoint.
+
+    This is wrapped in a function (instead of a constant) to make sure the
+    vhost.testopenid section is not required in production configs.
+    """
+    return urlappend(allvhosts.configs['testopenid'].rooturl, '+openid')

=== modified file 'lib/lp/testopenid/testing/helpers.py'
--- lib/lp/testopenid/testing/helpers.py	2010-01-21 14:47:51 +0000
+++ lib/lp/testopenid/testing/helpers.py	2010-02-25 00:40:50 +0000
@@ -21,7 +21,7 @@
 
 from canonical.launchpad.webapp import LaunchpadView
 
-from lp.testopenid.browser.server import SERVER_URL
+from lp.testopenid.interfaces.server import get_server_url
 
 
 class EchoView(LaunchpadView):
@@ -69,6 +69,6 @@
 def make_identifier_select_endpoint():
     """Create an endpoint for use in OpenID identifier select mode."""
     endpoint = OpenIDServiceEndpoint()
-    endpoint.server_url = SERVER_URL
+    endpoint.server_url = get_server_url()
     endpoint.type_uris = [OPENID_IDP_2_0_TYPE]
     return endpoint

=== modified file 'versions.cfg'
--- versions.cfg	2010-02-19 03:59:33 +0000
+++ versions.cfg	2010-02-25 00:40:50 +0000
@@ -19,17 +19,17 @@
 functest = 0.8.7
 funkload = 1.10.0
 grokcore.component = 1.6
-httplib2 = 0.4.0
+httplib2 = 0.6.0
 ipython = 0.9.1
-launchpadlib = 1.5.4
+launchpadlib = 1.5.5
 lazr.authentication = 0.1.1
 lazr.batchnavigator = 1.1
 lazr.config = 1.1.3
 lazr.delegates = 1.1.0
 lazr.enum = 1.1.2
 lazr.lifecycle = 1.1
-lazr.restful = 0.9.17
-lazr.restfulclient = 0.9.10
+lazr.restful = 0.9.21
+lazr.restfulclient = 0.9.11
 lazr.smtptest = 1.1
 lazr.testing = 0.1.1
 lazr.uri = 1.0.2