Merge lp:~mkanat/loggerhead/bad-revno-404 into lp:loggerhead

[Max Kanat-Alexander]

This prevents throwing a traceback (thus causing an OOPS on launchpad) when somebody picks an invalid revision on almost any page of loggerhead.

We now simply return a 404 instead.

[Michael Hudson-Doyle (mwhudson)]

Thanks :-)

review: Approve

=== modified file 'loggerhead/controllers/__init__.py'
--- loggerhead/controllers/__init__.py	2010-12-03 17:11:21 +0000
+++ loggerhead/controllers/__init__.py	2011-01-11 00:38:12 +0000
@@ -17,9 +17,11 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
+import bzrlib.errors
 import os
 import time
 
+from paste.httpexceptions import HTTPNotFound
 from paste.request import path_info_pop, parse_querystring
 
 from loggerhead import util
@@ -139,9 +141,13 @@
         if h is None:
             return None
         if len(self.args) > 0 and self.args != ['']:
-            return h.fix_revid(self.args[0])
+            try:
+                revid = h.fix_revid(self.args[0])
+            except bzrlib.errors.NoSuchRevision:
+                raise HTTPNotFound;
         else:
-            return h.last_revid
+            revid = h.last_revid
+        return revid
 
     def tree_for(self, file_id, revid):
         file_revid = self._history.get_inventory(revid)[file_id].revision