Mercurial > kallithea
changeset 3573:881ae12b3c7d beta
report ChangesetDoesNotExistError as an error but don't lose the repo context
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Wed, 20 Mar 2013 16:58:38 +0100 |
| parents | db62c05837e5 |
| children | 000653f7cdf9 |
| files | rhodecode/controllers/changelog.py rhodecode/controllers/changeset.py rhodecode/controllers/files.py |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changelog.py Wed Mar 20 15:00:31 2013 +0100 +++ b/rhodecode/controllers/changelog.py Wed Mar 20 16:58:38 2013 +0100 @@ -86,8 +86,8 @@ 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)
--- a/rhodecode/controllers/changeset.py Wed Mar 20 15:00:31 2013 +0100 +++ b/rhodecode/controllers/changeset.py Wed Mar 20 16:58:38 2013 +0100 @@ -203,8 +203,8 @@ 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()
--- a/rhodecode/controllers/files.py Wed Mar 20 15:00:31 2013 +0100 +++ b/rhodecode/controllers/files.py Wed Mar 20 16:58:38 2013 +0100 @@ -89,8 +89,8 @@ 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 @@ 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))