Merge lp:~jml/launchpad/browse-source-code into lp:launchpad

[Jonathan Lange]

Change the browse source code link on product branch pages so that it links to the actual source code rather than a revision log.

[Jonathan Lange (jml)]

Go to https://code.edge.launchpad.net/launchpad. There's a link to "browse the source code". Click this link, and you'll be taken to a list of revisions. What you want is to be taken to a list of files.

This branch gives you what you want.

The patch adds a new property to give the right URL, a test for that property, and changes the template to use the new property.

[Martin Albisetti (beuno)]

This is the right change, although this text should probably be under the development focus, making it look more special than it does today, and less like "just another item on the list".

review: Approve (ui)

[Brad Crittenden (bac)]

Nice, simple branch. Thanks for making the change, Jonathan.

review: Approve (code)

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2009-09-28 22:19:22 +0000
+++ lib/lp/code/browser/branch.py	2009-10-07 22:06:12 +0000
@@ -305,6 +305,7 @@
         """
         return self.branch.target.getBugTask(self.context)
 
+
 class BranchView(LaunchpadView, FeedsMixin):
 
     __used_for__ = IBranch

=== modified file 'lib/lp/code/browser/tests/test_product.py'
--- lib/lp/code/browser/tests/test_product.py	2009-07-17 00:26:05 +0000
+++ lib/lp/code/browser/tests/test_product.py	2009-10-07 22:06:12 +0000
@@ -66,8 +66,7 @@
 
         link = self.getBranchSummaryBrowseLinkForProduct(product)
         login(ANONYMOUS)
-        self.assertEqual(
-            link.url, branch.codebrowse_url())
+        self.assertEqual(link.url, branch.browse_source_url)
 
     def test_unbrowseable_branch_does_not_have_link(self):
         # If the product's development focus branch is not browseable, there

=== modified file 'lib/lp/code/configure.zcml'
--- lib/lp/code/configure.zcml	2009-10-05 14:17:48 +0000
+++ lib/lp/code/configure.zcml	2009-10-07 22:06:12 +0000
@@ -431,6 +431,7 @@
                     getMergeQueue
                     revisions_since
                     code_is_browseable
+                    browse_source_url
                     code_import
                     bzr_identity
                     canBeDeleted

=== modified file 'lib/lp/code/interfaces/branch.py'
--- lib/lp/code/interfaces/branch.py	2009-10-05 14:17:48 +0000
+++ lib/lp/code/interfaces/branch.py	2009-10-07 22:06:12 +0000
@@ -787,6 +787,9 @@
             end of the URL (with `bzrlib.urlutils.join`).
         """
 
+    browse_source_url = Attribute(
+        "The URL of the source browser for this branch.")
+
     # Don't use Object -- that would cause an import loop with ICodeImport.
     code_import = Attribute("The associated CodeImport, if any.")
 

=== modified file 'lib/lp/code/model/branch.py'
--- lib/lp/code/model/branch.py	2009-10-05 14:17:48 +0000
+++ lib/lp/code/model/branch.py	2009-10-07 22:06:12 +0000
@@ -435,6 +435,10 @@
         return urlutils.join(root, self.unique_name, *extras)
 
     @property
+    def browse_source_url(self):
+        return self.codebrowse_url('files')
+
+    @property
     def bzr_identity(self):
         """See `IBranch`."""
         # XXX: JonathanLange 2009-03-19 spec=package-branches bug=345740: This

=== modified file 'lib/lp/code/model/tests/test_branch.py'
--- lib/lp/code/model/tests/test_branch.py	2009-10-01 13:25:12 +0000
+++ lib/lp/code/model/tests/test_branch.py	2009-10-07 22:06:12 +0000
@@ -1333,6 +1333,13 @@
             'http://bazaar.launchpad.dev/' + branch.unique_name + '/a/b',
             branch.codebrowse_url('a', 'b'))
 
+    def test_source_code_url(self):
+        # The source code URL points to the codebrowse URL where you can
+        # actually browse the source code.
+        branch = self.factory.makeAnyBranch()
+        self.assertEqual(
+            branch.browse_source_url, branch.codebrowse_url('files'))
+
 
 class TestBranchNamespace(TestCaseWithFactory):
     """Tests for `IBranch.namespace`."""

=== modified file 'lib/lp/code/templates/product-branch-summary.pt'
--- lib/lp/code/templates/product-branch-summary.pt	2009-09-08 08:48:35 +0000
+++ lib/lp/code/templates/product-branch-summary.pt	2009-10-07 22:06:12 +0000
@@ -50,7 +50,7 @@
                      dev_focus context/development_focus/branch">
       You can
       <tal:browseable condition="dev_focus/code_is_browseable">
-        <a tal:attributes="href dev_focus/codebrowse_url"
+        <a tal:attributes="href dev_focus/browse_source_url"
            >browse the source code</a> for the development focus branch or get a
            copy of the branch</tal:browseable>
       <tal:not-browseable condition="not: dev_focus/code_is_browseable">