Merge lp:~mbp/launchpad/mbp-trivial into lp:launchpad/db-devel

[Martin Pool]

Resizing your window shouldn't break "make check"! See bug 615740 for more.

[Martin Pool (mbp)]

lifeless and spiv gave +1s on irc, and I've manually tested before/after.

[Martin Pool (mbp)]

wrong: apparently they don't have an errno...

[Martin Pool (mbp)]

should be ok now

[Robert Collins (lifeless)]

nice.

review: Approve

[Martin Pool (mbp)]

should go to devel, not db-devel, therefore i'll obsolete this in favor of https://code.edge.launchpad.net/~mbp/launchpad/mbp-trivial/+merge/36515

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-09-20 23:40:08 +0000
+++ database/schema/security.cfg	2010-09-22 06:47:48 +0000
@@ -629,7 +629,7 @@
 
 [branch-distro]
 type=user
-public.branch                    = SELECT, INSERT
+public.branch                    = SELECT, INSERT, UPDATE
 public.branchsubscription        = SELECT, INSERT
 public.distribution              = SELECT
 public.distroseries              = SELECT

=== modified file 'lib/canonical/launchpad/doc/location-widget.txt'
--- lib/canonical/launchpad/doc/location-widget.txt	2010-08-11 15:47:27 +0000
+++ lib/canonical/launchpad/doc/location-widget.txt	2010-09-22 06:47:48 +0000
@@ -9,22 +9,18 @@
     >>> salgado = getUtility(IPersonSet).getByName('salgado')
     >>> field = LocationField(__name__='location', title=u'Location')
 
-JavaScript and JSON are used in the Google Maps API.  By setting the
-needs_gmap2 and needs_json attributes of the request, the main template
+JavaScript and JSON are used by the location widget.  By setting the
+needs_json attributes of the request, the main template
 will include the necessary code to enable these features.
 
     >>> bound_field = field.bind(salgado)
     >>> request = LaunchpadTestRequest(
     ...     # Let's pretend requests are coming from Brazil.
     ...     environ={'REMOTE_ADDR': '201.13.165.145'})
-    >>> request.needs_gmap2
-    False
     >>> request.needs_json
     False
 
     >>> widget = LocationWidget(bound_field, request)
-    >>> request.needs_gmap2
-    True
     >>> request.needs_json
     True
 

=== modified file 'lib/canonical/launchpad/webapp/servers.py'
--- lib/canonical/launchpad/webapp/servers.py	2010-09-16 21:08:51 +0000
+++ lib/canonical/launchpad/webapp/servers.py	2010-09-22 06:47:48 +0000
@@ -522,7 +522,6 @@
         self.needs_datepicker_iframe = False
         self.needs_datetimepicker_iframe = False
         self.needs_json = False
-        self.needs_gmap2 = False
         super(BasicLaunchpadRequest, self).__init__(
             body_instream, environ, response)
 
@@ -834,12 +833,10 @@
     >>> request.needs_datepicker_iframe
     False
 
-    And for JSON and GMap2:
+    And for JSON:
 
     >>> request.needs_json
     False
-    >>> request.needs_gmap2
-    False
 
     """
     implements(INotificationRequest, IBasicLaunchpadRequest, IParticipation,
@@ -857,7 +854,6 @@
         self.needs_datepicker_iframe = False
         self.needs_datetimepicker_iframe = False
         self.needs_json = False
-        self.needs_gmap2 = False
         # stub out the FeatureController that would normally be provided by
         # the publication mechanism
         self.features = NullFeatureController()

=== modified file 'lib/canonical/widgets/location.py'
--- lib/canonical/widgets/location.py	2010-09-11 19:25:13 +0000
+++ lib/canonical/widgets/location.py	2010-09-22 06:47:48 +0000
@@ -42,6 +42,7 @@
     This is a single object which contains the latitude, longitude and time
     zone of the location.
     """
+
     def __init__(self, latitude, longitude, time_zone):
         self.latitude = latitude
         self.longitude = longitude
@@ -59,13 +60,16 @@
         # json-handling, so we flag that in the request so that our
         # base-layout includes the necessary javascript files.
         request.needs_json = True
-        request.needs_gmap2 = True
         super(LocationWidget, self).__init__(context, request)
         fields = form.Fields(
             Float(__name__='latitude', title=_('Latitude'), required=False),
             Float(__name__='longitude', title=_('Longitude'), required=False),
-            Choice(__name__='time_zone', vocabulary='TimezoneName',
-                   title=_('Time zone'), required=True))
+            Choice(
+                __name__='time_zone', vocabulary='TimezoneName',
+                title=_('Time zone'), required=True,
+                description=_(
+                    'Once the time zone is correctly set, events '
+                    'in Launchpad will be displayed in local time.')))
         # This will be the initial zoom level and center of the map.
         self.zoom = 2
         self.center_lat = 15.0

=== modified file 'lib/canonical/widgets/templates/location.pt'
--- lib/canonical/widgets/templates/location.pt	2009-07-17 17:59:07 +0000
+++ lib/canonical/widgets/templates/location.pt	2010-09-22 06:47:48 +0000
@@ -2,32 +2,11 @@
   xmlns:tal="http://xml.zope.org/namespaces/tal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag="">
-<tal:latitude replace="structure view/latitude_widget/hidden" />
-<tal:longitude replace="structure view/longitude_widget/hidden" />
-<p class="formHelp">
-  You can drag the marker to change the location, and zoom into the map to
-  see more details and verify the location's accuracy.
-  If your mouse has a scroll wheel, use it to more quickly zoom the
-  map in and out. Double-clicking will also zoom in and move the
-  marker. Please <strong>do not disclose sensitive information such
-  as a specific home location</strong> without the permission of
-  the person involved - rather just indicate a city so that the time
-  zone is correct.
-</p>
-<p id="map_div" style="width: 100%; height: 300px; border: 1px; float: left;"
-  ></p>
-
-<tal:render-map replace="structure view/map_javascript" />
-
-<p>
-  <label>Time zone:
-  <img id="tz_spinner" src="/@@/nospin" width="14" height="14" />
-  </label>
-  <tal:latitude replace="structure view/time_zone_widget" />
-</p>
-
-<p class="formHelp">
-  Once the time zone is correctly set, events in Launchpad will be
-  displayed in local time.
-</p>
+  <tal:latitude replace="structure view/latitude_widget/hidden" />
+  <tal:longitude replace="structure view/longitude_widget/hidden" />
+  <div>
+      <tal:time-zone replace="structure view/time_zone_widget" />
+  </div>
+  <div class="formHelp"
+     tal:content="view/time_zone_widget/hint" />
 </tal:root>

=== removed file 'lib/lp/app/javascript/mapping.js'
--- lib/lp/app/javascript/mapping.js	2010-07-15 10:55:27 +0000
+++ lib/lp/app/javascript/mapping.js	1970-01-01 00:00:00 +0000
@@ -1,365 +0,0 @@
-/**
- * Launchpad mapping tools.
- *
- * Map rendering and marker creation depends on the Google GMap2 library.
- *
- * @module lp.app.mapping
- * @namespace lp.app.mapping
- * @required Google GMap2
- */
-YUI.add('lp.app.mapping', function(Y) {
-    var module = Y.namespace('lp.app.mapping');
-
-    module.RETURN_FALSE = function() {return false;};
-    module.RETURN_NULL = function() {return null;};
-
-    // Replace the crucial GMap functions so that the supporting functions
-    // will work if the GMap script is not loaded.
-    var gBrowserIsCompatible = module.RETURN_FALSE;
-    var gDownloadUrl = module.RETURN_NULL;
-
-    module.has_gmaps = (typeof(GBrowserIsCompatible) == 'function');
-
-    if (module.has_gmaps) {
-        // The GMap2 is is loaded; use the real functions.
-        // jslint does not like functions that look like classes.
-        gBrowserIsCompatible = GBrowserIsCompatible;
-        gDownloadUrl = GDownloadUrl;
-    }
-
-
-    /**
-     * Add a marker for each participant.
-     *
-     * @function setMarkersInfoWindow
-     * @param {String} data the participant XML.
-     * @param {GMap2} map the Google map to add the markers to.
-     * @param {GLatLngBounds} required_bounds the boundaries or null.
-     * @param {limit} optional max number of markers to set.
-     */
-    module.setMarkersInfoWindow = function(data, map, required_bounds,
-                                            limit) {
-        var xml = GXml.parse(data);
-        var markers = xml.documentElement.getElementsByTagName("participant");
-        var participant = null;
-
-        function attrToProp(attr) {
-            participant[attr.name] = attr.value;
-        }
-
-        limit = typeof(limit) == 'number' ? limit : markers.length;
-        if (markers.length < limit) {
-            limit = markers.length;
-        }
-
-        for (var i = 0; i < limit; i++) {
-            participant = {};
-            Y.Array.each(markers[i].attributes, attrToProp);
-            var point = new GLatLng(
-                parseFloat(participant.lat), parseFloat(participant.lng));
-            if (required_bounds) {
-                required_bounds.extend(point);
-            }
-            var marker = new GMarker(point);
-            marker.bindInfoWindowHtml(Y.substitute([
-                '<div style="text-align: center">',
-                '<a href="{url}">{displayname} ({name})</a><br />',
-                '{logo_html}<br />',
-                'Local time: {local_time}</div>'].join(""),
-                participant));
-            map.addOverlay(marker);
-        }
-    };
-
-    /**
-     * Add a marker for each participant, and update the zoom level.
-     *
-     * @function setMarkersInfoWindowForSmallMap
-     * @param {String} data the participant XML.
-     * @param {GMap2} map the Google map to add the markers to.
-     * @param {limit} optional max number of markers to set.
-     */
-    module.setMarkersInfoWindowForSmallMap = function(data, map, limit) {
-        var required_bounds = new GLatLngBounds();
-        module.setMarkersInfoWindow(data, map, required_bounds, limit);
-        var zoom_level = map.getBoundsZoomLevel(required_bounds);
-        // Some browsers do not display the map when the zoom_level is at the
-        // end of the range, reduce the zoom_level by 1.
-        zoom_level = Math.min(4, zoom_level - 1);
-        map.setZoom(zoom_level);
-    };
-
-    /**
-     * Set the timezone field to the lat-log location.
-     *
-     * @function setLocation
-     * @param {Number} lat a GLatLng.lat bounded number.
-     * @param {Number} lng a GLatLng.lng bounded number.
-     * @parma {String} geoname the user-name to make geonames requests.
-     * @param {String} tz_name the id of the timezone field.
-     * @param {String} lat_name the id of the latitude field.
-     * @param {String} lng_name the id of the longitude field.
-     */
-    module.setLocation = function(lat, lng, geoname,
-                                   tz_name, lat_name, lng_name) {
-        Y.one(Y.DOM.byId(lat_name)).set('value', lat);
-        Y.one(Y.DOM.byId(lng_name)).set('value', lng);
-        var spinner = Y.one('#tz_spinner');
-        spinner.set('src', '/@@/spinner');
-
-        function succeeded() {
-            if (request.readyState == 4) {
-                if (request.responseText) {
-                    var tz = request.responseJSON.timezoneId;
-                    Y.one(Y.DOM.byId(tz_name)).set('value', tz);
-                    spinner.set('src', '/@@/nospin');
-                }
-            }
-        }
-
-        var url = 'http://ba-ws.geonames.net/timezoneJSON' +
-            '?username=' + geoname + '&lat=' + lat + '&lng=' + lng;
-        // This is a cross-site script request.
-        var request = new JSONScriptRequest();
-        request.open("GET", url);
-        request.onreadystatechange = succeeded;
-        request.send(null);
-    };
-
-    /**
-     * Show/hide all small maps in pages.
-     *
-     * The state is stored as ``small_maps`` in the launchpad_views cookie.
-     *
-     * @function toggleShowSmallMaps
-     * @param {Event} e the event for this callback.
-     */
-    module.toggleShowSmallMaps = function (checkbox) {
-        var is_shown = checkbox.get('checked');
-        Y.lp.launchpad_views.set('small_maps', is_shown);
-        var display = is_shown ? 'block' : 'none';
-        var maps = Y.all('.small-map');
-        maps.each(function(map) {map.setStyle('display', display);});
-        if (is_shown && !module.has_gmaps) {
-            // The server must add the Google GMap2 dependencies to the page.
-            window.location.reload();
-        }
-    };
-
-    /**
-     * Add a checkbox to show/hide all small maps in pages.
-     *
-     * @function setupShowSmallMapsControl
-     * @param {String} div_id the CSS3 id of the div that controls the map.
-     */
-    module.setupShowSmallMapsControl = function (div_id) {
-        var show_small_maps = Y.lp.launchpad_views.get('small_maps');
-        var checkbox = Y.Node.create(
-            '<input type="checkbox" name="show_small_maps" />');
-        checkbox.set(
-            'checked', show_small_maps);
-        checkbox.on(
-            'click', function(e) {module.toggleShowSmallMaps(checkbox);});
-        var label_text = Y.Node.create('Display map');
-        var label = Y.Node.create('<label></label>');
-        label.appendChild(checkbox);
-        label.appendChild(label_text);
-        var action_div = Y.one(div_id);
-        action_div.appendChild(label);
-        if (!show_small_maps) {
-            module.toggleShowSmallMaps(checkbox);
-        }
-    };
-
-    /**
-     * Create a small map with the launchpad default configuration.
-     *
-     * @function getSmallMap
-     * @param {String} div_id the id of the map div.
-     * @param {Number} center_lat a GLatLng.lat bounded number.
-     * @param {Number} center_lng a GLatLng.lng bounded number.
-     * @return {GMap2} the Google map
-     */
-    module.getSmallMap = function(div_id, center_lat, center_lng) {
-        var mapdiv = Y.DOM.byId(div_id);
-        mapdiv.style.width = '400px';
-        var map = new GMap2(mapdiv);
-        var center = new GLatLng(center_lat, center_lng);
-        map.setCenter(center, 1);
-        map.setMapType(G_NORMAL_MAP);
-        return map;
-    };
-
-    /**
-     * Create a small map of where a person is located.
-     *
-     * @function renderPersonMapSmall
-     * @param {Number} center_lat a GLatLng.lat bounded number.
-     * @param {Number} center_lng a GLatLng.lng bounded number.
-     */
-    module.renderPersonMapSmall = function(center_lat, center_lng) {
-        module.setupShowSmallMapsControl('#person_map_actions');
-        if (!gBrowserIsCompatible()) {
-            return;
-        }
-        var map = module.getSmallMap(
-            'person_map_div', center_lat, center_lng);
-        map.addControl(new GSmallZoomControl());
-        var center = new GLatLng(center_lat, center_lng);
-        var marker = new GMarker(center);
-        map.addOverlay(marker);
-    };
-
-    /**
-     * Create a small map of where a team's members are located. The map is
-     * limited to 24 members.
-     *
-     * @function renderTeamMapSmall
-     * @param {Number} center_lat a GLatLng.lat bounded number.
-     * @param {Number} center_lng a GLatLng.lng bounded number.
-     */
-    module.renderTeamMapSmall = function(center_lat, center_lng) {
-        module.setupShowSmallMapsControl('#team_map_actions');
-        if (!gBrowserIsCompatible()) {
-            return;
-        }
-        var team_map = module.getSmallMap(
-            'team_map_div', center_lat, center_lng);
-        gDownloadUrl("+mapdataltd", function(data) {
-            module.setMarkersInfoWindowForSmallMap(data, team_map);
-            });
-    };
-
-    /**
-     * Create a large map with the launchpad default configuration.
-     *
-     * @function getLargeMap
-     * @param {String} div_id the id of the map div.
-     * @return {GMap2} The Google map
-     */
-    module.getLargeMap = function(div_id) {
-        var mapdiv = Y.DOM.byId(div_id);
-        var mapheight = (parseInt(mapdiv.offsetWidth, 10) / 16 * 9);
-        mapheight = Math.min(mapheight, Y.DOM.winHeight() - 180);
-        mapheight = Math.max(mapheight, 400);
-        mapdiv.style.height = mapheight + 'px';
-        var map = new GMap2(mapdiv);
-        map.setMapType(G_HYBRID_MAP);
-        map.addControl(new GLargeMapControl());
-        map.addControl(new GMapTypeControl());
-        map.addControl(new GScaleControl());
-        map.enableScrollWheelZoom();
-        var overview_control = new GOverviewMapControl();
-        map.addControl(overview_control);
-        GEvent.addListener(map, 'zoomend', function(old, current) {
-            try {
-                if (current < 3) {
-                    overview_control.hide();
-                } else {
-                    overview_control.show();
-                }
-            } catch(e) {
-                // Google removed this undocumented method.
-            }
-        });
-        return map;
-    };
-
-    /**
-     * Create a large map of where a team's members are located.
-     *
-     * @function renderTeamMap
-     * @param {Number} min_lat the minimum GLatLng.lat bounded number.
-     * @param {Number} max_lat the maximum GLatLng.lat bounded number.
-     * @param {Number} min_lng the minimum GLatLng.lng bounded number.
-     * @param {Number} max_lng the maximum GLatLng.lng bounded number.
-     * @param {Number} center_lat a GLatLng.lat bounded number.
-     * @param {Number} center_lng a GLatLng.lng bounded number.
-     */
-    module.renderTeamMap = function(min_lat, max_lat, min_lng, max_lng,
-                                     center_lat, center_lng) {
-        if (!gBrowserIsCompatible()) {
-            return;
-        }
-        var team_map = module.getLargeMap("team_map_div");
-        var center = new GLatLng(center_lat, center_lng);
-        team_map.setCenter(center, 0);
-        var sw = new GLatLng(min_lat, min_lng);
-        var ne = new GLatLng(max_lat, max_lng);
-        var required_bounds = new GLatLngBounds(sw, ne);
-        var zoom_level = team_map.getBoundsZoomLevel(required_bounds);
-        // Some browsers do not display the map when the zoom_level is at
-        // the end of the range, reduce the zoom_level by 1.
-        zoom_level = Math.min(
-            G_HYBRID_MAP.getMaximumResolution(), zoom_level - 1);
-        team_map.setZoom(zoom_level);
-        gDownloadUrl("+mapdata", function(data) {
-            module.setMarkersInfoWindow(data, team_map);
-            });
-    };
-
-    /**
-     * Create a large, markable map of where a person is located.
-     *
-     * @function renderPersonMap
-     * @param {Number} center_lat a GLatLng.lat bounded number.
-     * @param {Number} center_lng a GLatLng.lng bounded number.
-     * @param {String} displayname the user's display name.
-     * @param {String} name the user's launchpad id.
-     * @param {String} logo_html the markup to display the user's logo.
-     * @param {String} geoname the identity used to access ba-ws.geonames.net.
-     * @param {String} tz_name the id of the timezone field.
-     * @param {String} lat_name the id of the latitude field.
-     * @param {String} lng_name the id of the longitude field.
-     * @param {number} zoom the initial zoom-level.
-     * @param {Boolean} show_marker Show the marker for the person.
-     */
-    module.renderPersonMap = function(center_lat, center_lng, displayname,
-                                       name, logo_html, geoname, lat_name,
-                                       lng_name, tz_name, zoom, show_marker) {
-        if (!gBrowserIsCompatible()) {
-            return;
-        }
-        var map = module.getLargeMap('map_div');
-        var center = new GLatLng(center_lat, center_lng);
-        map.setCenter(center, zoom);
-        var marker = new GMarker(center, {draggable: true});
-        marker.bindInfoWindowHtml(Y.substitute(
-            '<div style="text-align: center">' +
-            '<strong>{displayname}</strong><br />' +
-            '{logo_html}<br />({name})</div>',
-            {displayname: displayname, logo_html: logo_html, name: name}),
-            {maxWidth: 120});
-
-        GEvent.addListener(marker, "dragend", function() {
-            var point = marker.getLatLng();
-            module.setLocation(
-                point.lat(), point.lng(), geoname,
-                tz_name, lat_name, lng_name);
-        });
-
-        GEvent.addListener(marker, "dragstart", function() {
-            marker.closeInfoWindow();
-        });
-
-        map.addOverlay(marker);
-        if (!show_marker) {
-            marker.hide();
-        }
-
-        GEvent.addListener(map, "zoomend", function() {
-            marker.closeInfoWindow();
-        });
-
-        GEvent.addListener(map, "click", function(overlay, point) {
-            marker.setPoint(point);
-            if (marker.isHidden()) {
-                marker.show();
-                map.panTo(point);
-            }
-            module.setLocation(
-                point.lat(), point.lng(), geoname,
-                tz_name, lat_name, lng_name);
-        });
-    };
-}, "0.1", {"requires":["node", "dom", "substitute", "lp"]});

=== modified file 'lib/lp/app/templates/base-layout-macros.pt'
--- lib/lp/app/templates/base-layout-macros.pt	2010-08-20 13:33:51 +0000
+++ lib/lp/app/templates/base-layout-macros.pt	2010-09-22 06:47:48 +0000
@@ -179,8 +179,6 @@
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/app/picker.js"></script>
     <script type="text/javascript"
-            tal:attributes="src string:${lp_js}/app/mapping.js"></script>
-    <script type="text/javascript"
             tal:attributes="src string:${lp_js}/bugs/bugtracker_overlay.js"></script>
     <script type="text/javascript"
             tal:attributes="src string:${lp_js}/registry/milestoneoverlay.js"></script>
@@ -287,14 +285,6 @@
     <script type="text/javascript"
             tal:attributes="src string:${icingroot_contrib}/JSONScriptRequest.js"></script>
   </tal:needs_json>
-  <tal:needs-gmap2 condition="request/needs_gmap2">
-    <script type="text/javascript"
-            tal:condition="devmode"
-            tal:attributes="src string:http://maps.google.com/maps?${map_query};"></script>
-    <script type="text/javascript"
-            tal:condition="not: devmode"
-            tal:attributes="src string:https://maps-api-ssl.google.com/maps?oe=utf-8&amp;client=gme-canonical${map_query};"></script>
-  </tal:needs-gmap2>
 
   <metal:load-lavascript use-macro="context/@@+base-layout-macros/load-javascript" />
 

=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
--- lib/lp/code/browser/branchmergeproposal.py	2010-08-24 10:45:57 +0000
+++ lib/lp/code/browser/branchmergeproposal.py	2010-09-22 06:47:48 +0000
@@ -32,7 +32,6 @@
     'latest_proposals_for_each_branch',
     ]
 
-from collections import defaultdict
 import operator
 
 from lazr.delegates import delegates
@@ -200,7 +199,7 @@
                 'Approved [Merge Failed]',
             BranchMergeProposalStatus.QUEUED : 'Queued',
             BranchMergeProposalStatus.SUPERSEDED : 'Superseded'
-            }
+        }
         return friendly_texts[self.context.queue_status]
 
     @property
@@ -212,8 +211,7 @@
         result = ''
         if self.context.queue_status in (
             BranchMergeProposalStatus.CODE_APPROVED,
-            BranchMergeProposalStatus.REJECTED
-            ):
+            BranchMergeProposalStatus.REJECTED):
             formatter = DateTimeFormatterAPI(self.context.date_reviewed)
             result = '%s %s' % (
                 self.context.reviewer.displayname,
@@ -601,46 +599,15 @@
         """Location of page for commenting on this proposal."""
         return canonical_url(self.context, view_name='+comment')
 
-    @property
-    def revision_end_date(self):
-        """The cutoff date for showing revisions.
-
-        If the proposal has been merged, then we stop at the merged date. If
-        it is rejected, we stop at the reviewed date. For superseded
-        proposals, it should ideally use the non-existant date_last_modified,
-        but could use the last comment date.
-        """
-        status = self.context.queue_status
-        if status == BranchMergeProposalStatus.MERGED:
-            return self.context.date_merged
-        if status == BranchMergeProposalStatus.REJECTED:
-            return self.context.date_reviewed
-        # Otherwise return None representing an open end date.
-        return None
-
-    def _getRevisionsSinceReviewStart(self):
-        """Get the grouped revisions since the review started."""
-        # Work out the start of the review.
-        start_date = self.context.date_review_requested
-        if start_date is None:
-            start_date = self.context.date_created
-        source = DecoratedBranch(self.context.source_branch)
-        resultset = source.getMainlineBranchRevisions(
-            start_date, self.revision_end_date, oldest_first=True)
-        # Now group by date created.
-        groups = defaultdict(list)
-        for branch_revision, revision, revision_author in resultset:
-            groups[revision.date_created].append(branch_revision)
-        return [
-            CodeReviewNewRevisions(revisions, date, source)
-            for date, revisions in groups.iteritems()]
-
     @cachedproperty
     def conversation(self):
         """Return a conversation that is to be rendered."""
         # Sort the comments by date order.
-        comments = self._getRevisionsSinceReviewStart()
         merge_proposal = self.context
+        groups = merge_proposal.getRevisionsSinceReviewStart()
+        source = DecoratedBranch(merge_proposal.source_branch)
+        comments = [CodeReviewNewRevisions(list(revisions), date, source)
+            for date, revisions in groups]
         while merge_proposal is not None:
             from_superseded = merge_proposal != self.context
             comments.extend(
@@ -946,7 +913,6 @@
         self.cancel_url = self.next_url
         super(MergeProposalEditView, self).initialize()
 
-
     def _getRevisionId(self, data):
         """Translate the revision number that was entered into a revision id.
 
@@ -1473,8 +1439,8 @@
     """Render an `IText` as XHTML using the webservice."""
     formatter = FormattersAPI
     def renderer(value):
-        nomail  = formatter(value).obfuscate_email()
-        html    = formatter(nomail).text_to_html()
+        nomail = formatter(value).obfuscate_email()
+        html = formatter(nomail).text_to_html()
         return html.encode('utf-8')
     return renderer
 

=== modified file 'lib/lp/code/browser/tests/test_branchmergeproposal.py'
--- lib/lp/code/browser/tests/test_branchmergeproposal.py	2010-08-22 21:34:16 +0000
+++ lib/lp/code/browser/tests/test_branchmergeproposal.py	2010-09-22 06:47:48 +0000
@@ -12,7 +12,6 @@
     timedelta,
     )
 from difflib import unified_diff
-import operator
 import unittest
 
 import pytz
@@ -46,7 +45,6 @@
     PreviewDiff,
     StaticDiff,
     )
-from lp.code.tests.helpers import add_revision_to_branch
 from lp.testing import (
     login_person,
     TestCaseWithFactory,
@@ -577,63 +575,6 @@
         view = create_initialized_view(self.bmp, '+index')
         self.assertEqual([], view.linked_bugs)
 
-    def test_revision_end_date_active(self):
-        # An active merge proposal will have None as an end date.
-        bmp = self.factory.makeBranchMergeProposal()
-        view = create_initialized_view(bmp, '+index')
-        self.assertIs(None, view.revision_end_date)
-
-    def test_revision_end_date_merged(self):
-        # An merged proposal will have the date merged as an end date.
-        bmp = self.factory.makeBranchMergeProposal(
-            set_state=BranchMergeProposalStatus.MERGED)
-        view = create_initialized_view(bmp, '+index')
-        self.assertEqual(bmp.date_merged, view.revision_end_date)
-
-    def test_revision_end_date_rejected(self):
-        # An rejected proposal will have the date reviewed as an end date.
-        bmp = self.factory.makeBranchMergeProposal(
-            set_state=BranchMergeProposalStatus.REJECTED)
-        view = create_initialized_view(bmp, '+index')
-        self.assertEqual(bmp.date_reviewed, view.revision_end_date)
-
-    def assertRevisionGroups(self, bmp, expected_groups):
-        """Get the groups for the merge proposal and check them."""
-        view = create_initialized_view(bmp, '+index')
-        groups = view._getRevisionsSinceReviewStart()
-        view_groups = [
-            obj.revisions for obj in sorted(
-                groups, key=operator.attrgetter('date'))]
-        self.assertEqual(expected_groups, view_groups)
-
-    def test_getRevisionsSinceReviewStart_no_revisions(self):
-        # If there have been no revisions pushed since the start of the
-        # review, the method returns an empty list.
-        self.assertRevisionGroups(self.bmp, [])
-
-    def test_getRevisionsSinceReviewStart_groups(self):
-        # Revisions that were scanned at the same time have the same
-        # date_created.  These revisions are grouped together.
-        review_date = datetime(2009, 9, 10, tzinfo=pytz.UTC)
-        bmp = self.factory.makeBranchMergeProposal(
-            date_created=review_date)
-        login_person(bmp.registrant)
-        bmp.requestReview(review_date)
-        revision_date = review_date + timedelta(days=1)
-        revisions = []
-        for date in range(2):
-            revisions.append(
-                add_revision_to_branch(
-                    self.factory, bmp.source_branch, revision_date))
-            revisions.append(
-                add_revision_to_branch(
-                    self.factory, bmp.source_branch, revision_date))
-            revision_date += timedelta(days=1)
-        expected_groups = [
-            [revisions[0], revisions[1]],
-            [revisions[2], revisions[3]]]
-        self.assertRevisionGroups(bmp, expected_groups)
-
     def test_include_superseded_comments(self):
         for x, time in zip(range(3), time_counter()):
             if x != 0:
@@ -757,7 +698,6 @@
 
     layer = LaunchpadFunctionalLayer
 
-
     def _makeCommentFromEmailWithAttachment(self, attachment_body):
         # Make an email message with an attachment, and create a code
         # review comment from it.

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2010-09-20 22:16:32 +0000
+++ lib/lp/code/configure.zcml	2010-09-22 06:47:48 +0000
@@ -236,8 +236,10 @@
                     votes
                     all_comments
                     related_bugs
+                    revision_end_date
                     isMergable
                     getComment
+                    getRevisionsSinceReviewStart
                     getNotificationRecipients
                     getVoteReference
                     isValidTransition

=== modified file 'lib/lp/code/interfaces/branchmergeproposal.py'
--- lib/lp/code/interfaces/branchmergeproposal.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/interfaces/branchmergeproposal.py	2010-09-22 06:47:48 +0000
@@ -290,6 +290,13 @@
     def getComment(id):
         """Return the CodeReviewComment with the specified ID."""
 
+    def getRevisionsSinceReviewStart():
+        """Return all the revisions added since the review began.
+
+        Revisions are grouped by creation (i.e. push) time.
+        :return: An iterator of (date, iterator of revision data)
+        """
+
     def getVoteReference(id):
         """Return the CodeReviewVoteReference with the specified ID."""
 
@@ -518,8 +525,8 @@
             source branch.
         :param target_revision_id: The revision id that was used from the
             target branch.
-        :param prerequisite_revision_id: The revision id that was used from the
-            prerequisite branch.
+        :param prerequisite_revision_id: The revision id that was used from
+            the prerequisite branch.
         :param conflicts: Text describing the conflicts if any.
         """
 

=== modified file 'lib/lp/code/interfaces/revision.py'
--- lib/lp/code/interfaces/revision.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/interfaces/revision.py	2010-09-22 06:47:48 +0000
@@ -73,6 +73,9 @@
         :return: A `Branch` or None if an appropriate branch cannot be found.
         """
 
+    def getLefthandParent():
+        """Return lefthand parent of revision, or None if not in database."""
+
 
 class IRevisionAuthor(Interface):
     """Committer of a Bazaar revision."""

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2010-09-19 22:32:31 +0000
+++ lib/lp/code/model/branch.py	2010-09-22 06:47:48 +0000
@@ -990,8 +990,8 @@
             increment = getUtility(IBranchPuller).MIRROR_TIME_INCREMENT
             self.next_mirror_time = (
                 datetime.now(pytz.timezone('UTC')) + increment)
-        if self.last_mirrored_id != last_revision_id:
-            self.last_mirrored_id = last_revision_id
+        self.last_mirrored_id = last_revision_id
+        if self.last_scanned_id != last_revision_id:
             from lp.code.model.branchjob import BranchScanJob
             BranchScanJob.create(self)
         self.control_format = control_format

=== modified file 'lib/lp/code/model/branchmergeproposal.py'
--- lib/lp/code/model/branchmergeproposal.py	2010-09-13 04:36:24 +0000
+++ lib/lp/code/model/branchmergeproposal.py	2010-09-22 06:47:48 +0000
@@ -13,7 +13,7 @@
     ]
 
 from email.Utils import make_msgid
-
+from itertools import groupby
 from sqlobject import (
     ForeignKey,
     IntCol,
@@ -777,6 +777,45 @@
         Store.of(self).flush()
         return self.preview_diff
 
+    @property
+    def revision_end_date(self):
+        """The cutoff date for showing revisions.
+
+        If the proposal has been merged, then we stop at the merged date. If
+        it is rejected, we stop at the reviewed date. For superseded
+        proposals, it should ideally use the non-existant date_last_modified,
+        but could use the last comment date.
+        """
+        status = self.queue_status
+        if status == BranchMergeProposalStatus.MERGED:
+            return self.date_merged
+        if status == BranchMergeProposalStatus.REJECTED:
+            return self.date_reviewed
+        # Otherwise return None representing an open end date.
+        return None
+
+    def _getNewerRevisions(self):
+        start_date = self.date_review_requested
+        if start_date is None:
+            start_date = self.date_created
+        return self.source_branch.getMainlineBranchRevisions(
+            start_date, self.revision_end_date, oldest_first=True)
+
+    def getRevisionsSinceReviewStart(self):
+        """Get the grouped revisions since the review started."""
+        resultset = self._getNewerRevisions()
+        # Work out the start of the review.
+        branch_revisions = (
+            branch_revision for branch_revision, revision, revision_author
+            in resultset)
+        # Now group by date created.
+        gby = groupby(branch_revisions, lambda r: r.revision.date_created)
+        # Use a generator expression to wrap the custom iterator so it doesn't
+        # get security-proxied.
+        return (
+            (date, (revision for revision in revisions))
+            for date, revisions in gby)
+
 
 class BranchMergeProposalGetter:
     """See `IBranchMergeProposalGetter`."""

=== modified file 'lib/lp/code/model/directbranchcommit.py'
--- lib/lp/code/model/directbranchcommit.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/directbranchcommit.py	2010-09-22 06:47:48 +0000
@@ -55,7 +55,8 @@
     is_locked = False
     commit_builder = None
 
-    def __init__(self, db_branch, committer=None, no_race_check=False):
+    def __init__(self, db_branch, committer=None, no_race_check=False,
+            merge_parents=None):
         """Create context for direct commit to branch.
 
         Before constructing a `DirectBranchCommit`, set up a server that
@@ -107,6 +108,7 @@
             raise
 
         self.files = set()
+        self.merge_parents = merge_parents
 
     def _getDir(self, path):
         """Get trans_id for directory "path."  Create if necessary."""
@@ -200,7 +202,8 @@
             # required to generate the revision-id.
             with override_environ(BZR_EMAIL=committer_id):
                 new_rev_id = self.transform_preview.commit(
-                    self.bzrbranch, commit_message, committer=committer_id)
+                    self.bzrbranch, commit_message, self.merge_parents,
+                    committer=committer_id)
             IMasterObject(self.db_branch).branchChanged(
                 get_stacked_on_url(self.bzrbranch), new_rev_id,
                 self.db_branch.control_format, self.db_branch.branch_format,

=== modified file 'lib/lp/code/model/revision.py'
--- lib/lp/code/model/revision.py	2010-08-27 02:11:36 +0000
+++ lib/lp/code/model/revision.py	2010-09-22 06:47:48 +0000
@@ -18,6 +18,7 @@
     )
 import email
 
+from bzrlib.revision import NULL_REVISION
 import pytz
 from sqlobject import (
     BoolCol,
@@ -39,7 +40,6 @@
     )
 from storm.locals import (
     Bool,
-    DateTime,
     Int,
     Min,
     Reference,
@@ -118,6 +118,13 @@
         """
         return [parent.parent_id for parent in self.parents]
 
+    def getLefthandParent(self):
+        if len(self.parent_ids) == 0:
+            parent_id = NULL_REVISION
+        else:
+            parent_id = self.parent_ids[0]
+        return RevisionSet().getByRevisionId(parent_id)
+
     def getProperties(self):
         """See `IRevision`."""
         return dict((prop.name, prop.value) for prop in self.properties)

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2010-09-09 02:49:47 +0000
+++ lib/lp/code/model/tests/test_branch.py	2010-09-22 06:47:48 +0000
@@ -231,11 +231,25 @@
         branch = self.factory.makeAnyBranch()
         login_person(branch.owner)
         removeSecurityProxy(branch).last_mirrored_id = 'rev1'
-        jobs = list(getUtility(IBranchScanJobSource).iterReady())
-        self.assertEqual(0, len(jobs))
-        branch.branchChanged('', 'rev1', *self.arbitrary_formats)
-        jobs = list(getUtility(IBranchScanJobSource).iterReady())
-        self.assertEqual(0, len(jobs))
+        removeSecurityProxy(branch).last_scanned_id = 'rev1'
+        jobs = list(getUtility(IBranchScanJobSource).iterReady())
+        self.assertEqual(0, len(jobs))
+        branch.branchChanged('', 'rev1', *self.arbitrary_formats)
+        jobs = list(getUtility(IBranchScanJobSource).iterReady())
+        self.assertEqual(0, len(jobs))
+
+    def test_branchChanged_creates_scan_job_for_broken_scan(self):
+        # branchChanged() if the last_scanned_id is different to the newly
+        # changed revision, then a scan job is created.
+        branch = self.factory.makeAnyBranch()
+        login_person(branch.owner)
+        removeSecurityProxy(branch).last_mirrored_id = 'rev1'
+        removeSecurityProxy(branch).last_scanned_id = 'old'
+        jobs = list(getUtility(IBranchScanJobSource).iterReady())
+        self.assertEqual(0, len(jobs))
+        branch.branchChanged('', 'rev1', *self.arbitrary_formats)
+        jobs = list(getUtility(IBranchScanJobSource).iterReady())
+        self.assertEqual(1, len(jobs))
 
     def test_branchChanged_packs_format(self):
         # branchChanged sets the branch_format etc attributes to the passed in

=== modified file 'lib/lp/code/model/tests/test_branchmergeproposal.py'
--- lib/lp/code/model/tests/test_branchmergeproposal.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/tests/test_branchmergeproposal.py	2010-09-22 06:47:48 +0000
@@ -7,7 +7,7 @@
 
 __metaclass__ = type
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from difflib import unified_diff
 from unittest import (
     TestCase,
@@ -72,6 +72,7 @@
     MergeProposalCreatedJob,
     UpdatePreviewDiffJob,
     )
+from lp.code.tests.helpers import add_revision_to_branch
 from lp.registry.interfaces.person import IPersonSet
 from lp.registry.interfaces.product import IProductSet
 from lp.testing import (
@@ -108,7 +109,8 @@
         self.assertTrue(url.startswith(source_branch_url))
 
     def test_BranchMergeProposal_canonical_url_rest(self):
-        # The rest of the URL for a merge proposal is +merge followed by the db id.
+        # The rest of the URL for a merge proposal is +merge followed by the
+        # db id.
         bmp = self.factory.makeBranchMergeProposal()
         url = canonical_url(bmp)
         source_branch_url = canonical_url(bmp.source_branch)
@@ -238,7 +240,6 @@
                           self._attemptTransition,
                           proposal, to_state)
 
-
     def assertGoodDupeTransition(self, from_state, to_state):
         """Trying to go from `from_state` to `to_state` succeeds."""
         proposal = self.prepareDupeTransition(from_state)
@@ -1049,6 +1050,7 @@
             else:
                 self.assertEqual([mp], list(active))
 
+
 class TestBranchMergeProposalGetterGetProposals(TestCaseWithFactory):
     """Test the getProposalsForContext method."""
 
@@ -1118,7 +1120,6 @@
             beaver, [BranchMergeProposalStatus.REJECTED], beaver)
         self.assertEqual(beave_proposals.count(), 1)
 
-
     def test_created_proposal_default_status(self):
         # When we create a merge proposal using the helper method, the default
         # status of the proposal is work in progress.
@@ -1799,5 +1800,67 @@
         self.assertIs(None, bmp.next_preview_diff_job)
 
 
+class TestRevisionEndDate(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def test_revision_end_date_active(self):
+        # An active merge proposal will have None as an end date.
+        bmp = self.factory.makeBranchMergeProposal()
+        self.assertIs(None, bmp.revision_end_date)
+
+    def test_revision_end_date_merged(self):
+        # An merged proposal will have the date merged as an end date.
+        bmp = self.factory.makeBranchMergeProposal(
+            set_state=BranchMergeProposalStatus.MERGED)
+        self.assertEqual(bmp.date_merged, bmp.revision_end_date)
+
+    def test_revision_end_date_rejected(self):
+        # An rejected proposal will have the date reviewed as an end date.
+        bmp = self.factory.makeBranchMergeProposal(
+            set_state=BranchMergeProposalStatus.REJECTED)
+        self.assertEqual(bmp.date_reviewed, bmp.revision_end_date)
+
+
+class TestGetRevisionsSinceReviewStart(TestCaseWithFactory):
+
+    layer = DatabaseFunctionalLayer
+
+    def assertRevisionGroups(self, bmp, expected_groups):
+        """Get the groups for the merge proposal and check them."""
+        groups = bmp.getRevisionsSinceReviewStart()
+        revision_groups = [list(revisions) for date, revisions in groups]
+        self.assertEqual(expected_groups, revision_groups)
+
+    def test_getRevisionsSinceReviewStart_no_revisions(self):
+        # If there have been no revisions pushed since the start of the
+        # review, the method returns an empty list.
+        bmp = self.factory.makeBranchMergeProposal()
+        self.assertRevisionGroups(bmp, [])
+
+    def test_getRevisionsSinceReviewStart_groups(self):
+        # Revisions that were scanned at the same time have the same
+        # date_created.  These revisions are grouped together.
+        review_date = datetime(2009, 9, 10, tzinfo=UTC)
+        bmp = self.factory.makeBranchMergeProposal(
+            date_created=review_date)
+        login_person(bmp.registrant)
+        bmp.requestReview(review_date)
+        revision_date = review_date + timedelta(days=1)
+        revisions = []
+        for date in range(2):
+            revisions.append(
+                add_revision_to_branch(
+                    self.factory, bmp.source_branch, revision_date))
+            revisions.append(
+                add_revision_to_branch(
+                    self.factory, bmp.source_branch, revision_date))
+            revision_date += timedelta(days=1)
+        expected_groups = [
+            [revisions[0], revisions[1]],
+            [revisions[2], revisions[3]]]
+        self.assertRevisionGroups(bmp, expected_groups)
+
+
 def test_suite():
     return TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/model/tests/test_diff.py'
--- lib/lp/code/model/tests/test_diff.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/model/tests/test_diff.py	2010-09-22 06:47:48 +0000
@@ -57,13 +57,14 @@
 class DiffTestCase(TestCaseWithFactory):
 
     @staticmethod
-    def commitFile(branch, path, contents):
+    def commitFile(branch, path, contents, merge_parents=None):
         """Create a commit that updates a file to specified contents.
 
         This will create or modify the file, as needed.
         """
         committer = DirectBranchCommit(
-            removeSecurityProxy(branch), no_race_check=True)
+            removeSecurityProxy(branch), no_race_check=True,
+            merge_parents=merge_parents)
         committer.writeFile(path, contents)
         try:
             return committer.commit('committing')
@@ -122,7 +123,6 @@
                 prerequisite)
 
 
-
 class TestDiff(DiffTestCase):
 
     layer = LaunchpadFunctionalLayer
@@ -186,19 +186,19 @@
         self.checkExampleMerge(diff.text)
 
     diff_bytes = (
-        "--- bar	2009-08-26 15:53:34.000000000 -0400\n"
-        "+++ bar	1969-12-31 19:00:00.000000000 -0500\n"
+        "--- bar\t2009-08-26 15:53:34.000000000 -0400\n"
+        "+++ bar\t1969-12-31 19:00:00.000000000 -0500\n"
         "@@ -1,3 +0,0 @@\n"
         "-a\n"
         "-b\n"
         "-c\n"
-        "--- baz	1969-12-31 19:00:00.000000000 -0500\n"
-        "+++ baz	2009-08-26 15:53:57.000000000 -0400\n"
+        "--- baz\t1969-12-31 19:00:00.000000000 -0500\n"
+        "+++ baz\t2009-08-26 15:53:57.000000000 -0400\n"
         "@@ -0,0 +1,2 @@\n"
         "+a\n"
         "+b\n"
-        "--- foo	2009-08-26 15:53:23.000000000 -0400\n"
-        "+++ foo	2009-08-26 15:56:43.000000000 -0400\n"
+        "--- foo\t2009-08-26 15:53:23.000000000 -0400\n"
+        "+++ foo\t2009-08-26 15:56:43.000000000 -0400\n"
         "@@ -1,3 +1,4 @@\n"
         " a\n"
         "-b\n"
@@ -207,19 +207,19 @@
         "+e\n")
 
     diff_bytes_2 = (
-        "--- bar	2009-08-26 15:53:34.000000000 -0400\n"
-        "+++ bar	1969-12-31 19:00:00.000000000 -0500\n"
+        "--- bar\t2009-08-26 15:53:34.000000000 -0400\n"
+        "+++ bar\t1969-12-31 19:00:00.000000000 -0500\n"
         "@@ -1,3 +0,0 @@\n"
         "-a\n"
         "-b\n"
         "-c\n"
-        "--- baz	1969-12-31 19:00:00.000000000 -0500\n"
-        "+++ baz	2009-08-26 15:53:57.000000000 -0400\n"
+        "--- baz\t1969-12-31 19:00:00.000000000 -0500\n"
+        "+++ baz\t2009-08-26 15:53:57.000000000 -0400\n"
         "@@ -0,0 +1,2 @@\n"
         "+a\n"
         "+b\n"
-        "--- foo	2009-08-26 15:53:23.000000000 -0400\n"
-        "+++ foo	2009-08-26 15:56:43.000000000 -0400\n"
+        "--- foo\t2009-08-26 15:53:23.000000000 -0400\n"
+        "+++ foo\t2009-08-26 15:56:43.000000000 -0400\n"
         "@@ -1,3 +1,5 @@\n"
         " a\n"
         "-b\n"
@@ -467,7 +467,6 @@
         self.assertEqual('', diff.conflicts)
         self.assertFalse(diff.has_conflicts)
 
-
     def test_fromBranchMergeProposal(self):
         # Correctly generates a PreviewDiff from a BranchMergeProposal.
         bmp, source_rev_id, target_rev_id = self.createExampleMerge()

=== modified file 'lib/lp/code/tests/helpers.py'
--- lib/lp/code/tests/helpers.py	2010-08-31 00:16:41 +0000
+++ lib/lp/code/tests/helpers.py	2010-09-22 06:47:48 +0000
@@ -64,9 +64,14 @@
     """
     if date_created is None:
         date_created = revision_date
+    parent = branch.revision_history.last()
+    if parent is None:
+        parent_ids = []
+    else:
+        parent_ids = [parent.revision.revision_id]
     revision = factory.makeRevision(
         revision_date=revision_date, date_created=date_created,
-        log_body=commit_msg)
+        log_body=commit_msg, parent_ids=parent_ids)
     if mainline:
         sequence = branch.revision_count + 1
         branch_revision = branch.createBranchRevision(sequence, revision)
@@ -112,7 +117,7 @@
     preview.remvoed_lines_count = 13
     preview.diffstat = {'file1': (3, 8), 'file2': (4, 5)}
     return {
-        'eric': eric, 'fooix': fooix, 'trunk':trunk, 'feature': feature,
+        'eric': eric, 'fooix': fooix, 'trunk': trunk, 'feature': feature,
         'proposed': proposed, 'fred': fred}
 
 

=== modified file 'lib/lp/code/tests/test_directbranchcommit.py'
--- lib/lp/code/tests/test_directbranchcommit.py	2010-08-20 20:31:18 +0000
+++ lib/lp/code/tests/test_directbranchcommit.py	2010-09-22 06:47:48 +0000
@@ -99,6 +99,24 @@
         branch_revision_id = self.committer.bzrbranch.last_revision()
         self.assertEqual(branch_revision_id, revision_id)
 
+    def test_commit_uses_merge_parents(self):
+        # DirectBranchCommit.commit returns uses merge parents
+        self._tearDownCommitter()
+        # Merge parents cannot be specified for initial commit, so do an
+        # empty commit.
+        self.tree.commit('foo', committer='foo@bar', rev_id='foo')
+        committer = DirectBranchCommit(
+            self.db_branch, merge_parents=['parent-1', 'parent-2'])
+        committer.last_scanned_id = (
+            committer.bzrbranch.last_revision())
+        committer.writeFile('file.txt', 'contents')
+        revision_id = committer.commit('')
+        branch_revision_id = committer.bzrbranch.last_revision()
+        branch_revision = committer.bzrbranch.repository.get_revision(
+            branch_revision_id)
+        self.assertEqual(
+            ['parent-1', 'parent-2'], branch_revision.parent_ids[1:])
+
     def test_DirectBranchCommit_aborts_cleanly(self):
         # If a DirectBranchCommit is not committed, its changes do not
         # go into the branch.

=== modified file 'lib/lp/codehosting/branchdistro.py'
--- lib/lp/codehosting/branchdistro.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/branchdistro.py	2010-09-22 06:47:48 +0000
@@ -28,7 +28,7 @@
 
 from canonical.config import config
 from canonical.launchpad.interfaces import ILaunchpadCelebrities
-from lp.code.enums import BranchType
+from lp.code.enums import BranchLifecycleStatus, BranchType
 from lp.code.errors import BranchExists
 from lp.code.interfaces.branchcollection import IAllBranches
 from lp.code.interfaces.branchnamespace import IBranchNamespaceSet
@@ -341,6 +341,7 @@
         new_db_branch.sourcepackage.setBranch(
             PackagePublishingPocket.RELEASE, new_db_branch,
             getUtility(ILaunchpadCelebrities).ubuntu_branches.teamowner)
+        old_db_branch.lifecycle_status = BranchLifecycleStatus.MATURE
         # switch_branches *moves* the data to locations dependent on the
         # new_branch's id, so if the transaction was rolled back we wouldn't
         # know the branch id and thus wouldn't be able to find the branch data

=== modified file 'lib/lp/codehosting/bzrutils.py'
--- lib/lp/codehosting/bzrutils.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/bzrutils.py	2010-09-22 06:47:48 +0000
@@ -18,11 +18,13 @@
     'identical_formats',
     'install_oops_handler',
     'is_branch_stackable',
+    'read_locked',
     'remove_exception_logging_hook',
     'safe_open',
     'UnsafeUrlSeen',
     ]
 
+from contextlib import contextmanager
 import os
 import sys
 import threading
@@ -363,3 +365,12 @@
         return branch.get_stacked_on_url()
     except (NotStacked, UnstackableBranchFormat):
         return None
+
+
+@contextmanager
+def read_locked(branch):
+    branch.lock_read()
+    try:
+        yield
+    finally:
+        branch.unlock()

=== modified file 'lib/lp/codehosting/tests/test_branchdistro.py'
--- lib/lp/codehosting/tests/test_branchdistro.py	2010-08-20 20:31:18 +0000
+++ lib/lp/codehosting/tests/test_branchdistro.py	2010-09-22 06:47:48 +0000
@@ -34,6 +34,7 @@
     QuietFakeLogger,
     )
 from canonical.testing.layers import LaunchpadZopelessLayer
+from lp.code.enums import BranchLifecycleStatus
 from lp.codehosting.branchdistro import (
     DistroBrancher,
     switch_branches,
@@ -233,6 +234,12 @@
              db_branch.sourcepackagename, brancher.new_distroseries.name],
             [new_branch.owner, new_branch.distribution,
              new_branch.sourcepackagename, new_branch.name])
+        # The new branch is set in the development state, and the old one is
+        # mature.
+        self.assertEqual(
+            BranchLifecycleStatus.DEVELOPMENT, new_branch.lifecycle_status)
+        self.assertEqual(
+            BranchLifecycleStatus.MATURE, db_branch.lifecycle_status)
 
     def test_makeOneNewBranch_inconsistent_branch(self):
         # makeOneNewBranch skips over an inconsistent official package branch

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2010-09-03 15:02:39 +0000
+++ lib/lp/registry/browser/__init__.py	2010-09-22 06:47:48 +0000
@@ -7,7 +7,6 @@
 
 __all__ = [
     'get_status_counts',
-    'MapMixin',
     'MilestoneOverlayMixin',
     'RegistryEditFormView',
     'RegistryDeleteViewMixin',
@@ -32,7 +31,6 @@
     )
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.series import SeriesStatus
-from lp.services.propertycache import cachedproperty
 
 
 class StatusCount:
@@ -258,19 +256,3 @@
     @action("Change", name='change')
     def change_action(self, action, data):
         self.updateContextFromData(data)
-
-
-class MapMixin:
-
-    @cachedproperty
-    def gmap2_enabled(self):
-        # XXX sinzui 2010-08-27 bug=625556: This is a hack to use
-        # feature flags, which are not ready for general use in the production
-        # code, but has just enough to support this use case:
-        # Do not enable gmap2 if Google's service is not operational.
-        from lp.services.features.flags import FeatureController
-
-        def in_scope(value):
-            return True
-
-        return FeatureController(in_scope).getFlag('gmap2') == 'on'

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-09-13 10:04:20 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-09-22 06:47:48 +0000
@@ -829,7 +829,7 @@
             for="lp.registry.interfaces.person.IPerson"
             class="lp.registry.browser.person.PersonEditLocationView"
             permission="launchpad.Edit"
-            template="../templates/person-editlocation.pt"/>
+            template="../../app/templates/generic-edit.pt"/>
         <browser:page
             name="+contactuser"
             for="lp.registry.interfaces.person.IPerson"
@@ -1080,11 +1080,6 @@
         <browser:page
             for="lp.registry.interfaces.person.ITeam"
             permission="zope.Public"
-            class="lp.registry.browser.person.TeamEditLocationView"
-            name="+editlocation"/>
-        <browser:page
-            for="lp.registry.interfaces.person.ITeam"
-            permission="zope.Public"
             name="+listing-simple"
             template="../templates/team-listing-simple.pt"/>
         <browser:page

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2010-09-19 00:35:22 +0000
+++ lib/lp/registry/browser/person.py	2010-09-22 06:47:48 +0000
@@ -65,7 +65,6 @@
     'SearchSubscribedQuestionsView',
     'TeamAddMyTeamsView',
     'TeamBreadcrumb',
-    'TeamEditLocationView',
     'TeamEditMenu',
     'TeamIndexMenu',
     'TeamJoinView',
@@ -148,7 +147,6 @@
     helpers,
     )
 from canonical.launchpad.browser.feeds import FeedsMixin
-from canonical.launchpad.browser.launchpad import get_launchpad_views
 from canonical.launchpad.interfaces.account import (
     AccountStatus,
     IAccount,
@@ -244,7 +242,6 @@
 from lp.code.browser.sourcepackagerecipelisting import HasRecipesMenuMixin
 from lp.code.errors import InvalidNamespace
 from lp.code.interfaces.branchnamespace import IBranchNamespaceSet
-from lp.registry.browser import MapMixin
 from lp.registry.browser.branding import BrandingChangeView
 from lp.registry.browser.mailinglists import enabled_with_active_mailing_list
 from lp.registry.browser.menu import (
@@ -3325,7 +3322,7 @@
         return self.state is EmailAddressVisibleState.ALLOWED
 
 
-class PersonIndexView(XRDSContentNegotiationMixin, MapMixin, PersonView):
+class PersonIndexView(XRDSContentNegotiationMixin, PersonView):
     """View class for person +index and +xrds pages."""
 
     xrds_template = ViewPageTemplateFile(
@@ -3333,14 +3330,6 @@
 
     def initialize(self):
         super(PersonIndexView, self).initialize()
-        # This view requires the gmap2 Javascript in order to render the map
-        # with the person's usual location. The location is only availble if
-        # the location is set, visible, and the viewing user wants to see it.
-        launchpad_views = get_launchpad_views(self.request.cookies)
-        self._small_map = launchpad_views['small_maps']
-        if (self.gmap2_enabled
-            and self.has_visible_location and self._small_map):
-            self.request.needs_gmap2 = True
         if self.request.method == "POST":
             self.processForm()
 
@@ -3397,9 +3386,6 @@
         assert self.has_visible_location, (
             "Can't generate the map for a person who hasn't set a "
             "visible location.")
-        assert self.request.needs_gmap2 or not self._small_map, (
-            "To use this method a view must flag that it needs gmap2.")
-
         replacements = {'center_lat': self.context.latitude,
                         'center_lng': self.context.longitude}
         return u"""
@@ -5638,7 +5624,7 @@
 class PersonLocationForm(Interface):
 
     location = LocationField(
-        title=_('Use the map to indicate default location'),
+        title=_('Time zone'),
         required=True)
     hide = Bool(
         title=_("Hide my location details from others."),
@@ -5649,37 +5635,15 @@
     """Edit a person's location."""
 
     schema = PersonLocationForm
-    field_names = ['location', 'hide']
+    field_names = ['location']
     custom_widget('location', LocationWidget)
-
-    @property
-    def page_title(self):
-        return smartquote(
-            "%s's location and timezone" % self.context.displayname)
-
-    label = page_title
-
-    @property
-    def initial_values(self):
-        """See `LaunchpadFormView`.
-
-        Set the initial value for the 'hide' field.  The initial value for the
-        'location' field is set by its widget.
-        """
-        if self.context.location is None:
-            return {}
-        else:
-            return {'hide': not self.context.location.visible}
-
-    def initialize(self):
-        self.next_url = canonical_url(self.context)
-        self.for_team_name = self.request.form.get('for_team')
-        if self.for_team_name is not None:
-            for_team = getUtility(IPersonSet).getByName(self.for_team_name)
-            if for_team is not None:
-                self.next_url = canonical_url(for_team) + '/+map'
-        super(PersonEditLocationView, self).initialize()
-        self.cancel_url = self.next_url
+    page_title = label = 'Set timezone'
+
+    @property
+    def next_url(self):
+        return canonical_url(self.context)
+
+    cancel_url = next_url
 
     @action(_("Update"), name="update")
     def action_update(self, action, data):
@@ -5696,17 +5660,6 @@
             self.context.setLocationVisibility(visible)
 
 
-class TeamEditLocationView(LaunchpadView):
-    """Redirect to the team's +map page.
-
-    We do that because it doesn't make sense to specify the location of a
-    team."""
-
-    def initialize(self):
-        self.request.response.redirect(
-            canonical_url(self.context, view_name="+map"))
-
-
 def archive_to_person(archive):
     """Adapts an `IArchive` to an `IPerson`."""
     return IPerson(archive.owner)

=== modified file 'lib/lp/registry/browser/team.py'
--- lib/lp/registry/browser/team.py	2010-09-19 03:13:01 +0000
+++ lib/lp/registry/browser/team.py	2010-09-22 06:47:48 +0000
@@ -25,10 +25,7 @@
 
 from datetime import datetime
 import math
-from urllib import (
-    quote,
-    unquote,
-    )
+from urllib import unquote
 
 import pytz
 from zope.app.form.browser import TextAreaWidget
@@ -71,7 +68,6 @@
     LaunchpadRadioWidget,
     )
 from lp.app.errors import UnexpectedFormData
-from lp.registry.browser import MapMixin
 from lp.registry.browser.branding import BrandingChangeView
 from lp.registry.interfaces.mailinglist import (
     IMailingList,
@@ -1083,7 +1079,7 @@
         self.request.response.addInfoNotification(msg)
 
 
-class TeamMapView(MapMixin, LaunchpadView):
+class TeamMapView(LaunchpadView):
     """Show all people with known locations on a map.
 
     Also provides links to edit the locations of people in the team without
@@ -1093,12 +1089,6 @@
     label = "Team member locations"
     limit = None
 
-    def initialize(self):
-        # Tell our base-layout to include Google's gmap2 javascript so that
-        # we can render the map.
-        if self.gmap2_enabled and self.mapped_participants_count > 0:
-            self.request.needs_gmap2 = True
-
     @cachedproperty
     def mapped_participants(self):
         """Participants with locations."""

=== modified file 'lib/lp/registry/browser/tests/person-views.txt'
--- lib/lp/registry/browser/tests/person-views.txt	2010-08-28 23:01:18 +0000
+++ lib/lp/registry/browser/tests/person-views.txt	2010-09-22 06:47:48 +0000
@@ -301,113 +301,6 @@
     Portuguese (Brazil)
 
 
-Location
---------
-
-The Person profile page contains the location portlet that shows a map.
-The map requires the google GMap JavaScript to display, so the views set
-the state of the request's needs_gmap2 attribute to True only when the
-user has set his latitude, it is visible, and the viewing user wishes to
-see it. The map is not rendered if the user has not set his location.
-
-    >>> sample_person.latitude is None
-    True
-
-    >>> person_view = create_initialized_view(sample_person, '+index')
-    >>> person_view.request.needs_gmap2
-    False
-
-The map_portlet_html property that creates the map cannot be called.
-
-    >>> print person_view.map_portlet_html
-    Traceback (most recent call last):
-     ...
-    AssertionError: Can't generate the map for a person who hasn't set
-                    a visible location.
-
-If the user sets his location, but does not make it visible, needs_gmap2
-will still be False and the map_portlet_html property cannot be called.
-
-    >>> login_person(sample_person)
-    >>> sample_person.setLocation(
-    ...     38.81, 77.1, 'America/New_York', sample_person)
-    >>> sample_person.setLocationVisibility(False)
-    >>> login('[e-mail]')
-
-    >>> person_view = create_initialized_view(sample_person, '+index')
-    >>> person_view.request.needs_gmap2
-    False
-
-    >>> print person_view.map_portlet_html
-    Traceback (most recent call last):
-     ...
-    AssertionError: Can't generate the map for a person who hasn't set
-                    a visible location.
-
-When the user set's his visibility to True, needs_gmap2 will be true and
-the map_portlet_html can be called.
-
-    >>> from lp.services.features.model import FeatureFlag, getFeatureStore
-    >>> ignore = getFeatureStore().add(FeatureFlag(
-    ...     scope=u'default', flag=u'gmap2', value=u'on', priority=1))
-    >>> transaction.commit()
-
-    >>> login_person(sample_person)
-    >>> sample_person.setLocationVisibility(True)
-
-    >>> person_view = create_initialized_view(sample_person, '+index')
-    >>> person_view.request.needs_gmap2
-    True
-
-    >>> print person_view.map_portlet_html
-    <script type="text/javascript">
-      YUI().use('node', 'lp.app.mapping', function(Y) { ...
-
-The small_maps key in the launchpad_views cookie can be set of the
-viewing user to 'false' to indicate that small maps are not wanted.
-While needs_gmap2 is False, the map_portlet_html property's markup is
-still needed to render the 'Show maps' checkbox.
-
-    >>> cookie = 'launchpad_views=small_maps=false'
-    >>> person_view = create_initialized_view(
-    ...     sample_person, '+index', cookie=cookie)
-    >>> person_view.request.needs_gmap2
-    False
-
-    >>> print person_view.map_portlet_html
-    <script type="text/javascript">
-      YUI().use('node', 'lp.app.mapping', function(Y) { ...
-
-The map portlet is shown if the user has not set his location and is
-viewing his own page.
-
-    >>> user = factory.makePerson()
-    >>> user.latitude is None
-    True
-
-    >>> login_person(user)
-    >>> person_view = create_initialized_view(
-    ...     user, '+index')
-    >>> person_view.should_show_map_portlet
-    True
-
-However another user will not be shown the portlet.
-
-    >>> login('[e-mail]')
-    >>> person_view = create_initialized_view(
-    ...     user, '+index')
-    >>> person_view.should_show_map_portlet
-    False
-
-If a user has a location set and it is visibible then the portlet is
-shown.
-
-    >>> person_view = create_initialized_view(
-    ...     sample_person, '+index')
-    >>> person_view.should_show_map_portlet
-    True
-
-
 Things a person is working on
 -----------------------------
 

=== modified file 'lib/lp/registry/browser/tests/team-views.txt'
--- lib/lp/registry/browser/tests/team-views.txt	2010-08-28 23:01:18 +0000
+++ lib/lp/registry/browser/tests/team-views.txt	2010-09-22 06:47:48 +0000
@@ -67,21 +67,11 @@
 
 == +map-portlet ==
 
-The team profile page contain the location portlet that shows a map. The
-map requires the google GMap JavaScript to display, so the views set the
-state of the request's needs_gmap2 attribute to true if there are
-members who have set their location.
-
-    >>> from lp.services.features.model import FeatureFlag, getFeatureStore
-    >>> ignore = getFeatureStore().add(FeatureFlag(
-    ...     scope=u'default', flag=u'gmap2', value=u'on', priority=1))
-    >>> transaction.commit()
+The team profile page contain the location portlet that shows a map.
 
     >>> team_view = create_initialized_view(ubuntu_team, '+index')
     >>> team_view.has_visible_location
     False
-    >>> team_view.request.needs_gmap2
-    False
 
 After a member has set his location, the map will be rendered.
 
@@ -92,8 +82,6 @@
     >>> team_view = create_initialized_view(ubuntu_team, '+index')
     >>> team_view.has_visible_location
     True
-    >>> team_view.request.needs_gmap2
-    True
 
 The small_maps key in the launchpad_views cookie can be set by the viewing
 user to 'false' to indicate that small maps are not wanted.
@@ -101,9 +89,6 @@
     >>> cookie = 'launchpad_views=small_maps=false'
     >>> team_view = create_initialized_view(
     ...     ubuntu_team, '+index', cookie=cookie)
-    >>> team_view.request.needs_gmap2
-    False
-
 
 == +map ==
 
@@ -118,15 +103,10 @@
     >>> view.times
     []
 
-There are no mapped member yet, so needs_gmap2 is False, so the map will
-not be rendered.
-
-    >>> view.request.needs_gmap2
-    False
-
-Once a member is mapped, needs_gmap2 is True and the map will be rendered.
-The view provides a cached property to access the mapped participants. The
-views number of times is incremented for each timezone the members reside in.
+
+Once a member is mapped, the map will be rendered. The view provides a cached
+property to access the mapped participants. The views number of times is
+incremented for each timezone the members reside in.
 
     >>> london_member = factory.makePerson(
     ...     latitude=51.49, longitude=-0.13, time_zone='Europe/London')
@@ -139,9 +119,6 @@
     >>> len(view.times)
     1
 
-    >>> view.request.needs_gmap2
-    True
-
     >>> brazil_member = factory.makePerson(
     ...     latitude=-23.60, longitude=-46.64, time_zone='America/Sao_Paulo')
     >>> ignored = context.addMember(brazil_member, mark)

=== modified file 'lib/lp/registry/doc/personlocation.txt'
--- lib/lp/registry/doc/personlocation.txt	2010-08-20 12:25:28 +0000
+++ lib/lp/registry/doc/personlocation.txt	2010-09-22 06:47:48 +0000
@@ -1,4 +1,5 @@
-= Locations for People and Teams =
+Locations for People and Teams
+==============================
 
 The PersonLocation object stores information about the location and time
 zone of a person.  It also remembers who provided that information, and
@@ -164,7 +165,8 @@
                     mapped_participants_count == 0.
 
 
-== Location visibility ==
+Location visibility
+-------------------
 
 Some people may not want their location to be disclosed to others, so
 we provide a way for them to hide their location from other users. By

=== modified file 'lib/lp/registry/stories/location/personlocation-edit.txt'
--- lib/lp/registry/stories/location/personlocation-edit.txt	2009-11-15 01:05:49 +0000
+++ lib/lp/registry/stories/location/personlocation-edit.txt	2010-09-22 06:47:48 +0000
@@ -1,4 +1,5 @@
-== Edit person location information ==
+Edit person location information
+================================
 
 A person's location is only editable by people who have launchpad.Edit on
 the person, which is that person and admins.
@@ -49,35 +50,3 @@
     >>> admin_browser.open('http://launchpad.dev/~zzz/+editlocation')
     >>> admin_browser.getControl(name='field.location.latitude').value
     '39.48'
-
-The +editlocation page also allows a person to change his location
-visibility, that is, whether or not others can see it. 
-
-    >>> nopriv_browser.open('http://launchpad.dev/~no-priv/+editlocation')
-    >>> nopriv_browser.getControl(
-    ...     'Hide my location details from others.').selected = True
-    >>> nopriv_browser.getControl('Update').click()
-    >>> nopriv_browser.url
-    'http://launchpad.dev/~no-priv'
-
-Once hidden, other users can't see it.
-
-    >>> name12_browser = setupBrowser(auth="Basic [e-mail]:test")
-    >>> name12_browser.open('http://launchpad.dev/~no-priv')
-    >>> print str(find_tag_by_id(name12_browser.contents, 'person_map_div'))
-    None
-
-The person himself can still see and change it, though.
-
-    >>> nopriv_browser.open('http://launchpad.dev/~no-priv')
-    >>> print str(find_tag_by_id(nopriv_browser.contents, 'portlet-map'))
-    <div...
-    <h2>Location</h2>
-    ...
-
-    >>> nopriv_browser.open('http://launchpad.dev/~no-priv/+editlocation')
-    >>> nopriv_browser.getControl(
-    ...     'Hide my location details from others.').selected = False
-    >>> nopriv_browser.getControl('Update').click()
-    >>> nopriv_browser.url
-    'http://launchpad.dev/~no-priv'

=== modified file 'lib/lp/registry/stories/location/personlocation.txt'
--- lib/lp/registry/stories/location/personlocation.txt	2010-08-27 22:42:17 +0000
+++ lib/lp/registry/stories/location/personlocation.txt	2010-09-22 06:47:48 +0000
@@ -16,43 +16,3 @@
     >>> anon_browser.open('http://launchpad.dev/~zzz')
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'portlet-map'))
-
-If a person has a location, but the gmap2 feature is not enabled, the user
-sees the timezone, but no map.
-
-    >>> login('[e-mail]')
-    >>> yyy = factory.makePerson(name='yyy', time_zone='Europe/London',
-    ...                          latitude=52.2, longitude=0.3)
-    >>> logout()
-
-    >>> anon_browser.open('http://launchpad.dev/~yyy')
-    >>> markup = str(anon_browser.contents)
-    >>> print extract_text(
-    ...     find_tag_by_id(markup, 'portlet-map'), skip_tags=[])
-    Location
-    Time zone: Europe/London...
-
-    >>> 'src="http://maps.google.com/maps' in markup
-    False
-
-If a person has a location, there is a little map portlet in their
-profile page. We can't test all the google javascript, but we can make sure
-there's a map, and the scripts are loaded  when the gmap2 feature is enabled
-for users.
-
-    >>> from lp.services.features.model import FeatureFlag, getFeatureStore
-    >>> ignore = getFeatureStore().add(FeatureFlag(
-    ...     scope=u'default', flag=u'gmap2', value=u'on', priority=1))
-    >>> transaction.commit()
-
-    >>> anon_browser.open('http://launchpad.dev/~yyy')
-    >>> markup = str(anon_browser.contents)
-    >>> print extract_text(
-    ...     find_tag_by_id(markup, 'portlet-map'), skip_tags=[])
-    Location
-    Time zone: Europe/London...
-    Y.lp.app.mapping.renderPersonMapSmall(...
-    >>> 'src="http://maps.google.com/maps' in markup
-    True
-    >>> 'build/app/mapping.js' in markup
-    True

=== modified file 'lib/lp/registry/stories/location/team-map.txt'
--- lib/lp/registry/stories/location/team-map.txt	2010-08-27 22:33:36 +0000
+++ lib/lp/registry/stories/location/team-map.txt	2010-09-22 06:47:48 +0000
@@ -1,50 +1,6 @@
 The map of a team's members
 ===========================
 
-Maps are disabled
------------------
-
-Users cannot see maps when the gmap2 feature is disbaled for them
-
-    >>> user_browser.open('http://launchpad.dev/~guadamen')
-    >>> body = find_main_content(user_browser.contents)
-    >>> mapdiv = find_tag_by_id(str(body), 'team_map_div')
-    >>> 'lp.app.mapping.renderTeamMapSmall(' in str(body)
-    False
-
-
-Maps are enabled
-----------------
-
-Users can see maps when the gmap2 feature is enabled for them.
-
-    >>> from lp.services.features.model import FeatureFlag, getFeatureStore
-    >>> ignore = getFeatureStore().add(FeatureFlag(
-    ...     scope=u'default', flag=u'gmap2', value=u'on', priority=1))
-    >>> transaction.commit()
-
-If a team has members that have locations, then you should see a portlet
-with their locations displayed.
-
-    >>> nopriv_browser = setupBrowser(auth='Basic [e-mail]:test')
-    >>> nopriv_browser.open('http://launchpad.dev/~guadamen')
-    >>> body = find_main_content(nopriv_browser.contents)
-    >>> mapdiv = find_tag_by_id(str(body), 'team_map_div')
-    >>> 'lp.app.mapping.renderTeamMapSmall(' in str(body)
-    True
-    >>> markup = str(nopriv_browser.contents)
-    >>> 'src="http://maps.google.com/maps' in markup
-    True
-    >>> 'build/app/mapping.js' in markup
-    True
-
-You should also be able to see a map of the team.
-
-    >>> maplink = nopriv_browser.getLink('View map and time zones')
-    >>> maplink.click()
-    >>> nopriv_browser.url
-    'http://launchpad.dev/~guadamen/+map'
-
 The map depends on a stream of XML-formatted data, giving the locations of
 all members of the team. We show that this stream works for teams with, and
 without, mapped members.
@@ -108,15 +64,6 @@
     <BLANKLINE>
 
 
-It doesn't make sense to edit the location of the team itself, not even
-if we are an admin, so a team's +editlocation page will simply redirect
-to +map.
-
-    >>> admin_browser.open('http://launchpad.dev/~guadamen/+editlocation')
-    >>> print admin_browser.url
-    http://launchpad.dev/~guadamen/+map
-
-
 +mapdata
 --------
 

=== removed file 'lib/lp/registry/templates/person-editlocation.pt'
--- lib/lp/registry/templates/person-editlocation.pt	2009-09-01 19:34:46 +0000
+++ lib/lp/registry/templates/person-editlocation.pt	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-<html
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:tal="http://xml.zope.org/namespaces/tal"
-  xmlns:metal="http://xml.zope.org/namespaces/metal"
-  xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-  metal:use-macro="view/macro:page/main_only"
-  i18n:domain="launchpad">
-
-<body>
-
-  <div metal:fill-slot="main">
-
-    <div metal:use-macro="context/@@launchpad_form/form">
-      <div metal:fill-slot="extra_info">
-         <input type="hidden" name="for_team" value=""
-                tal:attributes="value view/for_team_name" />
-      </div>
-    </div>
-
-  </div>
-
-</body>
-</html>

=== modified file 'lib/lp/registry/templates/person-portlet-map.pt'
--- lib/lp/registry/templates/person-portlet-map.pt	2010-08-27 22:33:36 +0000
+++ lib/lp/registry/templates/person-portlet-map.pt	2010-09-22 06:47:48 +0000
@@ -8,7 +8,6 @@
      tal:define="overview_menu context/menu:overview">
 
   <tal:show-map condition="view/should_show_map_portlet">
-
     <h2>Location</h2>
 
     <div tal:condition="context/time_zone">
@@ -16,30 +15,6 @@
       <span tal:replace="context/time_zone">UTC</span>
       <a tal:replace="structure overview_menu/editlocation/fmt:icon" />
     </div>
-
-
-    <tal:gmap2 condition="view/gmap2_enabled">
-    <div style="width: 400px;" tal:condition="context/latitude">
-      <div id="person_map_actions"
-        style="position:relative; z-index: 9999;
-               float:right; width: 8.5em; margin: 2px;
-               background-color: white; padding-bottom:1px;"></div>
-      <div id="person_map_div" class="small-map"
-        style="height: 200px; border: 1px; margin-top: 4px;"></div>
-      <tal:mapscript replace="structure view/map_portlet_html" />
-      <div style="margin-top: 0px;">
-        <a tal:replace="structure overview_menu/editlocation/fmt:link-icon" />
-      </div>
-    </div>
-    </tal:gmap2>
-
-    <tal:comment condition="nothing">
-      Only the user can see the editlocation image and link.
-    </tal:comment>
-    <a tal:condition="not: context/latitude"
-       tal:attributes="href overview_menu/editlocation/target"
-       ><img src="/+icing/portlet-map-unknown.png" />
-    </a>
   </tal:show-map>
 
 </div>

=== modified file 'lib/lp/registry/templates/team-index.pt'
--- lib/lp/registry/templates/team-index.pt	2010-06-28 21:56:49 +0000
+++ lib/lp/registry/templates/team-index.pt	2010-09-22 06:47:48 +0000
@@ -88,9 +88,6 @@
       <metal:subteam-of use-macro="context/@@+person-macros/subteam-of" />
     </div>
   </div>
-
-  <div tal:content="structure context/@@+portlet-map" />
-
 </div>
 </body>
 </html>

=== modified file 'lib/lp/registry/templates/team-portlet-map.pt'
--- lib/lp/registry/templates/team-portlet-map.pt	2010-08-27 22:33:36 +0000
+++ lib/lp/registry/templates/team-portlet-map.pt	2010-09-22 06:47:48 +0000
@@ -5,8 +5,7 @@
   omit-tag="">
 
 <div class="portlet" id="portlet-map" style="margin-bottom: 0px;"
-     tal:define="link context/menu:overview/map"
-     tal:condition="view/gmap2_enabled">
+     tal:define="link context/menu:overview/map">
 <table>
 <tr><td>
   <h2>

=== modified file 'test_on_merge.py'
--- test_on_merge.py	2010-08-10 21:27:56 +0000
+++ test_on_merge.py	2010-09-22 06:47:48 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/python -S
 #
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009, 2010 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests that get run automatically on a merge."""
@@ -13,7 +13,7 @@
 import psycopg2
 from subprocess import Popen, PIPE, STDOUT
 from signal import SIGKILL, SIGTERM, SIGINT, SIGHUP
-from select import select
+import select
 
 
 # The TIMEOUT setting (expressed in seconds) affects how long a test will run
@@ -164,7 +164,22 @@
     # Popen.communicate() with large data sets.
     open_readers = set([xvfb_proc.stdout])
     while open_readers:
-        rlist, wlist, xlist = select(open_readers, [], [], TIMEOUT)
+        # blocks for a long time and can easily fail with EINTR
+        # <https://bugs.launchpad.net/launchpad/+bug/615740> - catching
+        # it just here is not the perfect fix (other syscalls might be
+        # interrupted) but is pragmatic
+        while True:
+            try:
+                rlist, wlist, xlist = select.select(open_readers, [], [], TIMEOUT)
+                break
+            except select.error, e:
+                # nb: select.error doesn't expose a named 'errno' attribute,
+                # at least in python 2.6.5; see
+                # <http://mail.python.org/pipermail/python-dev/2000-October/009671.html>
+                if e[0] == errno.EINTR:
+                    continue
+                else:
+                    raise
 
         if len(rlist) == 0:
             # The select() statement timed out!