Merge lp:~mnordhoff/loggerhead/valid-feed into lp:loggerhead

[Matt Nordhoff]

[Matt Nordhoff (mnordhoff)]

This makes the Atom feed valid (bug #247162).

There's still one warning left because the URLs used in the <id>s are URL-encoded, so they're not in the "canonical form". I don't know what should be done, and it's just a warning, so it's probably not vital. Anyway, I'm not making it any *worse*.

At least I fixed all of the outright errors.

"change" objects store only the commit time, in local time, with no time zone information, while Atom feeds need a time + time zone. (See bug #376842.) As a simple, non-invasive and slightly evil solution, I just added a "utc_date" attribute and use UTC time in the feed. There are better fixes available, but it would be more complicated, and dealing with time zones makes my brain hurt, so this is all you're going to get from me any time soon. :P

[lp:~mnordhoff/loggerhead/valid-feed]

353. By Matt Nordhoff on 2009-06-06

Syntax (whitespace) tweak

[Martin Albisetti (beuno)]

Looks good, go ahead and merge.

review: Approve

=== modified file 'NEWS'
--- NEWS	2009-06-05 01:59:11 +0000
+++ NEWS	2009-06-06 09:26:45 +0000
@@ -124,6 +124,8 @@
 
     - Fix logging 404 Not Found responses (Matt Nordhoff, #381029)
 
+    - Make sure the Atom feeds (nearly) validate. (Matt Nordhoff, #247162)
+
 1.10 [22Dec2008]
 ---------------
 
 
=== modified file 'loggerhead/controllers/atom_ui.py'
--- loggerhead/controllers/atom_ui.py	2008-12-05 18:52:44 +0000
+++ loggerhead/controllers/atom_ui.py	2009-06-06 09:09:55 +0000
@@ -35,6 +35,6 @@
         headers['Content-Type'] = 'application/atom+xml'
         return {
             'changes': entries,
-            'updated': entries[0].date.isoformat() + 'Z',
+            'updated': entries[0].utc_date.isoformat(),
             'history': self._history,
         }
 
=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2009-05-28 22:48:45 +0000
+++ loggerhead/history.py	2009-06-06 09:16:19 +0000
@@ -660,8 +660,6 @@
         Given a bzrlib Revision, return a processed "change" for use in
         templates.
         """
-        commit_time = datetime.datetime.fromtimestamp(revision.timestamp)
-
         parents = [util.Container(revid=r,
                    revno=self.get_revno(r)) for r in revision.parent_ids]
 
@@ -674,7 +672,8 @@
 
         entry = {
             'revid': revision.revision_id,
-            'date': commit_time,
+            'date': datetime.datetime.fromtimestamp(revision.timestamp),
+            'utc_date': datetime.datetime.utcfromtimestamp(revision.timestamp),
             'authors': authors,
             'branch_nick': revision.properties.get('branch-nick', None),
             'short_comment': short_message,
 
=== modified file 'loggerhead/templates/atom.pt'
--- loggerhead/templates/atom.pt	2009-03-06 09:57:54 +0000
+++ loggerhead/templates/atom.pt	2009-06-06 09:25:53 +0000
@@ -3,17 +3,19 @@
   <title>
     bazaar changes for <tal:branch-name content="branch/friendly_name">branch name</tal:branch-name>
   </title>
-  <updated tal:content="updated">${updated}</updated>
+  <updated tal:content="string:${updated}Z">${updated}</updated>
   <id tal:content="python:branch.url(['/atom'])">url</id>
-  <link rel="self" tal:attributes="href python:branch.url([''])" />
+  <link rel="self" type="application/atom+xml" tal:attributes="href python:branch.url(['/atom'])" />
+  <link rel="alternate" type="text/html" tal:attributes="href python:branch.url(['/changes'])" />
 
   <entry tal:repeat="entry changes">
     <title tal:content="string: ${entry/revno}: ${entry/short_comment}">
       ${entry/revno}: ${entry/short_comment}
     </title>
-    <updated tal:content="entry/date/isoformat">
-    Z
+    <updated tal:content="string: ${entry/utc_date/isoformat}Z">
+      updated
     </updated>
+    <!-- TODO: The feed validator will generate warnings because this is URL-encoded -->
     <id tal:content="python:branch.url(['/revision', entry.revno])">
       ID
     </id>
@@ -25,7 +27,7 @@
     <content type="text" tal:content="entry/comment">
       comment
     </content>
-    <link rel="alternate"
+    <link rel="alternate" type="text/html"
           tal:attributes="href python:branch.url(['/revision', entry.revno])" />
   </entry>
 </feed>