kallithea Changeset - 881ae12b3c7d

Changeset - 881ae12b3c7d

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Mads Kiilerich - 13 years ago 2013-03-20 16:58:38
madski@unity3d.com

Transplanted from: 6d7b3fd18f22

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

3 files changed with 7 insertions and 7 deletions:

rhodecode/controllers/changelog.py

rhodecode/controllers/changeset.py

rhodecode/controllers/files.py

0 comments (0 inline, 0 general)

rhodecode/controllers/changelog.py

➞

Show inline comments

@@ @@ -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)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -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()

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -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))

0 comments (0 inline, 0 general)