--- a/mercurial/hgweb/webutil.py	Sun Jan 11 23:04:24 2009 -0600
+++ b/mercurial/hgweb/webutil.py	Mon Jan 12 10:42:31 2009 -0600
@@ -7,10 +7,8 @@
 # of the GNU General Public License, incorporated herein by reference.
 
 import os, copy
-from mercurial import match, patch
+from mercurial import match, patch, util, error
 from mercurial.node import hex, nullid
-from mercurial.repo import RepoError
-from mercurial import util
 
 def up(p):
     if p[0] != "/":
@@ -55,7 +53,7 @@
                 yield {"label": label, "node": node}
 
             yield {"label": "tip", "node": "tip"}
-        except RepoError:
+        except error.RepoError:
             pass
 
     return nav
@@ -124,7 +122,7 @@
 
     try:
         ctx = repo[changeid]
-    except RepoError:
+    except error.RepoError:
         man = repo.manifest
         ctx = repo[man.linkrev(man.rev(man.lookup(changeid)))]
 
@@ -138,7 +136,7 @@
         changeid = req.form['filenode'][0]
     try:
         fctx = repo[changeid][path]
-    except RepoError:
+    except error.RepoError:
         fctx = repo.filectx(path, fileid=changeid)
 
     return fctx