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

[Jelmer Vernooij]

[r=benji][bug=352124,352131,419524,611837] Make it possible to create new Bazaar code imports in the code import UI, disable the ability to create mirror branches.

Make it possible to create new Bazaar code imports in the code import UI, disable the ability to create mirror branches.

This removes the user-visible distinction in the web UI between code imports (syncing from remote non-bzr branches) and mirrors (syncing from remote bzr branches), which should make the UI a bit easier to comprehend.

This doesn't migrate any of the existing mirror branches to be code imports, but that would be the next logical step.

It also doesn't remove the ability to create old-style mirrors via the XML/RPC API used by the "bzr register-branch" command in bzr.

[Michael Hudson-Doyle (mwhudson)]

+ bzr_branch_url = URIField(
...
+ allow_query=False, # Query makes no sense in Mercurial

:-)

Otherwise, well it looks fine. It's great to see so much code being deleted. I don't have the time to do a line by line review, and I don't have the Launchpad dev environment set up on my new laptop so I can't play around with it. I worry that there are probably more places that implicitly assume import branches are foreign in some way, but maybe not (also approximately noone uses mirror branches any more aiui).

It would be SO GREAT if we could get rid of the puller after this. I think this requires having some kind of token mechanism that grants the holder of the token the ability to read and write to a particular branch (and read any stacked on branches I guess) via the usual codehosting access. But that can wait :)

[Brad Crittenden (bac)]

Hi Jelmer,

Thanks for trying to clean up this UI. It has always been a bit of a mess. I think your simplifications are good.

Twice in browser/codeimport.py we have a list of valid RCS types. It would be nice to define those one place rather than using the same set of literals twice such as:

@@ -576,7 +592,8 @@
151 elif self.code_import.rcs_type in (RevisionControlSystems.SVN,
152 RevisionControlSystems.BZR_SVN,
153 RevisionControlSystems.GIT,
154 - RevisionControlSystems.HG):
155 + RevisionControlSystems.HG,
156 + RevisionControlSystems.BZR):

As with all UI changes, screenshot of before and after as well as clear instructions on how to exercise the changes makes for speedier review.

review: Approve

[Michael Hudson-Doyle (mwhudson)]

Another direction the UI could go of course would be to not overly
distinguish between the various import types and just let the foreign
branch plugins figure it all out. This feels like it would make for a
simpler user experience, but it would also certainly be a big change. I
wonder if it might seem a bit too magical?

Cheers,
mwh

[Jelmer Vernooij (jelmer)]

On 26/06/11 23:26, Michael Hudson-Doyle wrote:
> Another direction the UI could go of course would be to not overly
> distinguish between the various import types and just let the foreign
> branch plugins figure it all out. This feels like it would make for a
> simpler user experience, but it would also certainly be a big change. I
> wonder if it might seem a bit too magical?
That's an interesting idea. "bzr branch" has that magic to figure out
what format the source branch is in too, and it seems to work fine
there. One way to do this would be to add a "AUTO" value to
RevisionControlSystems that simply tries the probers registered for each
of the CodeImportWorkers. That would (I think) be a minimal amount of
work, though it would of course only work for those importers that
actually have probers (BZR, BZR_SVN, GIT, HG).

CVS would still need to be special, but I guess there's no way around
that anyway, as it requires a root and a module to be specified.

Cheers,

Jelmer

[Robert Collins (lifeless)]

On Mon, Jun 27, 2011 at 11:04 AM, Jelmer Vernooij <email address hidden> wrote:
> CVS would still need to be special, but I guess there's no way around
> that anyway, as it requires a root and a module to be specified.

see config-manager for a url format for cvs that includes the root and module.

[Michael Hudson-Doyle (mwhudson)]

On Mon, 27 Jun 2011 00:01:14 +0200, Jelmer Vernooij <email address hidden> wrote:
> On 26/06/11 23:26, Michael Hudson-Doyle wrote:
> > Another direction the UI could go of course would be to not overly
> > distinguish between the various import types and just let the foreign
> > branch plugins figure it all out. This feels like it would make for a
> > simpler user experience, but it would also certainly be a big change. I
> > wonder if it might seem a bit too magical?
> That's an interesting idea. "bzr branch" has that magic to figure out
> what format the source branch is in too, and it seems to work fine
> there. One way to do this would be to add a "AUTO" value to
> RevisionControlSystems that simply tries the probers registered for each
> of the CodeImportWorkers. That would (I think) be a minimal amount of
> work, though it would of course only work for those importers that
> actually have probers (BZR, BZR_SVN, GIT, HG).

Yeah, that would be pretty neat, although presenting bzr/svn/git/hg/auto
to the user wouldn't really be progress :)

> CVS would still need to be special, but I guess there's no way around
> that anyway, as it requires a root and a module to be specified.

Apparently config-manager defines a URL format for CVS we could borrow.
But that would be more useful for cleaning up the internals, I don't
think we could get away with expecting the user to know about it.

Cheers,
mwh

[Jelmer Vernooij (jelmer)]

Hi Brad,

On 24/06/11 20:15, Brad Crittenden wrote:
> Thanks for trying to clean up this UI. It has always been a bit of a mess. I think your simplifications are good.
>
> Twice in browser/codeimport.py we have a list of valid RCS types. It would be nice to define those one place rather than using the same set of literals twice such as:
>
> @@ -576,7 +592,8 @@
> 151 elif self.code_import.rcs_type in (RevisionControlSystems.SVN,
> 152 RevisionControlSystems.BZR_SVN,
> 153 RevisionControlSystems.GIT,
> 154 - RevisionControlSystems.HG):
> 155 + RevisionControlSystems.HG,
> 156 + RevisionControlSystems.BZR):
Updated to use a single list.
>
>
> As with all UI changes, screenshot of before and after as well as clear instructions on how to exercise the changes makes for speedier review.
Thanks for the review! I'll make sure to include screenshots next time.

Cheers,

Jelmer

[Jelmer Vernooij (jelmer)]

On Sun, 2011-06-26 at 23:19 +0000, Robert Collins wrote:
> On Mon, Jun 27, 2011 at 11:04 AM, Jelmer Vernooij <email address hidden> wrote:
> > CVS would still need to be special, but I guess there's no way around
> > that anyway, as it requires a root and a module to be specified.
> see config-manager for a url format for cvs that includes the root and module.
Even if we do that, do we want users to have to know about that
particular format?

Cheers,

Jelmer

[Michael Hudson-Doyle (mwhudson)]

On Mon, 25 Jul 2011 13:21:44 -0000, Jelmer Vernooij <email address hidden> wrote:
> On Sun, 2011-06-26 at 23:19 +0000, Robert Collins wrote:
> > On Mon, Jun 27, 2011 at 11:04 AM, Jelmer Vernooij <email address hidden> wrote:
> > > CVS would still need to be special, but I guess there's no way around
> > > that anyway, as it requires a root and a module to be specified.
> > see config-manager for a url format for cvs that includes the root and module.
> Even if we do that, do we want users to have to know about that
> particular format?

No.

Cheers,
mwh

[Ian Booth (wallyworld)]

I like UI simplification so this is a nice change.

A few issues to fix:

1. The conflict in sourcedeps.cache

2. There's an issue on the +new-import page. When first loaded, the bzr branch url field is enabled (and the url fields for the other vcs types are disabled) implying that bzr is the default choice. However, the bzr radio button is not selected by default. Given that this happens, there's a test that should be written. In xx-create-code-import.txt, there's tests for git|mercurial|svn|cvs imports but not bzr. I think a bzr test needs to be added here.

3. Line 120, 121. The comment says "# Query makes no sense in Mercurial" but it should be bzr

4. Did you run lint? There's some lines > 78 characters plus other things like number of blank lines (some of it will be pre-existing but worth fixing as a drive-by). Normally we would like to see the lint output under the ==Lint == heading in the mp description.

5. In ProductSeriesSetBranchView._createBzrBranch, the docstring needs updating to match the new behaviour. Same with testBranchAddRequests too I think? Along similar lines, is the text at the top of xx-creating-branches.txt still 100% correct?

Dumb question 101 - this mp seems to kill the ability to create remote branches. I assume thats intended and such branches are no longer supported?

review: Needs Fixing (code*)

[Jelmer Vernooij (jelmer)]

Thanks Ian, much appreciated. I've finally found some time to update this MP and address the issues you raised.

xx-create-codeimport.txt has been updated to also test behaviour with regular bzr branches, and I've fixed the bug you mentioned.

I've fixed sourcedeps.cache and the comments about Mercurial and docstring in ProductSeriesSetBranchView._createBzrBranch. I've also enabled authenticated code imports, which are supported by bzr-{svn,hg,git} and bzr.

Removing remote branches was indeed intentional. There was an open bug about removing them, which I have linked to the branch.

"make lint" doesn't display any errors for me - how are you using it, does it need additional configuration?

[Jelmer Vernooij (jelmer)]

FWIW Bazaar code imports already work - they can be created through the API. There is a list of existing imports here:

https://code.launchpad.net/+code-imports?field.review_status=&field.review_status-empty-marker=1&field.rcs_type=BZR&field.rcs_type-empty-marker=1&submit=Submit

[Benji York (benji)]

This branch looks good to me.

Regarding the lint that Ian mentioned, here's a lint report that shows the problems:

./lib/lp/app/widgets/doc/launchpad-radio-widget.txt
       1: narrative uses a moin header.
      38: narrative uses a moin header.
./lib/lp/code/browser/codeimport.py
     361: Line exceeds 78 characters.
     270: E261 at least two spaces before inline comment
     280: E261 at least two spaces before inline comment
     361: E501 line too long (81 characters)
./lib/lp/code/stories/branches/xx-junk-branches.txt
      33: narrative exceeds 78 characters.
./lib/lp/code/stories/codeimport/xx-create-codeimport.txt
      43: source exceeds 78 characters.
./lib/lp/registry/browser/tests/productseries-setbranch-view.txt
      98: source exceeds 78 characters.
     115: source exceeds 78 characters.
     137: source exceeds 78 characters.
     144: want exceeds 78 characters.
     164: source exceeds 78 characters.
     184: source exceeds 78 characters.
     189: want exceeds 78 characters.
     203: source exceeds 78 characters.
     223: source exceeds 78 characters.
     243: source exceeds 78 characters.
     263: source exceeds 78 characters.
     283: source exceeds 78 characters.
     304: source exceeds 78 characters.
     370: want exceeds 78 characters.
     388: want exceeds 78 characters.
     408: source exceeds 78 characters.

review: Approve (code)

[Benji York (benji)]

This branch looks good to me.

Regarding the lint that Ian mentioned, here's a lint report that shows
the problems:

./lib/lp/app/widgets/doc/launchpad-radio-widget.txt
       1: narrative uses a moin header.
      38: narrative uses a moin header.
./lib/lp/code/browser/codeimport.py
     361: Line exceeds 78 characters.
     270: E261 at least two spaces before inline comment
     280: E261 at least two spaces before inline comment
     361: E501 line too long (81 characters)
./lib/lp/code/stories/branches/xx-junk-branches.txt
      33: narrative exceeds 78 characters.
./lib/lp/code/stories/codeimport/xx-create-codeimport.txt
      43: source exceeds 78 characters.
./lib/lp/registry/browser/tests/productseries-setbranch-view.txt
      98: source exceeds 78 characters.
     115: source exceeds 78 characters.
     137: source exceeds 78 characters.
     144: want exceeds 78 characters.
     164: source exceeds 78 characters.
     184: source exceeds 78 characters.
     189: want exceeds 78 characters.
     203: source exceeds 78 characters.
     223: source exceeds 78 characters.
     243: source exceeds 78 characters.
     263: source exceeds 78 characters.
     283: source exceeds 78 characters.
     304: source exceeds 78 characters.
     370: want exceeds 78 characters.
     388: want exceeds 78 characters.
     408: source exceeds 78 characters.

review: Approve (code)

=== modified file 'lib/lp/app/widgets/doc/launchpad-radio-widget.txt'
--- lib/lp/app/widgets/doc/launchpad-radio-widget.txt	2011-04-28 02:59:45 +0000
+++ lib/lp/app/widgets/doc/launchpad-radio-widget.txt	2011-10-04 14:34:53 +0000
@@ -75,9 +75,9 @@
       <td><label for="field.branch_type.2">Imported</label></td>
     </tr>
     <tr>
-      <td class="formHelp">Branches that have been converted from some
-      other revision control system into bzr and are made available through
-      Launchpad. </td>
+      <td class="formHelp">Branches that have been imported from an
+      externally hosted branch in bzr or another VCS and are made available
+      through Launchpad. </td>
     </tr>
     <tr>
       <td rowspan="2"><input class="radioType" id="field.branch_type.3"

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2011-09-13 05:23:16 +0000
+++ lib/lp/code/browser/branch.py	2011-10-04 14:34:53 +0000
@@ -641,9 +641,10 @@
                (RevisionControlSystems.SVN, RevisionControlSystems.BZR_SVN)
 
     @property
-    def svn_url_is_web(self):
-        """True if an imported branch's SVN URL is HTTP or HTTPS."""
-        # You should only be calling this if it's an SVN code import
+    def url_is_web(self):
+        """True if an imported branch's URL is HTTP or HTTPS."""
+        # You should only be calling this if it's an SVN, BZR, GIT or HG code
+        # import
         assert self.context.code_import
         url = self.context.code_import.url
         assert url
@@ -1146,15 +1147,12 @@
 
     class schema(Interface):
         use_template(
-            IBranch, include=['owner', 'name', 'url', 'lifecycle_status'])
-        branch_type = copy_field(
-            IBranch['branch_type'], vocabulary=UICreatableBranchType)
+            IBranch, include=['owner', 'name', 'lifecycle_status'])
 
     for_input = True
-    field_names = ['owner', 'name', 'branch_type', 'url', 'lifecycle_status']
+    field_names = ['owner', 'name', 'lifecycle_status']
 
     branch = None
-    custom_widget('branch_type', LaunchpadRadioWidgetWithDescription)
     custom_widget('lifecycle_status', LaunchpadRadioWidgetWithDescription)
 
     initial_focus_widget = 'name'
@@ -1183,27 +1181,17 @@
         """
         return IPerson(self.context, self.user)
 
-    def showOptionalMarker(self, field_name):
-        """Don't show the optional marker for url."""
-        if field_name == 'url':
-            return False
-        else:
-            return LaunchpadFormView.showOptionalMarker(self, field_name)
-
     @action('Register Branch', name='add')
     def add_action(self, action, data):
         """Handle a request to create a new branch for this product."""
         try:
-            ui_branch_type = data['branch_type']
             namespace = self.target.getNamespace(data['owner'])
             self.branch = namespace.createBranch(
-                branch_type=BranchType.items[ui_branch_type.name],
+                branch_type=BranchType.HOSTED,
                 name=data['name'],
                 registrant=self.user,
-                url=data.get('url'),
+                url=None,
                 lifecycle_status=data['lifecycle_status'])
-            if self.branch.branch_type == BranchType.MIRRORED:
-                self.branch.requestMirror()
         except BranchCreationForbidden:
             self.addError(
                 "You are not allowed to create branches in %s." %
@@ -1221,36 +1209,6 @@
                 'owner',
                 'You are not a member of %s' % owner.displayname)
 
-        branch_type = data.get('branch_type')
-        # If branch_type failed to validate, then the rest of the method
-        # doesn't make any sense.
-        if branch_type is None:
-            return
-
-        # If the branch is a MIRRORED branch, then the url
-        # must be supplied, and if HOSTED the url must *not*
-        # be supplied.
-        url = data.get('url')
-        if branch_type == UICreatableBranchType.MIRRORED:
-            if url is None:
-                # If the url is not set due to url validation errors,
-                # there will be an error set for it.
-                error = self.getFieldError('url')
-                if not error:
-                    self.setFieldError(
-                        'url',
-                        'Branch URLs are required for Mirrored branches.')
-        elif branch_type == UICreatableBranchType.HOSTED:
-            if url is not None:
-                self.setFieldError(
-                    'url',
-                    'Branch URLs cannot be set for Hosted branches.')
-        elif branch_type == UICreatableBranchType.REMOTE:
-            # A remote location can, but doesn't have to be set.
-            pass
-        else:
-            raise AssertionError('Unknown branch type')
-
     @property
     def cancel_url(self):
         return canonical_url(self.context)

=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2011-09-26 06:30:07 +0000
+++ lib/lp/code/browser/codeimport.py	2011-10-04 14:34:53 +0000
@@ -252,7 +252,7 @@
             "The URL of the git repository.  The HEAD branch will be "
             "imported."),
         allowed_schemes=["git", "http", "https"],
-        allow_userinfo=False,  # Only anonymous access is supported.
+        allow_userinfo=True,
         allow_port=True,
         allow_query=False,
         allow_fragment=False,
@@ -264,12 +264,22 @@
             "The URL of the Mercurial repository.  The tip branch will be "
             "imported."),
         allowed_schemes=["http", "https"],
-        allow_userinfo=False,  # Only anonymous access is supported.
+        allow_userinfo=True,
         allow_port=True,
-        allow_query=False,     # Query makes no sense in Mercurial.
-        allow_fragment=False,  # Fragment makes no sense in Mercurial.
+        allow_query=False,     # Query makes no sense in Bazaar.
+        allow_fragment=False,  # Fragment makes no sense in Bazaar.
         trailing_slash=False)  # See http://launchpad.net/bugs/56357.
 
+    bzr_branch_url = URIField(
+        title=_("Branch URL"), required=False,
+        description=_("The URL of the Bazaar branch."),
+        allowed_schemes=["http", "https", "bzr"],
+        allow_userinfo=True,
+        allow_port=True,
+        allow_query=False,     # Query makes no sense in Bazaar
+        allow_fragment=False,  # Fragment makes no sense in Bazaar
+        trailing_slash=False)
+
     branch_name = copy_field(
         IBranch['name'],
         __name__='branch_name',
@@ -298,7 +308,7 @@
     def initial_values(self):
         return {
             'owner': self.user,
-            'rcs_type': RevisionControlSystems.BZR_SVN,
+            'rcs_type': RevisionControlSystems.BZR,
             'branch_name': 'trunk',
             }
 
@@ -346,9 +356,11 @@
         # display them separately in the form.
         soup = BeautifulSoup(self.widgets['rcs_type']())
         fields = soup.findAll('input')
-        [cvs_button, svn_button, git_button, hg_button, empty_marker] = [
-            field for field in fields
-            if field.get('value') in ['CVS', 'BZR_SVN', 'GIT', 'HG', '1']]
+        [cvs_button, svn_button, git_button, hg_button, bzr_button,
+            empty_marker] = [
+                field for field in fields
+                if field.get('value') in [
+                     'CVS', 'BZR_SVN', 'GIT', 'HG', 'BZR', '1']]
         cvs_button['onclick'] = 'updateWidgets()'
         svn_button['onclick'] = 'updateWidgets()'
         git_button['onclick'] = 'updateWidgets()'
@@ -358,6 +370,7 @@
         self.rcs_type_svn = str(svn_button)
         self.rcs_type_git = str(git_button)
         self.rcs_type_hg = str(hg_button)
+        self.rcs_type_bzr = str(bzr_button)
         self.rcs_type_emptymarker = str(empty_marker)
 
     def _getImportLocation(self, data):
@@ -371,6 +384,8 @@
             return None, None, data.get('git_repo_url')
         elif rcs_type == RevisionControlSystems.HG:
             return None, None, data.get('hg_repo_url')
+        elif rcs_type == RevisionControlSystems.BZR:
+            return None, None, data.get('bzr_branch_url')
         else:
             raise AssertionError(
                 'Unexpected revision control type %r.' % rcs_type)
@@ -463,6 +478,9 @@
         elif rcs_type == RevisionControlSystems.HG:
             self._validateURL(
                 data.get('hg_repo_url'), field_name='hg_repo_url')
+        elif rcs_type == RevisionControlSystems.BZR:
+            self._validateURL(
+                data.get('bzr_branch_url'), field_name='bzr_branch_url')
         else:
             raise AssertionError(
                 'Unexpected revision control type %r.' % rcs_type)
@@ -555,7 +573,8 @@
         elif self.code_import.rcs_type in (RevisionControlSystems.SVN,
                                            RevisionControlSystems.BZR_SVN,
                                            RevisionControlSystems.GIT,
-                                           RevisionControlSystems.HG):
+                                           RevisionControlSystems.HG,
+                                           RevisionControlSystems.BZR):
             self.form_fields = self.form_fields.omit(
                 'cvs_root', 'cvs_module')
         else:
@@ -590,7 +609,8 @@
         elif self.code_import.rcs_type in (RevisionControlSystems.SVN,
                                            RevisionControlSystems.BZR_SVN,
                                            RevisionControlSystems.GIT,
-                                           RevisionControlSystems.HG):
+                                           RevisionControlSystems.HG,
+                                           RevisionControlSystems.BZR):
             self._validateURL(data.get('url'), self.code_import)
         else:
             raise AssertionError('Unknown rcs_type for code import.')

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2011-08-29 07:55:48 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2011-10-04 14:34:53 +0000
@@ -191,8 +191,8 @@
             "This is a short error message.",
             branch_view.mirror_status_message)
 
-    def testBranchAddRequestsMirror(self):
-        """Registering a mirrored branch requests a mirror."""
+    def testBranchAddRequests(self):
+        """Registering a branch that requests a mirror."""
         arbitrary_person = self.factory.makePerson()
         arbitrary_product = self.factory.makeProduct()
         login_person(arbitrary_person)
@@ -200,9 +200,8 @@
             add_view = BranchAddView(arbitrary_person, self.request)
             add_view.initialize()
             data = {
-                'branch_type': BranchType.MIRRORED,
+                'branch_type': BranchType.HOSTED,
                 'name': 'some-branch',
-                'url': 'http://example.com',
                 'title': 'Branch Title',
                 'summary': '',
                 'lifecycle_status': BranchLifecycleStatus.DEVELOPMENT,
@@ -212,15 +211,6 @@
                 'product': arbitrary_product,
                 }
             add_view.add_action.success(data)
-            # Make sure that next_mirror_time is a datetime, not an sqlbuilder
-            # expression.
-            removeSecurityProxy(add_view.branch).sync()
-            now = datetime.now(pytz.timezone('UTC'))
-            self.assertNotEqual(None, add_view.branch.next_mirror_time)
-            self.assertTrue(
-                add_view.branch.next_mirror_time < now,
-                "next_mirror_time not set to UTC_NOW: %s < %s"
-                % (add_view.branch.next_mirror_time, now))
         finally:
             logout()
 

=== modified file 'lib/lp/code/enums.py'
--- lib/lp/code/enums.py	2011-08-28 07:29:11 +0000
+++ lib/lp/code/enums.py	2011-10-04 14:34:53 +0000
@@ -99,8 +99,8 @@
     IMPORTED = DBItem(3, """
         Imported
 
-        Branches that have been converted from some other revision
-        control system into bzr and are made available through Launchpad.
+        Branches that have been imported from an externally hosted
+        branch in bzr or another VCS and are made available through Launchpad.
         """)
 
     REMOTE = DBItem(4, """

=== modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt'
--- lib/lp/code/stories/branches/xx-branch-deletion.txt	2011-06-06 19:39:45 +0000
+++ lib/lp/code/stories/branches/xx-branch-deletion.txt	2011-10-04 14:34:53 +0000
@@ -22,7 +22,6 @@
     >>> browser = setupBrowser(auth="Basic [e-mail]:test")
     >>> browser.open('http://code.launchpad.dev/earthlynx')
     >>> browser.getLink("Register a branch").click()
-    >>> browser.getControl('Branch URL').value = 'http://foo.bar.com/oops'
     >>> browser.getControl('Name').value = 'to-delete'
     >>> browser.getControl('Register Branch').click()
     >>> print browser.title
@@ -60,7 +59,6 @@
 
     >>> browser.open('http://code.launchpad.dev/~alice')
     >>> browser.getLink("Register a branch").click()
-    >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Name').value = 'to-delete'
     >>> browser.getControl('Register Branch').click()
     >>> browser.getLink('Delete branch').click()

=== removed file 'lib/lp/code/stories/branches/xx-branch-url-validation.txt'
--- lib/lp/code/stories/branches/xx-branch-url-validation.txt	2010-08-23 05:06:49 +0000
+++ lib/lp/code/stories/branches/xx-branch-url-validation.txt	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-= Validating of branch URLs =
-
-First, let's define a helper to post to the Person +addbranch form.
-
-    >>> def add_branch(url):
-    ...     user_browser.open(
-    ...         'http://code.launchpad.dev/~lifeless/+addbranch')
-    ...     user_browser.getControl('Name').value = 'pyresources'
-    ...     user_browser.getControl('Branch URL').value = url
-    ...     user_browser.getControl('Register Branch').click()
-
-Try to create a branch with an invalid URL.
-
-    >>> add_branch('example.com/~lifeless/pyresources/')
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    "example.com/~lifeless/pyresources/" is not a valid URI
-
-Try to create branches with URLs in bazaar.launchpad.dev.
-
-    >>> add_branch('http://bazaar.launchpad.dev')
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    For Launchpad to mirror a branch, the original branch cannot be on
-    launchpad.dev.
-
-    >>> add_branch('http://bazaar.launchpad.dev/~me/that/this')
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    For Launchpad to mirror a branch, the original branch cannot be on
-    launchpad.dev.
-
-    >>> add_branch('sftp://bazaar.launchpad.dev/~me/that/this')
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    For Launchpad to mirror a branch, the original branch cannot be on
-    launchpad.dev.
-
-Try to create a branch with a URL that is already registered.
-
-    >>> add_branch('http://example.com/gnome-terminal/main/')
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    The bzr branch lp://dev/~name12/gnome-terminal/main is already registered
-    with this URL.
-
-
-Try to create a branch without URL
-
-    >>> add_branch('')
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    Branch URLs are required for Mirrored branches.
-
-Try to create a branch using the bzr+ssh URL scheme.
-
-    >>> add_branch('bzr+ssh://example.com/code/branch')
-    >>> print user_browser.url
-    http://code.launchpad.dev/~no-priv/+junk/pyresources
-
-
-= The other forms =
-
-The +addbranch form of Product, and the +edit form of a branch all use the same
-validation logic that the previous form, since it is defined in the IBranch
-interface. No point in repeating the tests here.

=== modified file 'lib/lp/code/stories/branches/xx-creating-branches.txt'
--- lib/lp/code/stories/branches/xx-creating-branches.txt	2010-10-18 22:24:59 +0000
+++ lib/lp/code/stories/branches/xx-creating-branches.txt	2011-10-04 14:34:53 +0000
@@ -32,94 +32,8 @@
     >>> browser.open('http://code.launchpad.dev/redfish')
     >>> browser.getLink("Register a branch").click()
 
-    >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Name').value = 'hosted-branch'
 
-Branch URLs are not valid for hosted branches.
-
-    >>> browser.getControl('Branch URL').value = (
-    ...     'http://example.com/hosted-branch')
-    >>> browser.getControl('Register Branch').click()
-    >>> for message in get_feedback_messages(browser.contents):
-    ...     print message
-    There is 1 error.
-    Branch URLs cannot be set for Hosted branches.
-
-    >>> browser.getControl('Branch URL').value = ''
-    >>> browser.getControl('Register Branch').click()
-
-    >>> def print_branch_info(browser):
-    ...     branch_info = find_tag_by_id(browser.contents, 'branch-info')
-    ...     print extract_text(branch_info)
-    >>> print_branch_info(browser)
-    Branch information
-    Owner: Sample Person
-    Project: Redfish
-    Status: Development
-
-
-Creating a mirrored branch
---------------------------
-
-Mirrored branches are primarily hosted outside of Launchpad, and
-Launchpad mirrors the branch.
-
-    >>> browser.open('http://code.launchpad.dev/redfish')
-    >>> browser.getLink("Register a branch").click()
-
-    >>> print_radio_button_field(browser.contents, 'branch_type')
-    ( ) Hosted
-    (*) Mirrored
-    ( ) Remote
-
-    >>> browser.getControl('Name').value = 'mirrored-branch'
-
-Branch URLs are required for mirrored branches.
-
-    >>> browser.getControl('Register Branch').click()
-    >>> for message in get_feedback_messages(browser.contents):
-    ...     print message
-    There is 1 error.
-    Branch URLs are required for Mirrored branches.
-
-    >>> browser.getControl('Branch URL').value = (
-    ...     'http://example.com/mirrored-branch')
-    >>> browser.getControl('Register Branch').click()
-
-    >>> print_branch_info(browser)
-    Branch information
-    Owner: Sample Person
-    Project: Redfish
-    Status: Development
-    Location: http://example.com/mirrored-branch
-    Last mirrored: Not mirrored yet
-    Next mirror: As soon as possible
-
-
-Creating a remote branch
-------------------------
-
-The contents of Remote branches are not accessible through Launchpad.
-
-    >>> browser.open('http://code.launchpad.dev/redfish')
-    >>> browser.getLink("Register a branch").click()
-
-    >>> browser.getControl('Remote').click()
-    >>> browser.getControl('Name').value = 'remote-branch'
-
-A remote branch may have a URL, but doesn't have to.
-
-    >>> browser.getControl('Branch URL').value = (
-    ...     'http://example.com/remote-branch')
-    >>> browser.getControl('Register Branch').click()
-    >>> print_branch_info(browser)
-    Branch information
-    Owner: Sample Person
-    Project: Redfish
-    Status: Development
-    Location: http://example.com/remote-branch
-
-
 Finding product/+addbranch
 --------------------------
 
@@ -172,9 +86,6 @@
 The specified URL has a trailing slash. In the next test, we will check
 that it has been stripped.
 
-    >>> user_browser.getControl('Branch URL').value = (
-    ...     'http://example.com/applets/main/')
-
     >>> user_browser.getControl('Name').value = 'main'
     >>> user_browser.getControl('Experimental').click()
     >>> user_browser.getControl('Register Branch').click()
@@ -193,12 +104,6 @@
     >>> print extract_text(find_tag_by_id(content, 'privacy'))
     This branch is public
 
-    >>> print extract_text(content.h1)
-    lp://dev/~no-priv/applets/main
-
-    >>> print extract_text(find_tag_by_id(content, 'mirror-location'))
-    Location: http://example.com/applets/main
-
 This page includes a link to other branches associated with that
 product, and a link to other branches maintained by that person.
 
@@ -209,34 +114,6 @@
     Other branches owned by No Privileges Person
 
 
-Adding a branch via a product series
-------------------------------------
-
-A user can register a branch from the project series page using the
-'Submit code' link, or in the case of a series driver, by using the
-'registering a mirrored branch' link.
-
-    >>> browser.open('http://launchpad.dev/gnome-terminal/trunk')
-    >>> browser.getLink('registering a mirrored branch').click()
-    >>> print browser.title
-    Register a branch : Code : GNOME Terminal
-
-The user sees that he is registering a branch for the series' project.
-
-    >>> print extract_text(find_main_content(browser.contents).h1)
-    Register a branch on GNOME Terminal
-
-After posting the form, he sees the registered branch page.
-
-    >>> browser.getControl('Branch URL').value = (
-    ...     'http://example.com/applets/master')
-    >>> browser.getControl('Name').value = 'master'
-    >>> browser.getControl('Experimental').click()
-    >>> browser.getControl('Register Branch').click()
-    >>> print browser.title
-    master : Code : GNOME Terminal
-
-
 Finding person/+addbranch
 -------------------------
 
@@ -271,7 +148,6 @@
     Ubuntu Gnome Team (name18)
     Warty Security Team (name20)
 
-
 Conflict on unique name
 -----------------------
 
@@ -288,8 +164,6 @@
 Try a adding a conflicting branch from the product/+addbranch form.
 
     >>> browser.open('http://code.launchpad.dev/gnome-terminal/+addbranch')
-    >>> browser.getControl('Branch URL').value = (
-    ...     'http://example.com/gnome-terminal/main-dup')
 
 Trying to post the form without filling a name at all should not cause
 an oops!
@@ -321,7 +195,6 @@
     >>> browser.getControl('Owner').displayValue = [
     ...     'Landscape Developers']
     >>> browser.getControl('Name').value = 'main'
-    >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Register Branch').click()
     >>> print browser.url
     http://code.launchpad.dev/~landscape-developers/gnome-terminal/main
@@ -335,7 +208,6 @@
     >>> browser.getControl('Owner').displayValue = [
     ...     'Landscape Developers']
     >>> browser.getControl('Name').value = 'main'
-    >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Register Branch').click()
     >>> for message in get_feedback_messages(browser.contents):
     ...     print extract_text(message)
@@ -343,65 +215,6 @@
     Landscape Developers already has a branch for GNOME Terminal called main.
 
 
-Checking URLs
--------------
-
-URL validation should check that the entered URL is not the root of a
-site.
-
-    >>> user_browser.open('http://code.launchpad.dev/applets')
-    >>> user_browser.getLink("Register a branch").click()
-    >>> user_browser.getControl('Branch URL').value = 'http://example.com'
-    >>> user_browser.getControl('Name').value = 'unique-name'
-    >>> user_browser.getControl('Register Branch').click()
-    >>> messages = find_tags_by_class(user_browser.contents, 'message')
-    >>> for element in messages:
-    ...     print element.renderContents()
-    There is 1 error.
-    URLs for branches cannot point to the root of a site.
-
-URL validation should check that the entered URL is not from Launchpad.
-
-    >>> user_browser.open('http://code.launchpad.dev/applets')
-    >>> user_browser.getLink("Register a branch").click()
-    >>> user_browser.getControl('Branch URL').value = (
-    ...     'http://code.launchpad.dev/~testuser/')
-    >>> user_browser.getControl('Name').value = 'unique-name'
-    >>> user_browser.getControl('Register Branch').click()
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    For Launchpad to mirror a branch, the original branch cannot be on
-    launchpad.dev.
-
-As well as checking against the root site set in the config, a check is
-also done against the value stored as a database constraint.
-
-    >>> user_browser.open('http://code.launchpad.dev/applets')
-    >>> user_browser.getLink("Register a branch").click()
-    >>> user_browser.getControl('Branch URL').value = (
-    ...     'http://bazaar.launchpad.net/foo/bar/')
-    >>> user_browser.getControl('Name').value = 'unique-name'
-    >>> user_browser.getControl('Register Branch').click()
-    >>> for message in get_feedback_messages(user_browser.contents):
-    ...     print message
-    There is 1 error.
-    For Launchpad to mirror a branch, the original branch cannot be on
-    http://bazaar.launchpad.net.
-
-Trailing slashes on URLs are removed.
-
-    >>> user_browser.getControl('Branch URL').value = (
-    ...     'sftp://example.com/~lifeless/pyresources/')
-    >>> user_browser.getControl('Register Branch').click()
-    >>> print_tag_with_id(user_browser.contents, 'branch-info')
-    Branch information
-    Owner: ...
-    ...
-    Location: sftp://example.com/~lifeless/pyresources
-    ...
-
-
 Attempting to create a branch in a forbidden project
 ----------------------------------------------------
 
@@ -423,7 +236,6 @@
 
     >>> user_browser.open('http://code.launchpad.dev/landscape')
     >>> user_browser.getLink("Register a branch").click()
-    >>> user_browser.getControl('Branch URL').value = 'http://foo.com/bar'
     >>> user_browser.getControl('Name').value = 'landscape1'
     >>> user_browser.getControl('Register Branch').click()
     >>> messages = find_tags_by_class(user_browser.contents, 'message')

=== modified file 'lib/lp/code/stories/branches/xx-junk-branches.txt'
--- lib/lp/code/stories/branches/xx-junk-branches.txt	2010-01-21 03:02:09 +0000
+++ lib/lp/code/stories/branches/xx-junk-branches.txt	2011-10-04 14:34:53 +0000
@@ -17,7 +17,6 @@
     >>> browser.open('http://code.launchpad.dev/~eric')
     >>> browser.getLink("Register a branch").click()
     >>> browser.getControl('Name').value = 'personal-junk'
-    >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Register Branch').click()
 
 Posting the form should succeed and redirect to the page of the newly created
@@ -31,8 +30,8 @@
     Nearby
     Other branches owned by Eric
 
-Junk branches do not support merge proposals, so the "Branch Merges" section of
-the page should not be shown.
+Junk branches do not support merge proposals, so the "Branch Merges" section
+of the page should not be shown.
 
     >>> print find_tag_by_id(browser.contents, 'branch-merges')
     None
@@ -46,7 +45,6 @@
     >>> browser.open('http://code.launchpad.dev/~vikings')
     >>> browser.getLink("Register a branch").click()
     >>> browser.getControl('Name').value = 'team-junk'
-    >>> browser.getControl('Hosted').click()
     >>> browser.getControl('Register Branch').click()
 
     >>> print browser.url

=== modified file 'lib/lp/code/stories/codeimport/xx-create-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2011-08-15 11:21:26 +0000
+++ lib/lp/code/stories/codeimport/xx-create-codeimport.txt	2011-10-04 14:34:53 +0000
@@ -40,7 +40,8 @@
     >>> owner_browser.getLink('Configure code hosting').click()
     >>> owner_browser.getControl(
     ...     'Import a branch').click()
-    >>> owner_browser.getControl('Branch URL').value = 'git://example.com/firefox'
+    >>> owner_browser.getControl('Branch URL').value = (
+    ...     'git://example.com/firefox')
     >>> owner_browser.getControl('Git').click()
     >>> owner_browser.getControl('Branch name').value = 'trunk'
     >>> owner_browser.getControl('Update').click()
@@ -50,22 +51,65 @@
     >>> browser.open('http://code.launchpad.dev/firefox')
     >>> browser.getLink('Import a branch').click()
 
-Requesting a Subversion import
-==============================
+Requesting a Bazaar import
+==========================
 
-The default foreign VCS type is Subversion.
+The default VCS type is Bazaar.
 
     >>> print_radio_button_field(browser.contents, "rcs_type")
+    (*) Bazaar
     ( ) Git
     ( ) Mercurial
-    (*) Subversion
+    ( ) Subversion
     ( ) CVS
 
 The user is required to enter a project that the import is for, a name
-for the import branch, and a subversion branch location.
-
+for the import branch, and a Bazaar branch location.
+
+    >>> browser.getControl('Branch Name').value = "mirrored"
+    >>> browser.getControl('Branch URL', index=0).value = (
+    ...     "http://bzr.example.com/firefox/trunk")
+    >>> browser.getControl('Request Import').click()
+
+When the user clicks continue, the import branch is created
+
+    >>> print extract_text(find_tag_by_id(browser.contents, "import-details"))
+    Import Status: Reviewed
+    This branch is an import of the Bazaar branch
+    at http://bzr.example.com/firefox/trunk.
+    The next import is scheduled to run
+    as soon as possible.
+    >>> browser.getLink("http://bzr.example.com/firefox/trunk")
+    <Link text='http://bzr.example.com/firefox/trunk'
+           url='http://bzr.example.com/firefox/trunk'>
+
+If the user wants, they can include a username and password in the
+URL.
+
+    >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
+    >>> browser.getControl('Branch Name').value = "with-password"
+    >>> browser.getControl('Branch URL', index=0).value = (
+    ...     "http://user:[e-mail]/firefox/trunk")
+    >>> browser.getControl('Project').value = "firefox"
+    >>> browser.getControl('Request Import').click()
+    >>> print extract_text(find_tag_by_id(browser.contents, "import-details"))
+    Import Status: Reviewed
+    This branch is an import of the Bazaar branch
+    at http://user:[e-mail]/firefox/trunk.
+    The next import is scheduled to run
+    as soon as possible.
+
+Requesting a Subversion import
+==============================
+
+The user is required to enter a project that the import is for,
+a name for the import branch, and a subversion branch location.
+
+    >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
+    >>> browser.getControl('Subversion').click()
+    >>> browser.getControl('Project').value = "firefox"
     >>> browser.getControl('Branch Name').value = "imported"
-    >>> browser.getControl('Branch URL').value = (
+    >>> browser.getControl('Branch URL', index=1).value = (
     ...     "http://svn.example.com/firefox/trunk")
     >>> browser.getControl('Request Import').click()
 
@@ -94,8 +138,9 @@
 URL.
 
     >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
-    >>> browser.getControl('Branch Name').value = "with-password"
-    >>> browser.getControl('Branch URL').value = (
+    >>> browser.getControl('Subversion').click()
+    >>> browser.getControl('Branch Name').value = "svn-with-password"
+    >>> browser.getControl('Branch URL', index=1).value = (
     ...     "http://user:[e-mail]/firefox/trunk")
     >>> browser.getControl('Project').value = "firefox"
     >>> browser.getControl('Request Import').click()
@@ -221,7 +266,7 @@
     the imported branch ~no-priv/firefox/import2.
 
     >>> browser.getControl('Subversion').click()
-    >>> browser.getControl('Branch URL').value = (
+    >>> browser.getControl('Branch URL', index=1).value = (
     ...     "http://svn.example.com/firefox/trunk")
     >>> browser.getControl('Request Import').click()
 
@@ -241,9 +286,10 @@
 one.
 
     >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
+    >>> browser.getControl('Subversion').click()
     >>> browser.getControl('Project').value = "firefox"
     >>> browser.getControl('Branch Name').value = "imported"
-    >>> browser.getControl('Branch URL').value = (
+    >>> browser.getControl('Branch URL', index=1).value = (
     ...     "http://svn.example.com/firefox/other")
     >>> browser.getControl('Request Import').click()
     >>> for message in get_feedback_messages(browser.contents):
@@ -261,7 +307,7 @@
     >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
     >>> browser.getControl('Project').value = "launchpad"
     >>> browser.getControl('Branch Name').value = "imported"
-    >>> browser.getControl('Branch URL').value = (
+    >>> browser.getControl('Branch URL', index=0).value = (
     ...     "http://svn.example.com/launchpage/fake")
     >>> browser.getControl('Request Import').click()
     >>> for message in get_feedback_messages(browser.contents):
@@ -279,7 +325,7 @@
     >>> browser.open("http://code.launchpad.dev/+code-imports/+new")
     >>> browser.getControl('Project').value = "no-such-product"
     >>> browser.getControl('Branch Name').value = "imported"
-    >>> browser.getControl('Branch URL').value = (
+    >>> browser.getControl('Branch URL', index=0).value = (
     ...     "http://svn.example.com/launchpage/fake")
     >>> browser.getControl('Request Import').click()
     >>> for message in get_feedback_messages(browser.contents):
@@ -306,7 +352,7 @@
     >>> sample_browser.getControl('Owner').value = ['landscape-developers']
     >>> sample_browser.getControl('Owner').displayValue
     ['Landscape Developers (landscape-developers)']
-    >>> sample_browser.getControl('Branch URL').value = (
+    >>> sample_browser.getControl('Branch URL', index=0).value = (
     ...     "http://svn.example.com/firefox-beta/trunk")
     >>> sample_browser.getControl('Request Import').click()
 
@@ -320,7 +366,7 @@
     >>> admin_browser = setupBrowser(auth='Basic [e-mail]:test')
     >>> admin_browser.open("http://code.launchpad.dev/firefox/+new-import")
     >>> admin_browser.getControl('Owner').value = 'mark'
-    >>> admin_browser.getControl('Branch URL').value = (
+    >>> admin_browser.getControl('Branch URL', index=0).value = (
     ...     "http://svn.example.com/firefox-theta/trunk")
     >>> admin_browser.getControl('Request Import').click()
 

=== modified file 'lib/lp/code/templates/branch-form-macros.pt'
--- lib/lp/code/templates/branch-form-macros.pt	2009-10-02 15:02:23 +0000
+++ lib/lp/code/templates/branch-form-macros.pt	2011-10-04 14:34:53 +0000
@@ -17,20 +17,6 @@
 
 <script type="text/javascript">
 //<![CDATA[
-function update_branch_url()
-{
-  var branch_type_field = document.getElementsByName('field.branch_type')
-  var form = branch_type_field[0].form;
-  var branch_type = 'None';
-  for (var i = 0; i < branch_type_field.length; i++) {
-    if (branch_type_field[i].checked) {
-      branch_type = branch_type_field[i].value;
-      break;
-    }
-  }
-  updateField(form['field.url'], branch_type != 'HOSTED');
-}
-
 function update_branch_unique_name()
 {
   var unique_name = document.getElementById("branch-unique-name")
@@ -43,44 +29,16 @@
   unique_name.innerHTML = branch_name
 }
 
-function populate_branch_name_from_url()
-{
-   url_field = document.getElementById('field.url');
-   var url_text = trim(url_field.value);
-   // strip of any trailing slashes
-   url_text = url_text.replace(/\/+$/, '')
-   if (url_text != url_field.value) {
-      url_field.value = url_text;
-   }
-   var name_field = document.getElementById('field.name');
-   if (name_field.value == '')
-   {
-      // parse the value of the url field
-      url_bits = url_text.split('/');
-      if (url_bits.length > 2) {
-         // attempt at not barfing on something completely invalid
-         last_bit = url_bits[url_bits.length - 1];
-         name_field.value = last_bit;
-      }
-   }
-}
-
 function hookUpBranchFieldFunctions()
 {
   connect('field.owner', 'onkeyup', update_branch_unique_name);
   connect('field.owner', 'onchange', update_branch_unique_name);
   connect('field.name', 'onkeyup', update_branch_unique_name);
-  connect('field.branch_type.0', 'onclick', update_branch_url);
-  connect('field.branch_type.1', 'onclick', update_branch_url);
-  connect('field.branch_type.2', 'onclick', update_branch_url);
   update_branch_unique_name();
-  connect('field.url', 'onchange', populate_branch_name_from_url);
-  connect('field.url', 'onblur', populate_branch_name_from_url);
   document.getElementById("branch-unique-name-div").style.display = "block";
 }
 
 registerLaunchpadFunction(hookUpBranchFieldFunctions);
-registerLaunchpadFunction(update_branch_url);
 
 //]]>
 </script>

=== modified file 'lib/lp/code/templates/branch-import-details.pt'
--- lib/lp/code/templates/branch-import-details.pt	2010-06-10 07:54:59 +0000
+++ lib/lp/code/templates/branch-import-details.pt	2011-10-04 14:34:53 +0000
@@ -41,26 +41,50 @@
 
         <tal:git-import condition="code_import/rcs_type/enumvalue:GIT">
           <p>This branch is an import of the HEAD branch of the Git repository at
-            <span tal:replace="code_import/url" />.
+            <tal:is-web-url condition="view/url_is_web">
+              <a tal:attributes="href code_import/url"
+                 tal:content="code_import/url" />.
+            </tal:is-web-url>
+            <tal:not-web-url condition="not: view/url_is_web">
+              <span tal:replace="code_import/url" />.
+            </tal:not-web-url>
           </p>
         </tal:git-import>
 
         <tal:hg-import condition="code_import/rcs_type/enumvalue:HG">
           <p>This branch is an import of the tip branch of the Mercurial repository at
-            <span tal:replace="code_import/url" />.
+            <tal:is-web-url condition="view/url_is_web">
+              <a tal:attributes="href code_import/url"
+                 tal:content="code_import/url" />.
+            </tal:is-web-url>
+            <tal:not-web-url condition="not: view/url_is_web">
+              <span tal:replace="code_import/url" />.
+            </tal:not-web-url>
           </p>
         </tal:hg-import>
 
+        <tal:bzr-import condition="code_import/rcs_type/enumvalue:BZR">
+          <p>This branch is an import of the Bazaar branch at
+            <tal:is-web-url condition="view/url_is_web">
+              <a tal:attributes="href code_import/url"
+                 tal:content="code_import/url" />.
+            </tal:is-web-url>
+            <tal:not-web-url condition="not: view/url_is_web">
+              <span tal:replace="code_import/url" />.
+            </tal:not-web-url>
+          </p>
+        </tal:bzr-import>
+
         <tal:svn-import condition="view/is_svn_import">
           <p id="svn-import-details">
             This branch is an import of the
             <span tal:attributes="title code_import/rcs_type/title">Subversion</span>
             branch from
-            <tal:is-web-url condition="view/svn_url_is_web">
+            <tal:is-web-url condition="view/url_is_web">
               <a tal:attributes="href code_import/url"
                  tal:content="code_import/url" />.
             </tal:is-web-url>
-            <tal:not-web-url condition="not: view/svn_url_is_web">
+            <tal:not-web-url condition="not: view/url_is_web">
               <span tal:replace="code_import/url" />.
             </tal:not-web-url>
           </p>

=== modified file 'lib/lp/code/templates/codeimport-list.pt'
--- lib/lp/code/templates/codeimport-list.pt	2010-03-18 22:39:15 +0000
+++ lib/lp/code/templates/codeimport-list.pt	2011-10-04 14:34:53 +0000
@@ -21,6 +21,7 @@
     </select>
     <select name="rcs_type" tal:replace="structure view/rcs_type_widget">
       <option label="">Any</option>
+      <option label="BZR">Bazaar</option>
       <option label="GIT">Git</option>
       <option label="BZR_SVN">Subversion</option>
       <option label="SVN">Subversion (legacy)</option>

=== modified file 'lib/lp/code/templates/codeimport-new.pt'
--- lib/lp/code/templates/codeimport-new.pt	2010-04-22 23:50:51 +0000
+++ lib/lp/code/templates/codeimport-new.pt	2011-10-04 14:34:53 +0000
@@ -53,6 +53,20 @@
         <tr>
           <td>
             <label>
+              <input tal:replace="structure view/rcs_type_bzr" />
+              Bazaar
+            </label>
+            <table class="importdetails">
+              <tal:widget define="widget nocall:view/widgets/bzr_branch_url">
+                <metal:block use-macro="context/@@launchpad_form/widget_row" />
+              </tal:widget>
+            </table>
+          </td>
+        </tr>
+
+        <tr>
+          <td>
+            <label>
               <input tal:replace="structure view/rcs_type_git" />
               Git
             </label>
@@ -134,6 +148,8 @@
           updateField(form['field.cvs_module'], rcs_type == 'CVS');
           // SVN
           updateField(form['field.svn_branch_url'], rcs_type == 'BZR_SVN');
+          // BZR
+          updateField(form['field.bzr_branch_url'], rcs_type == 'BZR');
         }
         registerLaunchpadFunction(updateWidgets);
         //]]>

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2011-08-28 08:36:14 +0000
+++ lib/lp/registry/browser/productseries.py	2011-10-04 14:34:53 +0000
@@ -1089,8 +1089,7 @@
 
             # Create a new branch.
             if branch_type == CREATE_NEW:
-                branch = self._createBzrBranch(
-                    BranchType.HOSTED, branch_name, branch_owner)
+                branch = self._createBzrBranch(branch_name, branch_owner)
                 if branch is not None:
                     self.context.branch = branch
                     self.request.response.addInfoNotification(
@@ -1101,68 +1100,53 @@
                 # 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 == RevisionControlSystems.BZR:
-                    branch = self._createBzrBranch(
-                        BranchType.MIRRORED, branch_name, branch_owner,
-                        data['repo_url'])
-                    if branch is None:
-                        return
-
-                    self.context.branch = branch
-                    self.request.response.addInfoNotification(
-                        'Mirrored branch created and linked to '
-                        'the series.')
+                # We need to create an import request.
+                if rcs_type == RevisionControlSystems.CVS:
+                    cvs_root = data.get('repo_url')
+                    cvs_module = data.get('cvs_module')
+                    url = None
                 else:
-                    # We need to create an import request.
-                    if rcs_type == RevisionControlSystems.CVS:
-                        cvs_root = data.get('repo_url')
-                        cvs_module = data.get('cvs_module')
-                        url = None
-                    else:
-                        cvs_root = None
-                        cvs_module = None
-                        url = data.get('repo_url')
-                    rcs_item = RevisionControlSystems.items[rcs_type.name]
-                    try:
-                        code_import = getUtility(ICodeImportSet).new(
-                            registrant=branch_owner,
-                            target=IBranchTarget(self.context.product),
-                            branch_name=branch_name,
-                            rcs_type=rcs_item,
-                            url=url,
-                            cvs_root=cvs_root,
-                            cvs_module=cvs_module)
-                    except BranchExists, e:
-                        self._setBranchExists(e.existing_branch,
-                                              'branch_name')
-                        self.errors_in_action = True
-                        # Abort transaction. This is normally handled
-                        # by LaunchpadFormView, but we are already in
-                        # the success handler.
-                        self._abort()
-                        return
-                    self.context.branch = code_import.branch
-                    self.request.response.addInfoNotification(
-                        'Code import created and branch linked to the '
-                        'series.')
+                    cvs_root = None
+                    cvs_module = None
+                    url = data.get('repo_url')
+                rcs_item = RevisionControlSystems.items[rcs_type.name]
+                try:
+                    code_import = getUtility(ICodeImportSet).new(
+                        registrant=branch_owner,
+                        target=IBranchTarget(self.context.product),
+                        branch_name=branch_name,
+                        rcs_type=rcs_item,
+                        url=url,
+                        cvs_root=cvs_root,
+                        cvs_module=cvs_module)
+                except BranchExists, e:
+                    self._setBranchExists(e.existing_branch,
+                                          'branch_name')
+                    self.errors_in_action = True
+                    # Abort transaction. This is normally handled
+                    # by LaunchpadFormView, but we are already in
+                    # the success handler.
+                    self._abort()
+                    return
+                self.context.branch = code_import.branch
+                self.request.response.addInfoNotification(
+                    'Code import created and branch linked to the '
+                    'series.')
             else:
                 raise UnexpectedFormData(branch_type)
 
-    def _createBzrBranch(self, branch_type, branch_name,
-                         branch_owner, repo_url=None):
-        """Create a new Bazaar branch.  It may be hosted or mirrored.
+    def _createBzrBranch(self, branch_name, branch_owner, repo_url=None):
+        """Create a new hosted Bazaar branch.
 
         Return the branch on success or None.
         """
         branch = None
         try:
             namespace = self.target.getNamespace(branch_owner)
-            branch = namespace.createBranch(branch_type=branch_type,
+            branch = namespace.createBranch(branch_type=BranchType.HOSTED,
                                             name=branch_name,
                                             registrant=self.user,
                                             url=repo_url)
-            if branch_type == BranchType.MIRRORED:
-                branch.requestMirror()
         except BranchCreationForbidden:
             self.addError(
                 "You are not allowed to create branches in %s." %

=== modified file 'lib/lp/registry/browser/tests/productseries-setbranch-view.txt'
--- lib/lp/registry/browser/tests/productseries-setbranch-view.txt	2011-08-27 23:24:05 +0000
+++ lib/lp/registry/browser/tests/productseries-setbranch-view.txt	2011-10-04 14:34:53 +0000
@@ -95,7 +95,8 @@
     ...     'field.branch_type': 'create-new',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
     >>> for error in view.errors:
@@ -112,7 +113,8 @@
     ...     'field.actions.update': 'Update',
     ...     }
 
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> print view.errors_in_action
     False
     >>> print view.next_url
@@ -134,7 +136,8 @@
     ...     'field.actions.update': 'Update',
     ...     }
 
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> print view.errors_in_action
     True
     >>> print view.next_url
@@ -161,7 +164,8 @@
     ...     'field.branch_type': 'import-external',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
     >>> for error in view.errors:
@@ -181,13 +185,14 @@
     ...     'field.repo_url': 'bzr+ssh://bzr.com/foo',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
     >>> for error in view.errors:
     ...     print error
-    ('repo_url'...The URI scheme "bzr+ssh" is not allowed.  Only URIs with the following schemes may be
-    used: bzr, http, https'))
+    ('repo_url'...The URI scheme "bzr+ssh" is not allowed.  Only URIs with
+    the following schemes may be used: bzr, http, https'))
 
 
 A correct URL is accepted.
@@ -200,13 +205,14 @@
     ...     'field.repo_url': 'http://bzr.com/foo',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> transaction.commit()
     >>> for error in view.errors:
     ...     print error
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
-    Mirrored branch created and linked to the series.
+    Code import created and branch linked to the series.
     >>> print series.branch.name
     blazer-branch
 
@@ -220,7 +226,8 @@
     ...     'field.repo_url': 'svn://svn.com/chevette',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
     >>> for error in view.errors:
@@ -240,7 +247,8 @@
     ...     'field.repo_url': 'git://github.com/chevette',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> transaction.commit()
     >>> for error in view.errors:
     ...     print error
@@ -260,7 +268,8 @@
     ...     'field.repo_url': 'git://github.com/suburban',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
     >>> for error in view.errors:
@@ -280,7 +289,8 @@
     ...     'field.repo_url': 'svn://svn.com/suburban',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for error in view.errors:
     ...     print error
     >>> for notification in view.request.response.notifications:
@@ -301,7 +311,8 @@
     ...     'field.repo_url': 'https://mercurial.com/branch',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for error in view.errors:
     ...     print error
     >>> for notification in view.request.response.notifications:
@@ -367,8 +378,8 @@
     ...     print error
     <BLANKLINE>
     This foreign branch URL is already specified for
-    the imported branch <a href="http://code.launchpad.dev/~.../chevy/chevette-branch">~.../chevy/chevette-branch</a>.
-
+    the imported branch
+    <a href="http://.../chevy/chevette-branch">~.../chevy/chevette-branch</a>.
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
 
@@ -386,7 +397,8 @@
     ...                                principal=product.owner, form=form)
     >>> for error in view.errors:
     ...     print error
-    You already have a branch for <em>Chevy</em> called <em>chevette-branch</em>.
+    You already have a branch for
+    <em>Chevy</em> called <em>chevette-branch</em>.
     >>> print view.errors_in_action
     True
     >>> print view.next_url
@@ -406,13 +418,16 @@
     ...     'field.repo_url': 'http://bzr.com/foo',
     ...     'field.actions.update': 'Update',
     ...     }
-    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> view = create_initialized_view(
+    ...     series, name='+setbranch', principal=product.owner, form=form)
     >>> for error in view.errors:
     ...     print error
-    You already have a branch for <em>Chevy</em> called <em>blazer-branch</em>.
+    <BLANKLINE>
+    This foreign branch URL is already specified for the imported branch
+    <a href="http://.../blazer-branch">...</a>.
     >>> print view.errors_in_action
-    True
+    False
     >>> print view.next_url
-    None
+    http://launchpad.dev/chevy/corvair
     >>> for notification in view.request.response.notifications:
     ...     print notification.message

=== modified file 'lib/lp/registry/templates/productseries-codesummary.pt'
--- lib/lp/registry/templates/productseries-codesummary.pt	2011-05-16 20:55:08 +0000
+++ lib/lp/registry/templates/productseries-codesummary.pt	2011-10-04 14:34:53 +0000
@@ -54,7 +54,7 @@
         </li>
 
         <li>
-          If the code is in Git, Mercurial, CVS or Subversion you can
+          If the code is in Git, Mercurial, CVS, Subversion or an external Bazaar branch you can
           <a tal:attributes="href view/request_import_link">request that the branch be imported to Bazaar</a>.
         </li>
       </ul>