Merge lp:~edwin-grubbs/launchpad/bug-567065-empty-branch into lp:launchpad

[Edwin Grubbs]

Summary
-------

The "Submit Code" link in the involvement portlet on a product series
should be active after the user sets a branch for the series.

If you try to create a new branch with the same name as an existing
branch, you should get a warning.

Tests
-----

./bin/test -vv -t 'productseries-setbranch-view.txt|productseries-views.txt'

Demo and Q/A
------------

* Open http://launchpad.dev/firefox
  * Create a new series.
  * The "Submit code" link should be disabled.
  * Use "Configure series branch" link to add a new branch.
  * The "Submit code" link should now be enabled.
* Click on "Configure series branch".
  * Try to add a branch with the same name as the one you just created.
  * You should get an error message next to the form field.

[Abel Deuring (adeuring)]

review: Approve (code)

[Francis J. Lacoste (flacoste)]

review: Approve (release-critical)

=== modified file 'lib/lp/registry/browser/productseries.py'
--- lib/lp/registry/browser/productseries.py	2010-04-17 00:36:18 +0000
+++ lib/lp/registry/browser/productseries.py	2010-04-30 13:56:27 +0000
@@ -182,10 +182,11 @@
         'report_bug', 'help_translate', 'submit_code', 'register_blueprint']
 
     def submit_code(self):
-        product = self.context.context.product
+        view = self.context
+        product_series = view.context
         target = canonical_url(
-            product, view_name='+addbranch', rootsite='code')
-        enabled = product.official_codehosting
+            product_series, view_name='+addbranch', rootsite='code')
+        enabled = view.official_codehosting
         return Link(
             target, 'Submit code', icon='code', enabled=enabled)
 
@@ -1029,7 +1030,6 @@
                         BranchType.MIRRORED, branch_name, branch_owner,
                         data['repo_url'])
                     if branch is None:
-                        self.errors_in_action = True
                         return
 
                     self.context.branch = branch
@@ -1060,6 +1060,10 @@
                         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(
@@ -1089,6 +1093,11 @@
                 self.context.displayname)
         except BranchExists, e:
             self._setBranchExists(e.existing_branch, 'branch_name')
+        if branch is None:
+            self.errors_in_action = True
+            # Abort transaction. This is normally handled by
+            # LaunchpadFormView, but we are already in the success handler.
+            self._abort()
         return branch
 
 

=== modified file 'lib/lp/registry/browser/tests/productseries-setbranch-view.txt'
--- lib/lp/registry/browser/tests/productseries-setbranch-view.txt	2010-04-16 17:37:34 +0000
+++ lib/lp/registry/browser/tests/productseries-setbranch-view.txt	2010-04-30 13:56:27 +0000
@@ -113,6 +113,10 @@
     ...     }
 
     >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> print view.errors_in_action
+    False
+    >>> print view.next_url
+    http://launchpad.dev/chevy/camaro
     >>> for error in view.errors:
     ...     print error
     >>> for notification in view.request.response.notifications:
@@ -121,6 +125,26 @@
     >>> print series.branch.name
     camaro-branch
 
+Using a branch name that already exists results in an error.
+
+    >>> form = {
+    ...     'field.branch_type': 'create-new',
+    ...     'field.branch_name': 'camaro-branch',
+    ...     'field.branch_owner': product.owner.name,
+    ...     'field.actions.update': 'Update',
+    ...     }
+
+    >>> view = create_initialized_view(series, name='+setbranch', principal=product.owner, form=form)
+    >>> print view.errors_in_action
+    True
+    >>> print view.next_url
+    None
+    >>> for error in view.errors:
+    ...     print error
+    You already have a branch for <em>Chevy</em> called <em>camaro-branch</em>.
+    >>> for notification in view.request.response.notifications:
+    ...     print notification.message
+
 
 Import a branch hosted elsewhere
 --------------------------------
@@ -362,6 +386,10 @@
     >>> for error in view.errors:
     ...     print error
     You already have a branch for <em>Chevy</em> called <em>chevette-branch</em>.
+    >>> print view.errors_in_action
+    True
+    >>> print view.next_url
+    None
 
     >>> for notification in view.request.response.notifications:
     ...     print notification.message
@@ -381,5 +409,9 @@
     >>> for error in view.errors:
     ...     print error
     You already have a branch for <em>Chevy</em> called <em>blazer-branch</em>.
+    >>> print view.errors_in_action
+    True
+    >>> print view.next_url
+    None
     >>> for notification in view.request.response.notifications:
     ...     print notification.message

=== modified file 'lib/lp/registry/browser/tests/productseries-views.txt'
--- lib/lp/registry/browser/tests/productseries-views.txt	2010-04-12 15:33:19 +0000
+++ lib/lp/registry/browser/tests/productseries-views.txt	2010-04-30 13:56:27 +0000
@@ -23,23 +23,47 @@
 The ProductSeries involvement view uses the ProductSeriesInvolvedMenu when
 rendering links:
 
-    >>> from operator import attrgetter
-    >>> from canonical.launchpad.webapp.tales import MenuAPI
-
     >>> login_person(product.owner)
     >>> product.official_answers = True
     >>> product.official_blueprints = True
     >>> product.official_malone = True
     >>> product.official_rosetta = True
     >>> view = create_view(series, '+get-involved')
-    >>> menuapi = MenuAPI(view)
-    >>> for link in sorted(
-    ...     menuapi.navigation.values(), key=attrgetter('sort_key')):
-    ...     print link.url
-    http://bugs.launchpad.dev/app/simple/+filebug
-    http://translations.launchpad.dev/app/simple
-    http://code.launchpad.dev/app/+addbranch
-    http://blueprints.launchpad.dev/app/simple/+addspec
+
+    # official_answers is always false for product series.
+    >>> print view.official_answers
+    False
+    >>> print view.official_blueprints
+    True
+    >>> print view.official_malone
+    True
+    >>> print view.official_rosetta
+    True
+    >>> print view.official_codehosting
+    False
+    >>> for link in view.enabled_links:
+    ...     print link.url
+    http://bugs.launchpad.dev/app/simple/+filebug
+    http://translations.launchpad.dev/app/simple
+    http://blueprints.launchpad.dev/app/simple/+addspec
+    >>> for link in view.visible_disabled_links:
+    ...     print link.url
+    http://code.launchpad.dev/app/simple/+addbranch
+
+Setting a branch for the series should enable the +addbranch link.
+
+    >>> series.branch = factory.makeBranch()
+    >>> view = create_view(series, '+get-involved')
+    >>> print view.official_codehosting
+    True
+    >>> for link in view.enabled_links:
+    ...     print link.url
+    http://bugs.launchpad.dev/app/simple/+filebug
+    http://translations.launchpad.dev/app/simple
+    http://code.launchpad.dev/app/simple/+addbranch
+    http://blueprints.launchpad.dev/app/simple/+addspec
+    >>> for link in view.visible_disabled_links:
+    ...     print link.url
 
 
 ProductSeries view
@@ -360,7 +384,6 @@
 The delete action will not delete a series that is the active focus of
 development.
 
-    >>> transaction.commit()
     >>> form = {
     ...     'field.actions.delete': 'Delete this Series',
     ...     }