Merge lp:~stevenk/launchpad/branch-approximatedate into lp:launchpad

[Steve Kowalik]

[r=lifeless][bug=162305] Use approximatedate for showing branch dates.

Change how dates for branches are displayed. This took far too long to sort out, but there are two properties in branchlisting called since_created and since_updated. They return a duration which was then formatted as a duration -- and the duration formatter maxed out at weeks, so branches would show 'Last modified: 163 weeks ago'.

I have ripped them out, and switched to the dates themselves, which will show approximate dates, such as 'Last modified: 2 years ago'.

I have written a sinfully small test for this, but approximatedate is very well tested.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2011-06-27 15:14:46 +0000
+++ lib/lp/code/browser/branchlisting.py	2011-06-30 21:43:40 +0000
@@ -216,16 +216,6 @@
         return [series for series in self.associated_product_series
                 if series.status != SeriesStatus.OBSOLETE]
 
-    @property
-    def since_updated(self):
-        """How long since the branch was last updated."""
-        return self._now - self.context.date_last_modified
-
-    @property
-    def since_created(self):
-        """How long since the branch was created."""
-        return self._now - self.context.date_created
-
     def isBugBadgeVisible(self):
         return self.show_bug_badge
 

=== modified file 'lib/lp/code/browser/tests/test_branchlisting.py'
--- lib/lp/code/browser/tests/test_branchlisting.py	2011-06-02 20:53:43 +0000
+++ lib/lp/code/browser/tests/test_branchlisting.py	2011-06-30 21:43:40 +0000
@@ -8,7 +8,6 @@
 from datetime import timedelta
 from pprint import pformat
 import re
-import unittest
 
 from lazr.uri import URI
 from storm.expr import (
@@ -422,6 +421,12 @@
         # portlet isn't shown.
         self.assertIs(None, branches)
 
+    def test_branch_listing_last_modified(self):
+        branch = self.factory.makeProductBranch()
+        view = create_initialized_view(
+            branch.product, name="+branches", rootsite='code')
+        self.assertIn('a moment ago', view())
+
 
 class TestProjectGroupBranches(TestCaseWithFactory):
     """Test for the project group branches page."""
@@ -429,7 +434,7 @@
     layer = DatabaseFunctionalLayer
 
     def setUp(self):
-        TestCaseWithFactory.setUp(self)
+        super(TestProjectGroupBranches, self).setUp()
         self.project = self.factory.makeProject()
 
     def test_project_with_no_branch_visibility_rule(self):
@@ -509,7 +514,3 @@
             self.project, name='+branches', rootsite='code')
         table = find_tag_by_id(view(), "branchtable")
         self.assertIsNot(None, table)
-
-
-def test_suite():
-    return unittest.TestLoader().loadTestsFromName(__name__)

=== modified file 'lib/lp/code/templates/branch-listing.pt'
--- lib/lp/code/templates/branch-listing.pt	2011-02-09 00:29:50 +0000
+++ lib/lp/code/templates/branch-listing.pt	2011-06-30 21:43:40 +0000
@@ -119,9 +119,9 @@
             2005-02-12 13:45 EST
           </span>
           <span tal:attributes="title branch/date_created/fmt:datetime"
-                tal:content="branch/since_created/fmt:approximateduration/use-digits">
+                tal:content="branch/date_created/fmt:approximatedate">
             sometime
-            </span> ago
+            </span>
         </td>
         <td tal:condition="context/show_column/product|nothing">
           <a tal:condition="branch/product"
@@ -137,9 +137,9 @@
             2005-02-12 13:45 EST
           </span>
           <span tal:attributes="title branch/date_last_modified/fmt:datetime"
-                tal:content="branch/since_updated/fmt:approximateduration/use-digits">
+                tal:content="branch/date_last_modified/fmt:approximatedate">
             sometime
-          </span> ago
+          </span>
         </td>
 
         <tal:no_commit condition="not: branch/last_commit">

=== modified file 'lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt'
--- lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt	2011-06-29 15:06:32 +0000
+++ lib/lp/code/templates/distributionsourcepackage-branches-grouped.pt	2011-06-30 21:43:40 +0000
@@ -69,7 +69,7 @@
           </td>
           <td>
             <span tal:attributes="title branch/date_last_modified/fmt:datetime"
-                  tal:content="branch/since_updated/fmt:approximateduration/use-digits">
+                  tal:content="branch/date_last_updated/fmt:approximatedate">
               sometime
               </span> ago
           </td>