Merge lp:~jelmer/launchpad/bzr-code-imports into lp:launchpad/db-devel

[Jelmer Vernooij]

Add support for importing code from Bazaar branches.

At the moment mirrors of remote Bazaar branches are created with completely different infrastructure as the code imports. This is confusing for users (bug 611837) and duplicates a lot of code. Several features are only available for code imports (bug 362622, bug 193607, bug 193607, bug 371484) and vice versa. Having shared infrastructure would also make it easier to fix several open bugs that affect both code imports and code mirrors (bug 519159, bug 136939)

Code imports are a bit heavier than mirrors at the moment, as they run on a separate machine and require an extra copy of the branch that is imported.

This branch only adds backend support for Bazaar branches, it does not yet add a UI which can add code imports of this kind nor does it migrate any of the existing code mirrors.

[Gavin Panella (allenap)]

I don't know the ins and outs of bzrlib or codehosting - for that I
guess that's why you've asked Michael to review - but the rest looks
good.

[1]

+ def test_partial(self):
+ # Skip tests of partial tests, as they are disabled for native imports
+ # at the moment.
+ return

You could use TestCase.skip() here:

    def test_partial(self):
        self.skip("Disabled for native imports at the moment.")

review: Approve

[Jelmer Vernooij (jelmer)]

> I don't know the ins and outs of bzrlib or codehosting - for that I
> guess that's why you've asked Michael to review - but the rest looks
> good.
Thanks :)

I'm pretty confident about this code change (especially since nothing actually triggers the new code yet), but I'd like to get some feedback from more people (Michael, Jono?, Rob?) on to confirm this is the right direction to go in.

> + def test_partial(self):
> + # Skip tests of partial tests, as they are disabled for native
> imports
> + # at the moment.
> + return
>
> You could use TestCase.skip() here:
>
> def test_partial(self):
> self.skip("Disabled for native imports at the moment.")
I looked for things that raised SkipTest or TestSkipped and couldn't find any. I didn't know about TestCase.skip - thanks, fixed.

[Michael Hudson-Doyle (mwhudson)]

Some random comments: it would have been nice to see the things you had to do wrt the bzr upgrade

The fact that you put this line in suggests that the tests aren't very well isolated:

        branch.get_config().set_user_option("create_signatures", "never")

Does something need to inherit from bzrlib's TestCase? It's all a complete tangle though.

Is simply prohibiting branch references the right thing to do? The branch puller goes to some lengths to support them safely -- being able to dump all that code would surely be very nice. Relatedly, and on thinking about it I think this is a bit more serious, I think you might need to be careful about stacking -- it's contrived but you might be able to construct a branch that was stacked on some DC-internal branch and have that be imported so you can grab it.

In terms of overall direction, I'm all for removing duplication. I think the UI will require some effort (e.g. do we want to count bzr mirrors as "imported branches" on the code.launchpad.net frontpage?) but engineering wise, this looks fine, modulo the above comments.

review: Approve

[Michael Hudson-Doyle (mwhudson)]

"Some random comments: it would have been nice to see the things you had to do wrt the bzr upgrade " ... in a separate branch, I meant to say.

[Jelmer Vernooij (jelmer)]

On 06/24/2011 05:35 AM, Michael Hudson-Doyle wrote:
> Review: Approve
> Some random comments: it would have been nice to see the things you had to do wrt the bzr upgrade
This branch has two prerequisite branches, but I can only set one in
Launchpad. Hopefully the diff will get smaller when the update to the
newer bzr lands on lp:launchpad...
>
> The fact that you put this line in suggests that the tests aren't very well isolated:
>
> branch.get_config().set_user_option("create_signatures", "never")
>
> Does something need to inherit from bzrlib's TestCase? It's all a complete tangle though.
Perhaps; bzr's TestCase does a lot though, and I'm kindof worried that
mixing it in will break other things. It should do more than just this
ad-hoc override though. Perhaps reset the global bzr configuration in setUp?

>
> Is simply prohibiting branch references the right thing to do? The branch puller goes to some lengths to support them safely -- being able to dump all that code would surely be very nice. Relatedly, and on thinking about it I think this is a bit more serious, I think you might need to be careful about stacking -- it's contrived but you might be able to construct a branch that was stacked on some DC-internal branch and have that be imported so you can grab it.
Stacking is a very good point, and one that I had not considered -
thanks. I should probably also have another, closer, look at the branch
puller to see what it does and why.

For branch references, the easiest thing to do for the moment seemed to
be to just refuse to mirror them. If code mirrors support branch
references at the moment, we should keep that support.

>
> In terms of overall direction, I'm all for removing duplication. I think the UI will require some effort (e.g. do we want to count bzr mirrors as "imported branches" on the code.launchpad.net frontpage?) but engineering wise, this looks fine, modulo the above comments.
Thanks for having a look at this. I'm only just getting into this code
and am not very familiar with it yet.

Cheers,

Jelmer

[Michael Hudson-Doyle (mwhudson)]

On Fri, 24 Jun 2011 19:55:45 +0200, Jelmer Vernooij <email address hidden> wrote:
> On 06/24/2011 05:35 AM, Michael Hudson-Doyle wrote:
> > Review: Approve
> > Some random comments: it would have been nice to see the things you had to do wrt the bzr upgrade
> This branch has two prerequisite branches, but I can only set one in
> Launchpad. Hopefully the diff will get smaller when the update to the
> newer bzr lands on lp:launchpad...

Ah! I guess you could have created a branch with both of the
prerequisites merged in, but that's getting pretty tedious...

> >
> > The fact that you put this line in suggests that the tests aren't very well isolated:
> >
> > branch.get_config().set_user_option("create_signatures", "never")
> >
> > Does something need to inherit from bzrlib's TestCase? It's all a complete tangle though.
> Perhaps; bzr's TestCase does a lot though, and I'm kindof worried that
> mixing it in will break other things.

I'd be surprised if it broke other stuff on past experience, but you
might be right.

> It should do more than just this ad-hoc override though. Perhaps reset
> the global bzr configuration in setUp?

I guess what you want is a test fixture that just does the environment
isolation in bzrlib you can reuse here... but yes, doing something more
generic than just clearing create_signatures would be better, I think.

> >
> > Is simply prohibiting branch references the right thing to do? The branch puller goes to some lengths to support them safely -- being able to dump all that code would surely be very nice. Relatedly, and on thinking about it I think this is a bit more serious, I think you might need to be careful about stacking -- it's contrived but you might be able to construct a branch that was stacked on some DC-internal branch and have that be imported so you can grab it.
> Stacking is a very good point, and one that I had not considered -
> thanks. I should probably also have another, closer, look at the branch
> puller to see what it does and why.

For reasons I should probably be ashamed of, there seem to be two
implementations of 'safe opening' in Launchpad; one is around
lp.codehosting.bzrutils.safe_open and the other around
lp.codehosting.puller.worker.BranchMirrorer.

(looking at worker.py makes me realize how much code we can delete once
this branch is done, never mind how much can be deleted when the puller
is gone completely).

> For branch references, the easiest thing to do for the moment seemed to
> be to just refuse to mirror them. If code mirrors support branch
> references at the moment, we should keep that support.

Yeah, they do.

> >
> > In terms of overall direction, I'm all for removing duplication. I think the UI will require some effort (e.g. do we want to count bzr mirrors as "imported branches" on the code.launchpad.net frontpage?) but engineering wise, this looks fine, modulo the above comments.
> Thanks for having a look at this. I'm only just getting into this code
> and am not very familiar with it yet.

You seem to be doing fine :)

Cheers,
mwh

=== modified file 'database/schema/patch-2208-74-0.sql'
--- database/schema/patch-2208-74-0.sql	2011-06-27 10:38:18 +0000
+++ database/schema/patch-2208-74-0.sql	2011-07-18 11:13:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 -- Copyright 2011 Canonical Ltd.  This software is licensed under the
 -- GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -15,3 +16,22 @@
 
 INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 74, 0);
 
+=======
+-- Copyright 2011 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE CodeImport DROP CONSTRAINT valid_vcs_details;
+ALTER TABLE CodeImport ADD CONSTRAINT "valid_vcs_details" CHECK (
+CASE
+    WHEN rcs_type = 1 THEN cvs_root IS NOT NULL AND cvs_root <> ''::text AND cvs_module IS NOT NULL AND cvs_module <> ''::text AND url IS NULL
+    WHEN rcs_type = ANY (ARRAY[2, 3]) THEN cvs_root IS NULL AND cvs_module IS NULL AND url IS NOT NULL AND valid_absolute_url(url)
+    WHEN rcs_type = ANY (ARRAY[4, 5, 6]) THEN cvs_root IS NULL AND cvs_module IS NULL AND url IS NOT NULL
+    ELSE false
+END);
+
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 74, 0);
+
+>>>>>>> MERGE-SOURCE
 
=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2011-07-15 15:46:51 +0000
+++ lib/canonical/config/schema-lazr.conf	2011-07-18 11:13:26 +0000
@@ -504,6 +504,11 @@
 # datatype: integer
 default_interval_cvs: 43200
 
+# The default value of the update interval of a code import from
+# Bazaar, in seconds.
+# datatype: integer
+default_interval_bzr: 21600
+
 # Where the tarballs of foreign branches are uploaded for storage.
 # datatype: string
 foreign_tree_store: sftp://hoover@escudero/srv/importd/sources/
 
=== modified file 'lib/canonical/launchpad/daemons/tachandler.py'
--- lib/canonical/launchpad/daemons/tachandler.py	2011-06-21 17:13:47 +0000
+++ lib/canonical/launchpad/daemons/tachandler.py	2011-07-18 11:13:26 +0000
@@ -20,6 +20,7 @@
 from fixtures import Fixture
 
 from canonical.launchpad.daemons import readyservice
+<<<<<<< TREE
 from lp.services.osutils import (
     get_pid_from_file,
     kill_by_pidfile,
@@ -27,6 +28,14 @@
     two_stage_kill,
     until_no_eintr,
     )
+=======
+from lp.services.osutils import (
+    get_pid_from_file,
+    kill_by_pidfile,
+    remove_if_exists,
+    two_stage_kill,
+    )
+>>>>>>> MERGE-SOURCE
 
 
 twistd_script = os.path.abspath(os.path.join(
 
=== modified file 'lib/canonical/launchpad/doc/vocabulary-json.txt'
--- lib/canonical/launchpad/doc/vocabulary-json.txt	2011-07-18 00:30:18 +0000
+++ lib/canonical/launchpad/doc/vocabulary-json.txt	2011-07-18 11:13:26 +0000
@@ -93,9 +93,14 @@
                 "api_uri": "/~commercial-admins",
                 "css": "sprite team",
                 "link_css": "js-action",
+<<<<<<< TREE
                 "metadata": "team",
                 "title": "Commercial Subscription Admins",
                 "value": "commercial-admins"
+=======
+                "title": "Commercial Subscription Admins",
+                "value": "commercial-admins"
+>>>>>>> MERGE-SOURCE
             }
         ],
         "total_size": 6
@@ -114,9 +119,14 @@
                 "api_uri": "/~launchpad-buildd-admins",
                 "css": "sprite team",
                 "link_css": "js-action",
+<<<<<<< TREE
                 "metadata": "team",
                 "title": "Launchpad Buildd Admins",
                 "value": "launchpad-buildd-admins"
+=======
+                "title": "Launchpad Buildd Admins",
+                "value": "launchpad-buildd-admins"
+>>>>>>> MERGE-SOURCE
             }
         ],
         "total_size": 6
 
=== modified file 'lib/lp/app/javascript/picker/person_picker.js'
--- lib/lp/app/javascript/picker/person_picker.js	2011-07-14 12:46:31 +0000
+++ lib/lp/app/javascript/picker/person_picker.js	2011-07-18 11:13:26 +0000
@@ -1,10 +1,81 @@
 /* Copyright 2011 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
+<<<<<<< TREE
  * @namespace Y.lazr.person-picker
  * @requires lazr.picker
  */
 YUI.add('lazr.person-picker', function(Y) {
+=======
+ * @namespace Y.lp.app.widgets
+ * @requires Y.lazr.picker
+ */
+YUI.add('lp.app.widgets', function(Y) {
+var namespace = Y.namespace('lp.app.widgets');
+
+/**
+ * Extend the lazr-js Picker.
+ */
+var Picker = function() {
+    Picker.superclass.constructor.apply(this, arguments);
+};
+
+Y.extend(Picker, Y.lazr.Picker, {
+    // We want to render alt title slightly differently.
+    _renderTitleUI: function(data) {
+        var li_title = Y.Node.create(
+            '<span></span>').addClass(Y.lazr.Picker.C_RESULT_TITLE);
+        if (data.title === undefined) {
+            // Display an empty element if data is empty.
+            return li_title;
+        }
+        var title = this._text_or_link(
+            data.title, data.title_link, data.link_css);
+        li_title.appendChild(title);
+        if (data.alt_title) {
+            var alt_link = null;
+            if (data.alt_title_link) {
+                alt_link =Y.Node.create('<a></a>')
+                    .addClass(data.link_css)
+                    .addClass('discreet');
+                alt_link.set('text', " Details...")
+                    .set('href', data.alt_title_link);
+                Y.on('click', function(e) {
+                    e.halt();
+                    window.open(data.alt_title_link);
+                }, alt_link);
+            }
+            li_title.appendChild('&nbsp;(');
+            li_title.appendChild(document.createTextNode(data.alt_title));
+            li_title.appendChild(')');
+            if (alt_link !== null) {
+                li_title.appendChild(alt_link);
+            }
+        }
+        return li_title;
+    },
+
+    /**
+     * Create the widget's HTML components.
+     * <p>
+     * This method is invoked after renderUI is invoked for the Widget class
+     * using YUI's aop infrastructure.
+     * </p>
+     *
+     * @method _renderUIPicker
+     * @protected
+     */
+    _renderUIPicker: function() {
+        Picker.superclass._renderUIPicker.apply(this, arguments);
+        var body = this._batches_box.get('parentNode');
+        body.removeChild(this._batches_box);
+        this._results_box.insert(this._batches_box, 'after');
+    }
+});
+
+Picker.NAME = 'picker';
+namespace.Picker = Picker;
+>>>>>>> MERGE-SOURCE
 
 /*
  * Extend the picker into the PersonPicker
 
=== modified file 'lib/lp/app/javascript/picker/picker_patcher.js'
--- lib/lp/app/javascript/picker/picker_patcher.js	2011-07-18 05:32:40 +0000
+++ lib/lp/app/javascript/picker/picker_patcher.js	2011-07-18 11:13:26 +0000
@@ -93,8 +93,12 @@
             if (link === null || !show_remove_button) {
                 remove_button.addClass('yui3-picker-hidden');
             } else {
+<<<<<<< TREE
                 remove_button.removeClass('yui3-picker-hidden');
                 update_button_text();
+=======
+                remove_button.removeClass('yui3-picker-hidden');
+>>>>>>> MERGE-SOURCE
             }
         }
 
 
=== modified file 'lib/lp/app/javascript/picker/tests/test_personpicker.js'
--- lib/lp/app/javascript/picker/tests/test_personpicker.js	2011-07-15 02:20:36 +0000
+++ lib/lp/app/javascript/picker/tests/test_personpicker.js	2011-07-18 11:13:26 +0000
@@ -6,6 +6,7 @@
            'lazr.picker', 'lazr.person-picker', 'lp.app.picker',
            'node-event-simulate', function(Y) {
 
+<<<<<<< TREE
 var Assert = Y.Assert;
 
 /* Helper function to clean up a dynamically added widget instance. */
@@ -144,6 +145,78 @@
             picker.set('results', []);
         } else {
             picker.set('results', this.vocabulary);
+=======
+    var suite = new Y.Test.Suite("lp.app.widgets.PersonPicker Tests");
+
+    suite.add(new Y.Test.Case({
+        name: 'personpicker',
+
+        setUp: function() {
+            window.LP = {
+                links: {me: '/~no-one'},
+                cache: {}
+            };
+        },
+
+        test_render: function () {
+            var personpicker = new Y.lp.app.widgets.PersonPicker();
+            personpicker.render();
+            personpicker.show();
+
+            // The extra buttons section exists
+            Y.Assert.isNotNull(Y.one('.extra-form-buttons'));
+            Y.Assert.isNotUndefined(personpicker.assign_me_button);
+            Y.Assert.isNotUndefined(personpicker.remove_button);
+        },
+
+        test_search_field_focus: function () {
+            var personpicker = new Y.lp.app.widgets.PersonPicker();
+            personpicker.render();
+            personpicker.hide();
+
+            var got_focus = false;
+            personpicker._search_input.on('focus', function(e) {
+                got_focus = true;
+            });
+            personpicker.show();
+            Y.Assert.isTrue(got_focus, "search input did not get focus.");
+        },
+
+        test_buttons: function () {
+            var personpicker = new Y.lp.app.widgets.PersonPicker();
+            personpicker.render();
+            personpicker.show();
+
+            // Patch the picker so the assign_me and remove methods can be
+            // tested.
+            var data = null;
+            personpicker.on('save', function (result) {
+                data = result.value;
+            });
+            var remove = Y.one('.yui-picker-remove-button');
+            remove.simulate('click');
+            Y.Assert.areEqual('', data);
+
+            var assign_me = Y.one('.yui-picker-assign-me-button');
+            assign_me.simulate('click');
+            Y.Assert.areEqual('no-one', data);
+        },
+
+        test_buttons_config: function () {
+            cfg = {
+                show_assign_me_button: false,
+                show_remove_button: false
+            };
+
+            personpicker = new Y.lp.app.widgets.PersonPicker(cfg);
+            personpicker.render();
+            personpicker.show();
+            
+            Y.Assert.isNotNull(Y.one('.extra-form-buttons'));
+            Y.Assert.isUndefined(personpicker.remove_button);
+            Y.Assert.isUndefined(personpicker.assign_me_button);
+
+>>>>>>> MERGE-SOURCE
         }
     },
 
 
=== modified file 'lib/lp/app/javascript/picker/tests/test_picker_patcher.js'
--- lib/lp/app/javascript/picker/tests/test_picker_patcher.js	2011-07-18 05:32:40 +0000
+++ lib/lp/app/javascript/picker/tests/test_picker_patcher.js	2011-07-18 11:13:26 +0000
@@ -231,6 +231,7 @@
 }));
 
 /*
+<<<<<<< TREE
  * Test cases for assign and remove buttons.
  */
 suite.add(new Y.Test.Case({
@@ -471,6 +472,184 @@
 }));
 
 /*
+=======
+ * Test cases for assign and remove buttons.
+ */
+suite.add(new Y.Test.Case({
+
+    name: 'picker_assign_remove_button',
+
+    setUp: function() {
+        var i;
+        this.vocabulary = new Array(121);
+        for (i = 0; i <5; i++) {
+            this.vocabulary[i] = {
+                "value": "value-" + i,
+                "title": "title-" + i,
+                "css": "sprite-person",
+                "description": "description-" + i,
+                "api_uri": "~/fred-" + i};
+        }
+        this.ME = '/~me';
+        window.LP = {
+            links: {
+                me: this.ME
+            },
+            cache: {}
+        };
+
+        // We patch Launchpad client to return some fake data for the patch
+        // operation.
+        Y.lp.client.Launchpad = function() {};
+        Y.lp.client.Launchpad.prototype.patch =
+            function(uri, representation, config, headers) {
+                // our setup assumes success, so we just do the success
+                // callback.
+                var entry_repr = {
+                  'lp_html': {'test_link': '<a href="/~me">Content</a>'}
+                };
+                var result = new Y.lp.client.Entry(
+                    null, entry_repr, "a_self_link");
+                config.on.success(result);
+            };
+
+    },
+
+    tearDown: function() {
+        cleanup_widget(this.picker);
+        delete window.LP;
+    },
+
+    create_picker: function(show_assign_me, show_remove, field_value) {
+        if (field_value !== undefined) {
+            var data_box = Y.one('#picker_id .yui3-activator-data-box');
+            data_box.appendChild(Y.Node.create('<a>Content</a>'));
+            data_box.one('a').set('href', field_value);
+        }
+
+        var config = {
+            "step_title": "Choose someone",
+            "header": "Pick Someone",
+            "validate_callback": null,
+            "show_search_box": true,
+            "show_assign_me_button": show_assign_me,
+            "show_remove_button": show_remove
+            };
+        this.picker = Y.lp.app.picker.addPickerPatcher(
+                this.vocabulary,
+                "foo/bar",
+                "test_link",
+                "picker_id",
+                config);
+    },
+
+    _check_button_state: function(btn_class, is_visible) {
+        var assign_me_button = Y.one(btn_class);
+        Assert.isNotNull(assign_me_button);
+        if (is_visible) {
+            Assert.isFalse(
+                assign_me_button.hasClass('yui3-picker-hidden'),
+                btn_class + " should be visible but is hidden");
+        } else {
+            Assert.isTrue(
+                assign_me_button.hasClass('yui3-picker-hidden'),
+                btn_class + " should be hidden but is visible");
+        }
+    },
+
+    _check_assign_me_button_state: function(is_visible) {
+        this._check_button_state('.yui-picker-assign-me-button', is_visible);
+    },
+
+    _check_remove_button_state: function(is_visible) {
+        this._check_button_state('.yui-picker-remove-button', is_visible);
+    },
+
+    test_picker_has_assign_me_button: function() {
+        // The assign me button is shown.
+        this.create_picker(true, true);
+        this.picker.render();
+        this._check_assign_me_button_state(true);
+    },
+
+    test_picker_no_assign_me_button_unless_configured: function() {
+        // The assign me button is only rendered if show_assign_me_button
+        // config setting is true.
+        this.create_picker(false, true);
+        this.picker.render();
+        Assert.isNull(Y.one('.yui-picker-assign-me-button'));
+    },
+
+    test_picker_no_assign_me_button_if_value_is_me: function() {
+        // The assign me button is not shown if the picker is created for a
+        // field where the value is "me".
+        this.create_picker(true, true, this.ME);
+        this.picker.render();
+        this._check_assign_me_button_state(false);
+    },
+
+    test_picker_assign_me_button_hide_on_save: function() {
+        // The assign me button is shown initially but hidden if the picker
+        // saves a value equal to 'me'.
+        this.create_picker(true, true);
+        this._check_assign_me_button_state(true);
+        this.picker.set('results', this.vocabulary);
+        this.picker.render();
+        simulate(
+            this.picker.get('boundingBox').one('.yui3-picker-results'),
+                'li:nth-child(1)', 'click');
+        this._check_assign_me_button_state(false);
+    },
+
+    test_picker_no_remove_button_if_null_value: function() {
+        // The remove button is not shown if the picker is created for a field
+        // which has a null value.
+        this.create_picker(true, true);
+        this.picker.render();
+        this._check_remove_button_state(false);
+    },
+
+    test_picker_has_remove_button_if_value: function() {
+        // The remove button is shown if the picker is created for a field
+        // which has a value.
+        this.create_picker(true, true, this.ME);
+        this.picker.render();
+        this._check_remove_button_state(true);
+    },
+
+    test_picker_no_remove_button_unless_configured: function() {
+        // The remove button is only rendered if show_remove_button setting is
+        // true.
+        this.create_picker(true, false, this.ME);
+        this.picker.render();
+        Assert.isNull(Y.one('.yui-picker-remove-button'));
+    },
+
+    test_picker_remove_button_clicked: function() {
+        // The remove button is hidden once a picker value has been removed.
+        // And the assign me button is shown.
+        this.create_picker(true, true, this.ME);
+        this.picker.render();
+        var remove = Y.one('.yui-picker-remove-button');
+        remove.simulate('click');
+        this._check_remove_button_state(false);
+        this._check_assign_me_button_state(true);
+    },
+
+    test_picker_assign_me_button_clicked: function() {
+        // The assign me button is hidden once it is clicked.
+        // And the remove button is shown.
+        this.create_picker(true, true);
+        this.picker.render();
+        var remove = Y.one('.yui-picker-assign-me-button');
+        remove.simulate('click');
+        this._check_remove_button_state(true);
+        this._check_assign_me_button_state(false);
+    }
+}));
+
+/*
+>>>>>>> MERGE-SOURCE
  * Test cases for a picker with a large vocabulary.
  */
 suite.add(new Y.Test.Case({
 
=== modified file 'lib/lp/code/errors.py'
--- lib/lp/code/errors.py	2011-06-23 21:09:20 +0000
+++ lib/lp/code/errors.py	2011-07-18 11:13:26 +0000
@@ -182,6 +182,7 @@
 class BranchMergeProposalExists(InvalidBranchMergeProposal):
     """Raised if there is already a matching BranchMergeProposal."""
 
+<<<<<<< TREE
     def __init__(self, existing_proposal):
         super(BranchMergeProposalExists, self).__init__(
                 'There is already a branch merge proposal registered for '
@@ -190,6 +191,8 @@
                  existing_proposal.target_branch.displayname))
         self.existing_proposal = existing_proposal
 
+=======
+>>>>>>> MERGE-SOURCE
 
 class InvalidNamespace(Exception):
     """Raised when someone tries to lookup a namespace with a bad name.
 
=== modified file 'lib/lp/code/mail/codeimport.py'
--- lib/lp/code/mail/codeimport.py	2011-05-27 21:12:25 +0000
+++ lib/lp/code/mail/codeimport.py	2011-07-18 11:13:26 +0000
@@ -51,6 +51,7 @@
         RevisionControlSystems.BZR_SVN: 'subversion',
         RevisionControlSystems.GIT: 'git',
         RevisionControlSystems.HG: 'mercurial',
+        RevisionControlSystems.BZR: 'bazaar',
         }
     body = get_email_template('new-code-import.txt') % {
         'person': code_import.registrant.displayname,
@@ -123,7 +124,8 @@
     elif code_import.rcs_type in (RevisionControlSystems.SVN,
                                   RevisionControlSystems.BZR_SVN,
                                   RevisionControlSystems.GIT,
-                                  RevisionControlSystems.HG):
+                                  RevisionControlSystems.HG,
+                                  RevisionControlSystems.BZR):
         if CodeImportEventDataType.OLD_URL in event_data:
             old_url = event_data[CodeImportEventDataType.OLD_URL]
             body.append(
 
=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2011-07-11 17:48:50 +0000
+++ lib/lp/code/model/branchjob.py	2011-07-18 11:13:26 +0000
@@ -107,11 +107,15 @@
 from lp.scripts.helpers import TransactionFreeOperation
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
+<<<<<<< TREE
 from lp.services.job.runner import (
     BaseRunnableJob,
     BaseRunnableJobSource,
     )
 from lp.services.utils import RegisteredSubclass
+=======
+from lp.services.job.runner import BaseRunnableJob
+>>>>>>> MERGE-SOURCE
 from lp.translations.interfaces.translationimportqueue import (
     ITranslationImportQueue,
     )
@@ -294,6 +298,18 @@
         raise SQLObjectNotFound(
             'No occurrence of %s has key %s' % (cls.__name__, key))
 
+    @classmethod
+    def get(cls, key):
+        """Return the instance of this class whose key is supplied.
+
+        :raises: SQLObjectNotFound
+        """
+        instance = IStore(BranchJob).get(BranchJob, key)
+        if instance is None or instance.job_type != cls.class_job_type:
+            raise SQLObjectNotFound(
+                'No occurrence of %s has key %s' % (cls.__name__, key))
+        return cls(instance)
+
     def getOopsVars(self):
         """See `IRunnableJob`."""
         vars = BaseRunnableJob.getOopsVars(self)
 
=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2011-04-27 01:42:46 +0000
+++ lib/lp/code/model/codeimport.py	2011-07-18 11:13:26 +0000
@@ -116,6 +116,8 @@
                 config.codeimport.default_interval_git,
             RevisionControlSystems.HG:
                 config.codeimport.default_interval_hg,
+            RevisionControlSystems.BZR:
+                config.codeimport.default_interval_bzr,
             }
         seconds = default_interval_dict[self.rcs_type]
         return timedelta(seconds=seconds)
@@ -133,7 +135,8 @@
             RevisionControlSystems.SVN,
             RevisionControlSystems.GIT,
             RevisionControlSystems.BZR_SVN,
-            RevisionControlSystems.HG):
+            RevisionControlSystems.HG,
+            RevisionControlSystems.BZR):
             return self.url
         else:
             raise AssertionError(
@@ -252,7 +255,8 @@
         elif rcs_type in (RevisionControlSystems.SVN,
                           RevisionControlSystems.BZR_SVN,
                           RevisionControlSystems.GIT,
-                          RevisionControlSystems.HG):
+                          RevisionControlSystems.HG,
+                          RevisionControlSystems.BZR):
             assert cvs_root is None and cvs_module is None
             assert url is not None
         else:
@@ -262,7 +266,8 @@
         if review_status is None:
             # Auto approve git and hg imports.
             if rcs_type in (
-                RevisionControlSystems.GIT, RevisionControlSystems.HG):
+                RevisionControlSystems.GIT, RevisionControlSystems.HG,
+                RevisionControlSystems.BZR):
                 review_status = CodeImportReviewStatus.REVIEWED
             else:
                 review_status = CodeImportReviewStatus.NEW
 
=== modified file 'lib/lp/code/model/codeimportevent.py'
--- lib/lp/code/model/codeimportevent.py	2010-10-17 22:51:50 +0000
+++ lib/lp/code/model/codeimportevent.py	2011-07-18 11:13:26 +0000
@@ -269,7 +269,8 @@
         if code_import.rcs_type in (RevisionControlSystems.SVN,
                                     RevisionControlSystems.BZR_SVN,
                                     RevisionControlSystems.GIT,
-                                    RevisionControlSystems.HG):
+                                    RevisionControlSystems.HG,
+                                    RevisionControlSystems.BZR):
             yield 'URL', code_import.url
         elif code_import.rcs_type == RevisionControlSystems.CVS:
             yield 'CVS_ROOT', code_import.cvs_root
 
=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2011-05-27 21:12:25 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2011-07-18 11:13:26 +0000
@@ -71,6 +71,20 @@
         # No job is created for the import.
         self.assertIs(None, code_import.import_job)
 
+    def test_new_svn_import_svn_scheme(self):
+        """A subversion import can use the svn:// scheme."""
+        code_import = CodeImportSet().new(
+            registrant=self.factory.makePerson(),
+            target=IBranchTarget(self.factory.makeProduct()),
+            branch_name='imported',
+            rcs_type=RevisionControlSystems.SVN,
+            url=self.factory.getUniqueURL(scheme="svn"))
+        self.assertEqual(
+            CodeImportReviewStatus.NEW,
+            code_import.review_status)
+        # No job is created for the import.
+        self.assertIs(None, code_import.import_job)
+
     def test_reviewed_svn_import(self):
         """A specific review status can be set for a new import."""
         code_import = CodeImportSet().new(
@@ -117,6 +131,21 @@
         # A job is created for the import.
         self.assertIsNot(None, code_import.import_job)
 
+    def test_git_import_git_scheme(self):
+        """A git import can have a git:// style URL."""
+        code_import = CodeImportSet().new(
+            registrant=self.factory.makePerson(),
+            target=IBranchTarget(self.factory.makeProduct()),
+            branch_name='imported',
+            rcs_type=RevisionControlSystems.GIT,
+            url=self.factory.getUniqueURL(scheme="git"),
+            review_status=None)
+        self.assertEqual(
+            CodeImportReviewStatus.REVIEWED,
+            code_import.review_status)
+        # A job is created for the import.
+        self.assertIsNot(None, code_import.import_job)
+
     def test_git_import_reviewed(self):
         """A new git import is always reviewed by default."""
         code_import = CodeImportSet().new(
@@ -147,6 +176,21 @@
         # A job is created for the import.
         self.assertIsNot(None, code_import.import_job)
 
+    def test_bzr_import_reviewed(self):
+        """A new bzr import is always reviewed by default."""
+        code_import = CodeImportSet().new(
+            registrant=self.factory.makePerson(),
+            target=IBranchTarget(self.factory.makeProduct()),
+            branch_name='mirrored',
+            rcs_type=RevisionControlSystems.BZR,
+            url=self.factory.getUniqueURL(),
+            review_status=None)
+        self.assertEqual(
+            CodeImportReviewStatus.REVIEWED,
+            code_import.review_status)
+        # A job is created for the import.
+        self.assertIsNot(None, code_import.import_job)
+
     def test_junk_code_import_rejected(self):
         """You are not allowed to create code imports targetting +junk."""
         registrant = self.factory.makePerson()
 
=== modified file 'lib/lp/codehosting/codeimport/tests/servers.py'
--- lib/lp/codehosting/codeimport/tests/servers.py	2011-06-02 10:48:54 +0000
+++ lib/lp/codehosting/codeimport/tests/servers.py	2011-07-18 11:13:26 +0000
@@ -4,6 +4,7 @@
 """Server classes that know how to create various kinds of foreign archive."""
 
 __all__ = [
+    'BzrServer',
     'CVSServer',
     'GitServer',
     'MercurialServer',
@@ -21,6 +22,8 @@
 import tempfile
 import time
 
+from bzrlib.bzrdir import BzrDir
+from bzrlib.branchbuilder import BranchBuilder
 from bzrlib.tests.treeshape import build_tree_contents
 from bzrlib.transport import Server
 from bzrlib.urlutils import (
@@ -246,3 +249,21 @@
                 f.close()
             repo[None].add([filename])
         repo.commit(text='<The commit message>', user='jane Foo <[e-mail]>')
+
+
+class BzrServer(Server):
+
+    def __init__(self, repo_url):
+        super(BzrServer, self).__init__()
+        self.repo_url = repo_url
+
+    def makeRepo(self, tree_contents):
+        branch = BzrDir.create_branch_convenience(self.repo_url)
+        branch.get_config().set_user_option("create_signatures", "never")
+        builder = BranchBuilder(branch=branch)
+        actions = [('add', ('', 'tree-root', 'directory', None))]
+        actions += [('add', (path, path+'-id', 'file', content)) for (path,
+            content) in tree_contents]
+        builder.build_snapshot(None, None,
+                actions, committer='Joe Foo <[e-mail]>',
+                message=u'<The commit message>')
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_worker.py'
--- lib/lp/codehosting/codeimport/tests/test_worker.py	2011-06-21 05:38:15 +0000
+++ lib/lp/codehosting/codeimport/tests/test_worker.py	2011-07-18 11:13:26 +0000
@@ -17,6 +17,9 @@
     Branch,
     BranchReferenceFormat,
     )
+from bzrlib.branchbuilder import (
+    BranchBuilder,
+    )
 from bzrlib.bzrdir import (
     BzrDir,
     BzrDirFormat,
@@ -24,12 +27,10 @@
     )
 from bzrlib.errors import (
     NoSuchFile,
-    NotBranchError,
     )
 from bzrlib.tests import TestCaseWithTransport
 from bzrlib import trace
 from bzrlib.transport import get_transport
-from bzrlib.upgrade import upgrade
 from bzrlib.urlutils import (
     join as urljoin,
     local_path_from_url,
@@ -49,6 +50,7 @@
     extract_tarball,
     )
 from lp.codehosting.codeimport.tests.servers import (
+    BzrServer,
     CVSServer,
     GitServer,
     MercurialServer,
@@ -56,6 +58,7 @@
     )
 from lp.codehosting.codeimport.worker import (
     BazaarBranchStore,
+    BzrImportWorker,
     BzrSvnImportWorker,
     CodeImportWorkerExitCode,
     CSCVSImportWorker,
@@ -1001,10 +1004,10 @@
         # import should be rejected.
         args = {'rcstype': self.rcstype}
         reference_url = self.createBranchReference()
-        if self.rcstype in ('git', 'bzr-svn', 'hg'):
+        if self.rcstype in ('git', 'bzr-svn', 'hg', 'bzr'):
             args['url'] = reference_url
         else:
-            raise AssertionError("unexpected rcs_type %r" % self.rcs_type)
+            raise AssertionError("unexpected rcs_type %r" % self.rcstype)
         source_details = self.factory.makeCodeImportSourceDetails(**args)
         worker = self.makeImportWorker(source_details)
         self.assertEqual(
@@ -1162,5 +1165,51 @@
             self.bazaar_store, logging.getLogger())
 
 
+class TestBzrImport(WorkerTest, TestActualImportMixin,
+                    PullingImportWorkerTests):
+
+    rcstype = 'bzr'
+
+    def setUp(self):
+        super(TestBzrImport, self).setUp()
+        self.setUpImport()
+
+    def makeImportWorker(self, source_details):
+        """Make a new `ImportWorker`."""
+        return BzrImportWorker(
+            source_details, self.get_transport('import_data'),
+            self.bazaar_store, logging.getLogger())
+
+    def makeForeignCommit(self, source_details):
+        """Change the foreign tree, generating exactly one commit."""
+        branch = Branch.open(source_details.url)
+        builder = BranchBuilder(branch=branch)
+        builder.build_commit(message=self.factory.getUniqueString(),
+            committer="Joe Random Hacker <[e-mail]>")
+        self.foreign_commit_count += 1
+
+    def makeSourceDetails(self, branch_name, files):
+        """Make Bzr `CodeImportSourceDetails` pointing at a real Bzr repo.
+        """
+        repository_path = self.makeTemporaryDirectory()
+        bzr_server = BzrServer(repository_path)
+        bzr_server.start_server()
+        self.addCleanup(bzr_server.stop_server)
+
+        bzr_server.makeRepo(files)
+        self.foreign_commit_count = 1
+
+        return self.factory.makeCodeImportSourceDetails(
+            rcstype='bzr', url=repository_path)
+
+    def test_partial(self):
+        self.skip(
+            "Partial fetching is not supported for native bzr branches "
+            "at the moment.")
+
+    def test_unsupported_feature(self):
+        self.skip("All Bazaar features are supported by Bazaar.")
+
+
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
=== modified file 'lib/lp/codehosting/codeimport/tests/test_workermonitor.py'
--- lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2011-06-16 23:43:04 +0000
+++ lib/lp/codehosting/codeimport/tests/test_workermonitor.py	2011-07-18 11:13:26 +0000
@@ -50,6 +50,7 @@
 from lp.code.model.codeimportjob import CodeImportJob
 from lp.codehosting import load_optional_plugin
 from lp.codehosting.codeimport.tests.servers import (
+    BzrServer,
     CVSServer,
     GitServer,
     MercurialServer,
@@ -682,6 +683,16 @@
 
         return self.factory.makeCodeImport(hg_repo_url=self.repo_path)
 
+    def makeBzrCodeImport(self):
+        """Make a `CodeImport` that points to a real Bazaar branch."""
+        self.bzr_server = BzrServer(self.repo_path)
+        self.bzr_server.start_server()
+        self.addCleanup(self.bzr_server.stop_server)
+
+        self.bzr_server.makeRepo([('README', 'contents')])
+        self.foreign_commit_count = 1
+        return self.factory.makeCodeImport(bzr_branch_url=self.repo_path)
+
     def getStartedJobForImport(self, code_import):
         """Get a started `CodeImportJob` for `code_import`.
 
@@ -782,6 +793,15 @@
         result = self.performImport(job_id)
         return result.addCallback(self.assertImported, code_import_id)
 
+    def test_import_bzr(self):
+        # Create a Bazaar CodeImport and import it.
+        job = self.getStartedJobForImport(self.makeBzrCodeImport())
+        code_import_id = job.code_import.id
+        job_id = job.id
+        self.layer.txn.commit()
+        result = self.performImport(job_id)
+        return result.addCallback(self.assertImported, code_import_id)
+
     # XXX 2010-03-24 MichaelHudson, bug=541526: This test fails intermittently
     # in EC2.
     def DISABLED_test_import_bzrsvn(self):
 
=== modified file 'lib/lp/codehosting/codeimport/worker.py'
--- lib/lp/codehosting/codeimport/worker.py	2011-06-21 05:38:15 +0000
+++ lib/lp/codehosting/codeimport/worker.py	2011-07-18 11:13:26 +0000
@@ -6,6 +6,7 @@
 __metaclass__ = type
 __all__ = [
     'BazaarBranchStore',
+    'BzrImportWorker',
     'BzrSvnImportWorker',
     'CSCVSImportWorker',
     'CodeImportSourceDetails',
@@ -190,9 +191,9 @@
 
     :ivar branch_id: The id of the branch associated to this code import, used
         for locating the existing import and the foreign tree.
-    :ivar rcstype: 'svn' or 'cvs' as appropriate.
+    :ivar rcstype: 'svn', 'cvs', 'hg', 'git', 'bzr-svn', 'bzr' as appropriate.
     :ivar url: The branch URL if rcstype in ['svn', 'bzr-svn',
-        'git'], None otherwise.
+        'git', 'hg', 'bzr'], None otherwise.
     :ivar cvs_root: The $CVSROOT if rcstype == 'cvs', None otherwise.
     :ivar cvs_module: The CVS module if rcstype == 'cvs', None otherwise.
     """
@@ -210,7 +211,7 @@
         """Convert command line-style arguments to an instance."""
         branch_id = int(arguments.pop(0))
         rcstype = arguments.pop(0)
-        if rcstype in ['svn', 'bzr-svn', 'git', 'hg']:
+        if rcstype in ['svn', 'bzr-svn', 'git', 'hg', 'bzr']:
             [url] = arguments
             cvs_root = cvs_module = None
         elif rcstype == 'cvs':
@@ -237,6 +238,8 @@
             return cls(branch_id, 'git', str(code_import.url))
         elif code_import.rcs_type == RevisionControlSystems.HG:
             return cls(branch_id, 'hg', str(code_import.url))
+        elif code_import.rcs_type == RevisionControlSystems.BZR:
+            return cls(branch_id, 'bzr', str(code_import.url))
         else:
             raise AssertionError("Unknown rcstype %r." % code_import.rcs_type)
 
@@ -244,7 +247,7 @@
         """Return a list of arguments suitable for passing to a child process.
         """
         result = [str(self.branch_id), self.rcstype]
-        if self.rcstype in ['svn', 'bzr-svn', 'git', 'hg']:
+        if self.rcstype in ['svn', 'bzr-svn', 'git', 'hg', 'bzr']:
             result.append(self.url)
         elif self.rcstype == 'cvs':
             result.append(self.cvs_root)
@@ -619,9 +622,19 @@
                 except NotBranchError:
                     pass
             else:
+<<<<<<< TREE
                 self._logger.info("No branch found at remote location.")
                 return CodeImportWorkerExitCode.FAILURE_INVALID
             remote_branch = format.open(transport).open_branch()
+=======
+                self._logger.info("No branch found at remote location.")
+                return CodeImportWorkerExitCode.FAILURE_INVALID
+            remote_dir = format.open(transport)
+            if remote_dir.get_branch_reference() is not None:
+                self._logger.info("Remote branch is a branch reference.")
+                return CodeImportWorkerExitCode.FAILURE_INVALID
+            remote_branch = remote_dir.open_branch()
+>>>>>>> MERGE-SOURCE
             remote_branch_tip = remote_branch.last_revision()
             inter_branch = InterBranch.get(remote_branch, bazaar_branch)
             self._logger.info("Importing branch.")
@@ -822,3 +835,21 @@
         """See `PullingImportWorker.probers`."""
         from bzrlib.plugins.svn import SvnRemoteProber
         return [SvnRemoteProber]
+
+
+class BzrImportWorker(PullingImportWorker):
+    """An import worker for importing Bazaar branches."""
+
+    invalid_branch_exceptions = []
+    unsupported_feature_exceptions = []
+
+    def getRevisionLimit(self):
+        """See `PullingImportWorker.getRevisionLimit`."""
+        # For now, just grab the whole branch at once
+        return None
+
+    @property
+    def probers(self):
+        """See `PullingImportWorker.probers`."""
+        from bzrlib.bzrdir import BzrProber, RemoteBzrProber
+        return [BzrProber, RemoteBzrProber]
 
=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2011-05-27 21:12:25 +0000
+++ lib/lp/registry/browser/productseries.py	2011-07-18 11:13:26 +0000
@@ -827,15 +827,6 @@
     ))
 
 
-class RevisionControlSystemsExtended(RevisionControlSystems):
-    """External RCS plus Bazaar."""
-    BZR = DBItem(99, """
-        Bazaar
-
-        External Bazaar branch.
-        """)
-
-
 class SetBranchForm(Interface):
     """The fields presented on the form for setting a branch."""
 
@@ -844,7 +835,7 @@
         ['cvs_module'])
 
     rcs_type = Choice(title=_("Type of RCS"),
-        required=False, vocabulary=RevisionControlSystemsExtended,
+        required=False, vocabulary=RevisionControlSystems,
         description=_(
             "The version control system to import from. "))
 
@@ -908,7 +899,7 @@
     @property
     def initial_values(self):
         return dict(
-            rcs_type=RevisionControlSystemsExtended.BZR,
+            rcs_type=RevisionControlSystems.BZR,
             branch_type=LINK_LP_BZR,
             branch_location=self.context.branch)
 
@@ -989,7 +980,7 @@
             self.setFieldError(
                 'rcs_type',
                 'You must specify the type of RCS for the remote host.')
-        elif rcs_type == RevisionControlSystemsExtended.CVS:
+        elif rcs_type == RevisionControlSystems.CVS:
             if 'cvs_module' not in data:
                 self.setFieldError(
                     'cvs_module',
@@ -1022,8 +1013,9 @@
         # Extend the allowed schemes for the repository URL based on
         # rcs_type.
         extra_schemes = {
-            RevisionControlSystemsExtended.BZR_SVN: ['svn'],
-            RevisionControlSystemsExtended.GIT: ['git'],
+            RevisionControlSystems.BZR_SVN: ['svn'],
+            RevisionControlSystems.GIT: ['git'],
+            RevisionControlSystems.BZR: ['bzr'],
             }
         schemes.update(extra_schemes.get(rcs_type, []))
         return schemes
@@ -1050,7 +1042,7 @@
             # The branch location is not required for validation.
             self._setRequired(['branch_location'], False)
             # The cvs_module is required if it is a CVS import.
-            if rcs_type == RevisionControlSystemsExtended.CVS:
+            if rcs_type == RevisionControlSystems.CVS:
                 self._setRequired(['cvs_module'], True)
         else:
             raise AssertionError("Unknown branch type %s" % branch_type)
@@ -1110,7 +1102,7 @@
                 # Either create an externally hosted bzr branch
                 # (a.k.a. 'mirrored') or create a new code import.
                 rcs_type = data.get('rcs_type')
-                if rcs_type == RevisionControlSystemsExtended.BZR:
+                if rcs_type == RevisionControlSystems.BZR:
                     branch = self._createBzrBranch(
                         BranchType.MIRRORED, branch_name, branch_owner,
                         data['repo_url'])
@@ -1123,7 +1115,7 @@
                         'the series.')
                 else:
                     # We need to create an import request.
-                    if rcs_type == RevisionControlSystemsExtended.CVS:
+                    if rcs_type == RevisionControlSystems.CVS:
                         cvs_root = data.get('repo_url')
                         cvs_module = data.get('cvs_module')
                         url = None
 
=== modified file 'lib/lp/registry/browser/tests/test_distroseries.py'
--- lib/lp/registry/browser/tests/test_distroseries.py	2011-07-07 20:07:51 +0000
+++ lib/lp/registry/browser/tests/test_distroseries.py	2011-07-18 11:13:26 +0000
@@ -32,11 +32,16 @@
 from canonical.config import config
 from canonical.database.constants import UTC_NOW
 from canonical.database.sqlbase import flush_database_caches
+<<<<<<< TREE
 from canonical.launchpad.testing.pages import (
     extract_text,
     find_tag_by_id,
     )
 from canonical.launchpad.webapp.authorization import check_permission
+=======
+from canonical.launchpad.testing.pages import find_tag_by_id
+from canonical.launchpad.webapp.authorization import check_permission
+>>>>>>> MERGE-SOURCE
 from canonical.launchpad.webapp.batching import BatchNavigator
 from canonical.launchpad.webapp.interaction import get_current_principal
 from canonical.launchpad.webapp.interfaces import BrowserNotificationLevel
@@ -829,6 +834,60 @@
             check_permission('launchpad.Edit', view))
 
 
+class TestDistroSeriesInitializeViewAccess(TestCaseWithFactory):
+    """Test access to IDS.+initseries."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestDistroSeriesInitializeViewAccess,
+              self).setUp('[e-mail]')
+        set_derived_series_ui_feature_flag(self)
+
+    def test_initseries_access_anon(self):
+        # Anonymous users cannot access +initseries.
+        distroseries = self.factory.makeDistroSeries()
+        view = create_initialized_view(distroseries, "+initseries")
+        login(ANONYMOUS)
+
+        self.assertEqual(
+            False,
+            check_permission('launchpad.Edit', view))
+
+    def test_initseries_access_simpleuser(self):
+        # Unprivileged users cannot access +initseries.
+        distroseries = self.factory.makeDistroSeries()
+        view = create_initialized_view(distroseries, "+initseries")
+        login_person(self.factory.makePerson())
+
+        self.assertEqual(
+            False,
+            check_permission('launchpad.Edit', view))
+
+    def test_initseries_access_admin(self):
+        # Users with lp.Admin can access +initseries.
+        distroseries = self.factory.makeDistroSeries()
+        view = create_initialized_view(distroseries, "+initseries")
+        login_celebrity('admin')
+
+        self.assertEqual(
+            True,
+            check_permission('launchpad.Edit', view))
+
+    def test_initseries_access_driver(self):
+        # Distroseries drivers can access +initseries.
+        distroseries = self.factory.makeDistroSeries()
+        view = create_initialized_view(distroseries, "+initseries")
+        driver = self.factory.makePerson()
+        with celebrity_logged_in('admin'):
+            distroseries.driver = driver
+        login_person(driver)
+
+        self.assertEqual(
+            True,
+            check_permission('launchpad.Edit', view))
+
+
 class DistroSeriesDifferenceMixin:
     """A helper class for testing differences pages"""
 
 
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2011-07-07 20:07:51 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2011-07-18 11:13:26 +0000
@@ -1075,6 +1075,7 @@
         released == None will do no filtering on status.
         """
 
+<<<<<<< TREE
     def priorReleasedSeries(self, distribution, prior_to_date):
         """Find distroseries for the supplied distro  released before a
         certain date.
@@ -1089,6 +1090,10 @@
 
 
 @error_status(httplib.BAD_REQUEST)
+=======
+
+@error_status(httplib.BAD_REQUEST)
+>>>>>>> MERGE-SOURCE
 class DerivationError(Exception):
     """Raised when there is a problem deriving a distroseries."""
     _message_prefix = "Error deriving distro series"
 
=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2011-07-14 14:08:04 +0000
+++ lib/lp/registry/model/distribution.py	2011-07-18 11:13:26 +0000
@@ -655,6 +655,7 @@
         """See `IBugTarget`."""
         return get_bug_tags("BugTask.distribution = %s" % sqlvalues(self))
 
+<<<<<<< TREE
     def getBranchTips(self, since=None):
         """See `IDistribution`."""
         query = """
@@ -684,6 +685,17 @@
             # to the end of the current record, removing Nones from the list.
             result[-1].append(filter(None, map(itemgetter(-1), group)))
         return result
+=======
+    def getUsedBugTagsWithOpenCounts(self, user, tag_limit=0,
+                                     include_tags=None):
+        """See IBugTarget."""
+        # Circular fail.
+        from lp.bugs.model.bugsummary import BugSummary
+        return get_bug_tags_open_count(
+            And(BugSummary.distribution_id == self.id,
+                BugSummary.sourcepackagename_id == None),
+            user, tag_limit=tag_limit, include_tags=include_tags)
+>>>>>>> MERGE-SOURCE
 
     def getMirrorByName(self, name):
         """See `IDistribution`."""
@@ -1414,6 +1426,7 @@
             # Note that in the source package case, we don't restrict
             # the search to the distribution release, making a best
             # effort to find a package.
+<<<<<<< TREE
             publishing = IStore(SourcePackagePublishingHistory).find(
                 SourcePackagePublishingHistory,
                 # We use an extra query to get the IDs instead of an
@@ -1431,6 +1444,20 @@
                      PackagePublishingStatus.PENDING)
                     )).order_by(
                         Desc(SourcePackagePublishingHistory.id)).first()
+=======
+            publishing = IStore(SourcePackagePublishingHistory).find(
+                SourcePackagePublishingHistory,
+                SourcePackagePublishingHistory.archiveID.is_in(
+                    self.all_distro_archive_ids),
+                SourcePackagePublishingHistory.sourcepackagereleaseID ==
+                    SourcePackageRelease.id,
+                SourcePackageRelease.sourcepackagename == sourcepackagename,
+                SourcePackagePublishingHistory.status.is_in(
+                    (PackagePublishingStatus.PUBLISHED,
+                     PackagePublishingStatus.PENDING)
+                    )).order_by(
+                        Desc(SourcePackagePublishingHistory.id)).first()
+>>>>>>> MERGE-SOURCE
             if publishing is not None:
                 return sourcepackagename
 
@@ -1453,6 +1480,7 @@
             # the sourcepackagename from that.
             bpph = IStore(BinaryPackagePublishingHistory).find(
                 BinaryPackagePublishingHistory,
+<<<<<<< TREE
                 # See comment above for rationale for using an extra query
                 # instead of an inner join. (Bottom line, it would time out
                 # otherwise.)
@@ -1460,6 +1488,12 @@
                     self.all_distro_archive_ids),
                 BinaryPackagePublishingHistory.binarypackagereleaseID ==
                     BinaryPackageRelease.id,
+=======
+                BinaryPackagePublishingHistory.archiveID.is_in(
+                    self.all_distro_archive_ids),
+                BinaryPackagePublishingHistory.binarypackagereleaseID ==
+                    BinaryPackageRelease.id,
+>>>>>>> MERGE-SOURCE
                 BinaryPackageRelease.binarypackagename == binarypackagename,
                 BinaryPackagePublishingHistory.dateremoved == None,
                 ).order_by(
 
=== modified file 'lib/lp/registry/model/product.py'
--- lib/lp/registry/model/product.py	2011-06-21 01:34:08 +0000
+++ lib/lp/registry/model/product.py	2011-07-18 11:13:26 +0000
@@ -800,6 +800,18 @@
         """See `IBugTarget`."""
         return get_bug_tags("BugTask.product = %s" % sqlvalues(self))
 
+<<<<<<< TREE
+=======
+    def getUsedBugTagsWithOpenCounts(self, user, tag_limit=0,
+                                     include_tags=None):
+        """See IBugTarget."""
+        # Circular fail.
+        from lp.bugs.model.bugsummary import BugSummary
+        return get_bug_tags_open_count(
+            BugSummary.product_id == self.id,
+            user, tag_limit=tag_limit, include_tags=include_tags)
+
+>>>>>>> MERGE-SOURCE
     series = SQLMultipleJoin('ProductSeries', joinColumn='product',
         orderBy='name')
 
 
=== modified file 'lib/lp/soyuz/browser/queue.py'
--- lib/lp/soyuz/browser/queue.py	2011-06-29 07:25:18 +0000
+++ lib/lp/soyuz/browser/queue.py	2011-07-18 11:13:26 +0000
@@ -46,6 +46,7 @@
     QueueInconsistentStateError,
     )
 from lp.soyuz.interfaces.section import ISectionSet
+from lp.soyuz.model.queue import PackageUploadSource
 
 
 QUEUE_SIZE = 30
@@ -197,10 +198,16 @@
         CompletePackageUpload.  This avoids many additional SQL queries
         in the +queue template.
         """
+<<<<<<< TREE
         # Avoid circular imports.
         from lp.soyuz.model.queue import PackageUploadSource
         from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
 
+=======
+        # Avoid circular imports.
+        from lp.soyuz.model.sourcepackagerelease import SourcePackageRelease
+
+>>>>>>> MERGE-SOURCE
         uploads = list(self.batchnav.currentBatch())
 
         if len(uploads) == 0:
@@ -214,9 +221,14 @@
                     upload.status != PackageUploadStatus.DONE)]
         binary_file_set = getUtility(IBinaryPackageFileSet)
         binary_files = binary_file_set.getByPackageUploadIDs(upload_ids)
+<<<<<<< TREE
         binary_file_set.loadLibraryFiles(binary_files)
         packageuploadsources = load_referencing(
             PackageUploadSource, uploads, ['packageuploadID'])
+=======
+        packageuploadsources = load_referencing(
+            PackageUploadSource, uploads, ['packageuploadID'])
+>>>>>>> MERGE-SOURCE
         source_file_set = getUtility(ISourcePackageReleaseFileSet)
         source_files = source_file_set.getByPackageUploadIDs(upload_ids)
 
@@ -490,6 +502,12 @@
         else:
             self.package_sets = []
 
+        if self.contains_source:
+            self.package_sets = package_sets.get(
+                self.sourcepackagerelease.sourcepackagenameID, [])
+        else:
+            self.package_sets = []
+
     @property
     def pending_delayed_copy(self):
         """Whether the context is a delayed-copy pending processing."""
@@ -509,6 +527,7 @@
         return self.context.changesfile
 
     @property
+<<<<<<< TREE
     def display_package_sets(self):
         """Package sets, if any, for display on the +queue page."""
         return ' '.join(sorted(
@@ -592,3 +611,89 @@
               (%s)
             </div>
             """ % (iconlist_id, '\n'.join(icons), link, self.displayarchs)
+=======
+    def display_package_sets(self):
+        """Package sets, if any, for display on the +queue page."""
+        if self.contains_source:
+            return ' '.join(sorted(
+                packageset.name for packageset in self.package_sets))
+        else:
+            return ""
+
+    @property
+    def display_component(self):
+        """Component name, if any, for display on the +queue page."""
+        if self.contains_source:
+            return self.component_name.lower()
+        else:
+            return ""
+
+    @property
+    def display_section(self):
+        """Section name, if any, for display on the +queue page."""
+        if self.contains_source:
+            return self.section_name.lower()
+        else:
+            return ""
+
+    @property
+    def display_priority(self):
+        """Priority name, if any, for display on the +queue page."""
+        if self.contains_source:
+            return self.sourcepackagerelease.urgency.name.lower()
+        else:
+            return ""
+
+    def composeIcon(self, alt, icon, title=None):
+        """Compose an icon for the package's icon list."""
+        # These should really be sprites!
+        if title is None:
+            title = alt
+        return '<img alt="[%s]" src="/@@/%s" title="%s" />' % (
+            cgi.escape(alt, quote=True),
+            icon,
+            cgi.escape(title, quote=True),
+            )
+
+    def composeIconList(self):
+        """List icons that should be shown for this upload."""
+        ddtp = "Debian Description Translation Project Indexes"
+        potential_icons = [
+            (self.contains_source, ("Source", 'package-source')),
+            (self.contains_build, ("Build", 'package-binary', "Binary")),
+            (self.contains_translation, ("Translation", 'translation-file')),
+            (self.contains_installer, ("Installer", 'ubuntu-icon')),
+            (self.contains_upgrader, ("Upgrader", 'ubuntu-icon')),
+            (self.contains_ddtp, (ddtp, 'ubuntu-icon')),
+            ]
+        return [
+            self.composeIcon(*details)
+            for condition, details in potential_icons
+                if condition]
+
+    def composeNameAndChangesLink(self):
+        """Compose HTML: upload name and link to changes file."""
+        raw_displayname = self.displayname
+        displayname = cgi.escape(raw_displayname)
+        if self.pending_delayed_copy or self.changesfile is None:
+            return displayname
+        else:
+            return '<a href="%s" title="Changes file for %s">%s</a>' % (
+                self.changesfile.http_url,
+                cgi.escape(self.displayname, quote=True),
+                displayname)
+
+    @property
+    def icons_and_name(self):
+        """Icon list and name, linked to changes file if appropriate."""
+        iconlist_id = "queue%d-iconlist" % self.id
+        icons = self.composeIconList()
+        link = self.composeNameAndChangesLink()
+        return """
+            <div id="%s">
+              %s
+              %s
+              (%s)
+            </div>
+            """ % (iconlist_id, '\n'.join(icons), link, self.displayarchs)
+>>>>>>> MERGE-SOURCE
 
=== modified file 'lib/lp/soyuz/browser/tests/test_queue.py'
--- lib/lp/soyuz/browser/tests/test_queue.py	2011-06-23 13:05:52 +0000
+++ lib/lp/soyuz/browser/tests/test_queue.py	2011-07-18 11:13:26 +0000
@@ -234,6 +234,7 @@
             upload.distroseries.main_archive)
         with person_logged_in(queue_admin):
             view = self.makeView(upload.distroseries, queue_admin)
+<<<<<<< TREE
             html_text = view()
         self.assertIn(upload.package_name, html_text)
 
@@ -414,3 +415,168 @@
         self.assertNotEqual(None, icons_and_name.find("a"))
         self.assertIn(
             complete_upload.displayarchs, ' '.join(icons_and_name.itertext()))
+=======
+            html_text = view()
+        self.assertIn(upload.package_name, html_text)
+
+
+class TestCompletePackageUpload(TestCaseWithFactory):
+
+    layer = LaunchpadZopelessLayer
+
+    def makeCompletePackageUpload(self, upload=None, build_upload_files=None,
+                                  source_upload_files=None,
+                                  package_sets=None):
+        if upload is None:
+            upload = self.factory.makeSourcePackageUpload()
+        if build_upload_files is None:
+            build_upload_files = {}
+        if source_upload_files is None:
+            source_upload_files = {}
+        if package_sets is None:
+            package_sets = {}
+        return CompletePackageUpload(
+            upload, build_upload_files, source_upload_files, package_sets)
+
+    def mapPackageSets(self, upload, package_sets=None):
+        if package_sets is None:
+            package_sets = [self.factory.makePackageset(
+                distroseries=upload.distroseries)]
+        spn = upload.sourcepackagerelease.sourcepackagename
+        return {spn.id: package_sets}
+
+    def test_display_package_sets_returns_source_upload_packagesets(self):
+        upload = self.factory.makeSourcePackageUpload()
+        package_sets = self.mapPackageSets(upload)
+        complete_upload = self.makeCompletePackageUpload(
+            upload, package_sets=package_sets)
+        self.assertEqual(
+            package_sets.values()[0][0].name,
+            complete_upload.display_package_sets)
+
+    def test_display_package_sets_returns_empty_for_non_source_upload(self):
+        upload = self.factory.makeBuildPackageUpload()
+        complete_upload = self.makeCompletePackageUpload(
+            upload, package_sets=self.mapPackageSets(upload))
+        self.assertEqual("", complete_upload.display_package_sets)
+
+    def test_display_package_sets_sorts_by_name(self):
+        complete_upload = self.makeCompletePackageUpload()
+        distroseries = complete_upload.distroseries
+        complete_upload.package_sets = [
+            self.factory.makePackageset(distroseries=distroseries, name=name)
+            for name in [u'ccc', u'aaa', u'bbb']]
+        self.assertEqual("aaa bbb ccc", complete_upload.display_package_sets)
+
+    def test_display_component_returns_source_upload_component_name(self):
+        complete_upload = self.makeCompletePackageUpload()
+        self.assertEqual(
+            complete_upload.sourcepackagerelease.component.name.lower(),
+            complete_upload.display_component)
+
+    def test_display_component_returns_empty_for_non_source_upload(self):
+        complete_upload = self.makeCompletePackageUpload(
+            self.factory.makeBuildPackageUpload())
+        self.assertEqual('', complete_upload.display_component)
+
+    def test_display_section_returns_source_upload_section_name(self):
+        complete_upload = self.makeCompletePackageUpload()
+        self.assertEqual(
+            complete_upload.sourcepackagerelease.section.name.lower(),
+            complete_upload.display_section)
+
+    def test_display_section_returns_empty_for_non_source_upload(self):
+        complete_upload = self.makeCompletePackageUpload(
+            self.factory.makeBuildPackageUpload())
+        self.assertEqual('', complete_upload.display_section)
+
+    def test_display_priority_returns_source_upload_priority(self):
+        complete_upload = self.makeCompletePackageUpload()
+        self.assertEqual(
+            complete_upload.sourcepackagerelease.urgency.name.lower(),
+            complete_upload.display_priority)
+
+    def test_display_priority_returns_empty_for_non_source_upload(self):
+        complete_upload = self.makeCompletePackageUpload(
+            self.factory.makeBuildPackageUpload())
+        self.assertEqual('', complete_upload.display_priority)
+
+    def test_composeIcon_produces_image_tag(self):
+        alt = self.factory.getUniqueString()
+        icon = self.factory.getUniqueString() + ".png"
+        title = self.factory.getUniqueString()
+        html_text = self.makeCompletePackageUpload().composeIcon(
+            alt, icon, title)
+        img = html.fromstring(html_text)
+        self.assertEqual("img", img.tag)
+        self.assertEqual("[%s]" % alt, img.get("alt"))
+        self.assertEqual("/@@/" + icon, img.get("src"))
+        self.assertEqual(title, img.get("title"))
+
+    def test_composeIcon_title_defaults_to_alt_text(self):
+        alt = self.factory.getUniqueString()
+        icon = self.factory.getUniqueString() + ".png"
+        html_text = self.makeCompletePackageUpload().composeIcon(alt, icon)
+        img = html.fromstring(html_text)
+        self.assertEqual(alt, img.get("title"))
+
+    def test_composeIcon_escapes_alt_and_title(self):
+        alt = 'alt"&'
+        icon = self.factory.getUniqueString() + ".png"
+        title = 'title"&'
+        html_text = self.makeCompletePackageUpload().composeIcon(
+            alt, icon, title)
+        img = html.fromstring(html_text)
+        self.assertEqual("[%s]" % alt, img.get("alt"))
+        self.assertEqual(title, img.get("title"))
+
+    def test_composeIconList_produces_icons(self):
+        icons = self.makeCompletePackageUpload().composeIconList()
+        self.assertNotEqual([], icons)
+        self.assertEqual('img', html.fromstring(icons[0]).tag)
+
+    def test_composeIconList_produces_icons_conditionally(self):
+        complete_upload = self.makeCompletePackageUpload()
+        base_count = len(complete_upload.composeIconList())
+        complete_upload.contains_build = True
+        new_count = len(complete_upload.composeIconList())
+        self.assertEqual(base_count + 1, new_count)
+
+    def test_composeNameAndChangesLink_does_not_link_if_no_changes_file(self):
+        upload = self.factory.makeCopyJobPackageUpload()
+        complete_upload = self.makeCompletePackageUpload(upload)
+        self.assertEqual(
+            complete_upload.displayname,
+            complete_upload.composeNameAndChangesLink())
+
+    def test_composeNameAndChangesLink_links_to_changes_file(self):
+        complete_upload = self.makeCompletePackageUpload()
+        link = html.fromstring(complete_upload.composeNameAndChangesLink())
+        self.assertEqual(
+            complete_upload.changesfile.http_url, link.get("href"))
+
+    def test_composeNameAndChangesLink_escapes_nonlinked_display_name(self):
+        filename = 'name"&name'
+        upload = self.factory.makeCustomPackageUpload(filename=filename)
+        # Stop nameAndChangesLink from producing a link.
+        upload.changesfile = None
+        complete_upload = self.makeCompletePackageUpload(upload)
+        self.assertIn(
+            cgi.escape(filename), complete_upload.composeNameAndChangesLink())
+
+    def test_composeNameAndChangesLink_escapes_name_in_link(self):
+        filename = 'name"&name'
+        upload = self.factory.makeCustomPackageUpload(filename=filename)
+        complete_upload = self.makeCompletePackageUpload(upload)
+        link = html.fromstring(complete_upload.composeNameAndChangesLink())
+        self.assertIn(filename, link.get("title"))
+        self.assertEqual(filename, link.text)
+
+    def test_icons_and_name_composes_icons_and_link_and_archs(self):
+        complete_upload = self.makeCompletePackageUpload()
+        icons_and_name = html.fromstring(complete_upload.icons_and_name)
+        self.assertNotEqual(None, icons_and_name.find("img"))
+        self.assertNotEqual(None, icons_and_name.find("a"))
+        self.assertIn(
+            complete_upload.displayarchs, ' '.join(icons_and_name.itertext()))
+>>>>>>> MERGE-SOURCE
 
=== modified file 'lib/lp/soyuz/interfaces/archive.py'
--- lib/lp/soyuz/interfaces/archive.py	2011-06-24 21:21:36 +0000
+++ lib/lp/soyuz/interfaces/archive.py	2011-07-18 11:13:26 +0000
@@ -101,9 +101,16 @@
 from lp.soyuz.enums import ArchivePurpose
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.component import IComponent
-
-
-@error_status(httplib.BAD_REQUEST)
+<<<<<<< TREE
+
+
+@error_status(httplib.BAD_REQUEST)
+=======
+from lp.soyuz.interfaces.processor import IProcessorFamily
+
+
+@error_status(httplib.BAD_REQUEST)
+>>>>>>> MERGE-SOURCE
 class ArchiveDependencyError(Exception):
     """Raised when an `IArchiveDependency` does not fit the context archive.
 
 
=== modified file 'lib/lp/soyuz/interfaces/files.py'
--- lib/lp/soyuz/interfaces/files.py	2011-06-29 11:40:03 +0000
+++ lib/lp/soyuz/interfaces/files.py	2011-07-18 11:13:26 +0000
@@ -22,8 +22,12 @@
     )
 
 from canonical.launchpad import _
+<<<<<<< TREE
 from canonical.launchpad.interfaces.librarian import ILibraryFileAlias
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
+=======
+from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
+>>>>>>> MERGE-SOURCE
 
 
 class IBinaryPackageFile(Interface):
 
=== modified file 'lib/lp/soyuz/model/packagesetsources.py'
--- lib/lp/soyuz/model/packagesetsources.py	2011-07-01 15:53:38 +0000
+++ lib/lp/soyuz/model/packagesetsources.py	2011-07-18 11:13:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Copyright 2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
@@ -43,3 +44,46 @@
     def __init__(self, packageset, sourcepackagename):
         self.packageset = packageset
         self.sourcepackagename = sourcepackagename
+=======
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""The `PackagesetSources` linking table.
+
+This table associates `Packageset`s with `SourcePackageName`s.
+"""
+
+__metaclass__ = type
+__all__ = [
+    'PackagesetSources',
+    ]
+
+from storm.locals import (
+    Int,
+    Reference,
+    Storm,
+    )
+
+
+class PackagesetSources(Storm):
+    """Linking table: which packages are in a package set?"""
+    # This table is largely managed from Packageset, but also directly
+    # accessed from other places.
+
+    __storm_table__ = 'PackagesetSources'
+
+    # There's a vestigial id as well, a holdover from the SQLObject
+    # days.  Nobody seems to use it.  The only key that matters is
+    # (packageset, sourcepackagename).
+    # XXX JeroenVermeulen 2011-06-22, bug=800677: Drop the id column.
+    __storm_primary__ = (
+        'packageset_id',
+        'sourcepackagename_id',
+        )
+
+    packageset_id = Int(name='packageset')
+    packageset = Reference(packageset_id, 'Packageset.id')
+    sourcepackagename_id = Int(name='sourcepackagename')
+    sourcepackagename = Reference(
+        sourcepackagename_id, 'SourcePackageName.id')
+>>>>>>> MERGE-SOURCE
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_queue.py'
--- lib/lp/soyuz/scripts/tests/test_queue.py	2011-07-07 16:05:03 +0000
+++ lib/lp/soyuz/scripts/tests/test_queue.py	2011-07-18 11:13:26 +0000
@@ -966,6 +966,7 @@
             distro.name, distroseries.name, queue, terms, component.name,
             section.name, priority_name, display)
 
+<<<<<<< TREE
     def makeQueueActionOverride(self, package_upload, component, section,
                                 distroseries=None):
         return self.makeQueueAction(
@@ -980,6 +981,16 @@
         """
         return tuple(item.strip() for item in output_line.split('|'))
 
+=======
+    def parseUploadSummaryLine(self, output_line):
+        """Parse an output line from `QueueAction.displayItem`.
+
+        :param output_line: A line of output text from `displayItem`.
+        :return: A tuple of displayed items: (id, tag, name, version, age).
+        """
+        return tuple(item.strip() for item in output_line.split('|'))
+
+>>>>>>> MERGE-SOURCE
     def test_display_actions_have_privileges_for_PackageCopyJob(self):
         # The methods that display uploads have privileges to work with
         # a PackageUpload that has a copy job.
@@ -1031,6 +1042,7 @@
         action = self.makeQueueAction(upload)
 
         action.displayItem(upload)
+<<<<<<< TREE
 
         ((output, ), kwargs) = action.display.calls[0]
         (upload_id, tag, name, version, age) = self.parseUploadSummaryLine(
@@ -1085,6 +1097,37 @@
     def test_makeTag_returns_dashes_for_custom_upload(self):
         upload = self.factory.makeCustomPackageUpload()
         self.assertEqual('--', self.makeQueueAction(upload)._makeTag(upload))
+=======
+
+        ((output, ), kwargs) = action.display.calls[0]
+        (upload_id, tag, name, version, age) = self.parseUploadSummaryLine(
+            output)
+        self.assertEqual(str(upload.id), upload_id)
+        self.assertEqual("X-", tag)
+        self.assertThat(upload.displayname, StartsWith(name))
+        self.assertThat(upload.package_version, StartsWith(version))
+
+    def test_makeTag_returns_S_for_source_upload(self):
+        upload = self.factory.makeSourcePackageUpload()
+        self.assertEqual('S-', self.makeQueueAction(upload)._makeTag(upload))
+
+    def test_makeTag_returns_B_for_binary_upload(self):
+        upload = self.factory.makeBuildPackageUpload()
+        self.assertEqual('-B', self.makeQueueAction(upload)._makeTag(upload))
+
+    def test_makeTag_returns_SB_for_mixed_upload(self):
+        upload = self.factory.makeSourcePackageUpload()
+        upload.addBuild(self.factory.makeBinaryPackageBuild())
+        self.assertEqual('SB', self.makeQueueAction(upload)._makeTag(upload))
+
+    def test_makeTag_returns_X_for_copy_job_upload(self):
+        upload = self.factory.makeCopyJobPackageUpload()
+        self.assertEqual('X-', self.makeQueueAction(upload)._makeTag(upload))
+
+    def test_makeTag_returns_dashes_for_custom_upload(self):
+        upload = self.factory.makeCustomPackageUpload()
+        self.assertEqual('--', self.makeQueueAction(upload)._makeTag(upload))
+>>>>>>> MERGE-SOURCE
 
     def test_displayInfo_displays_PackageUpload_with_source(self):
         # displayInfo can display a source package upload.
 
=== modified file 'lib/lp/soyuz/stories/webservice/xx-archive.txt'
--- lib/lp/soyuz/stories/webservice/xx-archive.txt	2011-06-23 16:05:30 +0000
+++ lib/lp/soyuz/stories/webservice/xx-archive.txt	2011-07-18 11:13:26 +0000
@@ -17,6 +17,7 @@
     >>> from lazr.restful.testing.webservice import pprint_entry
     >>> pprint_entry(cprov_archive)
     commercial: False
+<<<<<<< TREE
     dependencies_collection_link:
         u'http://.../~cprov/+archive/ppa/dependencies'
     description: u'packages to help my friends.'
@@ -38,6 +39,10 @@
     >>> pprint_entry(cprov_archive_devel)
     commercial: False
     dependencies_collection_link: u'http://.../~cprov/+archive/ppa/dependencies'
+=======
+    dependencies_collection_link:
+        u'http://.../~cprov/+archive/ppa/dependencies'
+>>>>>>> MERGE-SOURCE
     description: u'packages to help my friends.'
     displayname: u'PPA for Celso Providelo'
     distribution_link: u'http://.../ubuntu'
 
=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2011-07-11 08:31:46 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2011-07-18 11:13:26 +0000
@@ -816,6 +816,7 @@
             [upload],
             upload_set.getAll(
                 distroseries, name=spn.name, version=upload.displayversion))
+<<<<<<< TREE
 
     def test_getAll_orders_in_reverse_historical_order(self):
         # The results from getAll are returned in order of creation,
@@ -838,3 +839,5 @@
         self.assertEqual(
             list(reversed(ordered_uploads)),
             list(getUtility(IPackageUploadSet).getAll(series)))
+=======
+>>>>>>> MERGE-SOURCE
 
=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2011-07-13 20:55:34 +0000
+++ lib/lp/testing/factory.py	2011-07-18 11:13:26 +0000
@@ -474,7 +474,7 @@
             branch_id = self.getUniqueInteger()
         if rcstype is None:
             rcstype = 'svn'
-        if rcstype in ['svn', 'bzr-svn', 'hg']:
+        if rcstype in ['svn', 'bzr-svn', 'hg', 'bzr']:
             assert cvs_root is cvs_module is None
             if url is None:
                 url = self.getUniqueURL()
@@ -2100,7 +2100,8 @@
 
     def makeCodeImport(self, svn_branch_url=None, cvs_root=None,
                        cvs_module=None, target=None, branch_name=None,
-                       git_repo_url=None, hg_repo_url=None, registrant=None,
+                       git_repo_url=None, hg_repo_url=None,
+                       bzr_branch_url=None, registrant=None,
                        rcs_type=None, review_status=None):
         """Create and return a new, arbitrary code import.
 
@@ -2109,7 +2110,7 @@
         unique URL.
         """
         if (svn_branch_url is cvs_root is cvs_module is git_repo_url is
-            hg_repo_url is None):
+            hg_repo_url is bzr_branch_url is None):
             svn_branch_url = self.getUniqueURL()
 
         if target is None:
@@ -2140,6 +2141,11 @@
                 registrant, target, branch_name,
                 rcs_type=RevisionControlSystems.HG,
                 url=hg_repo_url)
+        elif bzr_branch_url is not None:
+            code_import = code_import_set.new(
+                registrant, target, branch_name,
+                rcs_type=RevisionControlSystems.BZR,
+                url=bzr_branch_url)
         else:
             assert rcs_type in (None, RevisionControlSystems.CVS)
             code_import = code_import_set.new(
@@ -3485,6 +3491,7 @@
                     distribution=distribution)
 
         if archive is None:
+<<<<<<< TREE
             archive = distroseries.main_archive
 
         if (sourcepackagename is None or
@@ -3494,6 +3501,19 @@
 
         if (component is None or isinstance(component, basestring)):
             component = self.makeComponent(component)
+=======
+            archive = self.makeArchive(
+                distribution=distroseries.distribution,
+                purpose=ArchivePurpose.PRIMARY)
+
+        if (sourcepackagename is None or
+            isinstance(sourcepackagename, basestring)):
+            sourcepackagename = self.getOrMakeSourcePackageName(
+                sourcepackagename)
+
+        if component is None:
+            component = self.makeComponent()
+>>>>>>> MERGE-SOURCE
 
         if urgency is None:
             urgency = self.getAnySourcePackageUrgency()
@@ -3567,6 +3587,7 @@
         to determine archive.
         :param source_package_release: The SourcePackageRelease this binary
             build uses as its source.
+<<<<<<< TREE
         :param sourcepackagename: when source_package_release is None, the
             sourcepackagename from which the build will come.
         :param distroarchseries: The DistroArchSeries to use. Defaults to the
@@ -3574,6 +3595,12 @@
         :param archive: The Archive to use. Defaults to the one from the
             source_package_release, or the distro arch series main archive
             otherwise.
+=======
+        :param sourcepackagename: when source_package_release is None, the
+            sourcepackagename from which the build will come.
+        :param distroarchseries: The DistroArchSeries to use.
+        :param archive: The Archive to use.
+>>>>>>> MERGE-SOURCE
         :param builder: An optional builder to assign.
         :param status: The BuildStatus for the build.
         """
 
=== modified file 'scripts/code-import-worker.py'
--- scripts/code-import-worker.py	2011-06-16 23:43:04 +0000
+++ scripts/code-import-worker.py	2011-07-18 11:13:26 +0000
@@ -26,8 +26,9 @@
 from canonical.config import config
 from lp.codehosting import load_optional_plugin
 from lp.codehosting.codeimport.worker import (
-    BzrSvnImportWorker, CSCVSImportWorker, CodeImportSourceDetails,
-    GitImportWorker, HgImportWorker, get_default_bazaar_branch_store)
+    BzrImportWorker, BzrSvnImportWorker, CSCVSImportWorker,
+    CodeImportSourceDetails, GitImportWorker, HgImportWorker,
+    get_default_bazaar_branch_store)
 from canonical.launchpad import scripts
 
 
@@ -65,8 +66,17 @@
         elif source_details.rcstype == 'hg':
             load_optional_plugin('hg')
             import_worker_cls = HgImportWorker
-        elif source_details.rcstype in ['cvs', 'svn']:
-            import_worker_cls = CSCVSImportWorker
+<<<<<<< TREE
+        elif source_details.rcstype in ['cvs', 'svn']:
+            import_worker_cls = CSCVSImportWorker
+=======
+        elif source_details.rcstype == 'bzr':
+            load_optional_plugin('loom')
+            load_optional_plugin('weave_fmt')
+            import_worker_cls = BzrImportWorker
+        elif source_details.rcstype in ['cvs', 'svn']:
+            import_worker_cls = CSCVSImportWorker
+>>>>>>> MERGE-SOURCE
         else:
             raise AssertionError(
                 'unknown rcstype %r' % source_details.rcstype)
 
=== modified file 'utilities/sourcedeps.cache'
--- utilities/sourcedeps.cache	2011-06-29 14:14:20 +0000
+++ utilities/sourcedeps.cache	2011-07-18 11:13:26 +0000
@@ -1,8 +1,4 @@
 {
-    "bzr-builder": [
-        68, 
-        "[e-mail]-20101123183213-777lz46xgagn1deg"
-    ], 
     "testresources": [
         16, 
         "[e-mail]-20050911111209-ee5da49011cf936a"
@@ -31,14 +27,18 @@
         24, 
         "[e-mail]-20100601182722-wo7h2fh0fvyw3aaq"
     ], 
-    "lpreview": [
-        23, 
-        "[e-mail]-20090720061538-euyh68ifavhy0pi8"
-    ], 
     "bzr-git": [
         259, 
         "[e-mail]-20110601140035-gl5merbechngjw5s"
     ], 
+    "loggerhead": [
+        445, 
+        "[e-mail]-20110325141442-536j4be3x0c464zy"
+    ], 
+    "bzr-builder": [
+        68, 
+        "[e-mail]-20101123183213-777lz46xgagn1deg"
+    ], 
     "bzr-loom": [
         49, 
         "[e-mail]-20110601122412-54vo3k8yae9i2zve"
@@ -47,9 +47,15 @@
         4, 
         "sinzui-20090526164636-1swugzupwvjgomo4"
     ], 
+<<<<<<< TREE
     "loggerhead": [
         452, 
         "[e-mail]-20110628173100-owrifrnckvoi60af"
+=======
+    "lpreview": [
+        23, 
+        "[e-mail]-20090720061538-euyh68ifavhy0pi8"
+>>>>>>> MERGE-SOURCE
     ], 
     "difftacular": [
         6, 
 
=== modified file 'versions.cfg'
--- versions.cfg	2011-07-18 11:13:00 +0000
+++ versions.cfg	2011-07-18 11:13:26 +0000
@@ -78,8 +78,12 @@
 soupmatchers = 0.1r53
 sourcecodegen = 0.6.9
 storm = 0.18.0.99-lpwithnodatetime-r393
+<<<<<<< TREE
 testresources = 0.2.4-r58
 testtools = 0.9.12-r194
+=======
+testtools = 0.9.11
+>>>>>>> MERGE-SOURCE
 transaction = 1.0.0
 txamqp = 0.4
 Twisted = 11.0.0