# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-03-20 15:58:38
# Node ID 881ae12b3c7d9dd46d13815befa1902b12356aa8
# Parent  db62c05837e5eb303be9676975edb71faeb1ae6a

report ChangesetDoesNotExistError as an error but don't lose the repo context

diff --git a/rhodecode/controllers/changelog.py b/rhodecode/controllers/changelog.py
--- a/rhodecode/controllers/changelog.py
+++ b/rhodecode/controllers/changelog.py
@@ -86,8 +86,8 @@ class ChangelogController(BaseRepoContro
             c.statuses = c.rhodecode_db_repo.statuses(page_revisions)
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
-            h.flash(str(e), category='warning')
-            return redirect(url('home'))
+            h.flash(str(e), category='error')
+            return redirect(url('changelog_home', repo_name=c.repo_name))
 
         self._graph(c.rhodecode_repo, collection, c.total_cs, c.size, p)
 
diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py
--- a/rhodecode/controllers/changeset.py
+++ b/rhodecode/controllers/changeset.py
@@ -203,8 +203,8 @@ class ChangesetController(BaseRepoContro
 
         except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
             log.error(traceback.format_exc())
-            h.flash(str(e), category='warning')
-            return redirect(url('home'))
+            h.flash(str(e), category='error')
+            return redirect(url('changeset_home', repo_name=c.repo_name))
 
         c.changes = OrderedDict()
 
diff --git a/rhodecode/controllers/files.py b/rhodecode/controllers/files.py
--- a/rhodecode/controllers/files.py
+++ b/rhodecode/controllers/files.py
@@ -89,8 +89,8 @@ class FilesController(BaseRepoController
                     category='warning')
             redirect(h.url('summary_home', repo_name=repo_name))
 
-        except RepositoryError, e:
-            h.flash(str(e), category='warning')
+        except RepositoryError, e: # including ChangesetDoesNotExistError
+            h.flash(str(e), category='error')
             redirect(h.url('files_home', repo_name=repo_name, revision='tip'))
 
     def __get_filenode_or_redirect(self, repo_name, cs, path):
@@ -108,7 +108,7 @@ class FilesController(BaseRepoController
             if file_node.is_dir():
                 raise RepositoryError('given path is a directory')
         except RepositoryError, e:
-            h.flash(str(e), category='warning')
+            h.flash(str(e), category='error')
             redirect(h.url('files_home', repo_name=repo_name,
                            revision=cs.raw_id))