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

@@ @@ -77,26 +77,26 @@ class ChangelogController(BaseRepoContro @@
             else:
                 collection = c.rhodecode_repo
                 c.total_cs = len(c.rhodecode_repo)
             c.pagination = RepoPage(collection, page=p, item_count=c.total_cs,
                                     items_per_page=c.size, branch=branch_name)
             collection = list(c.pagination)
             page_revisions = [x.raw_id for x in collection]
             c.comments = c.rhodecode_db_repo.get_comments(page_revisions)
             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)
         c.branch_name = branch_name
         c.branch_filters = [('', _('All Branches'))] + \
             [(k, k) for k in c.rhodecode_repo.branches.keys()]
         return render('changelog/changelog.html')
     def changelog_details(self, cs):
         if request.environ.get('HTTP_X_PARTIAL_XHR'):
             c.cs = c.rhodecode_repo.get_changeset(cs)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -194,26 +194,26 @@ class ChangesetController(BaseRepoContro @@
                 rev_end = rev_range[1]
                 rev_ranges = c.rhodecode_repo.get_changesets(start=rev_start,
                                                              end=rev_end)
             else:
                 rev_ranges = [c.rhodecode_repo.get_changeset(revision)]
             c.cs_ranges = list(rev_ranges)
             if not c.cs_ranges:
                 raise RepositoryError('Changeset range returned empty result')
         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()
         c.lines_added = 0  # count of lines added
         c.lines_deleted = 0  # count of lines removes
         c.changeset_statuses = ChangesetStatus.STATUSES
         c.comments = []
         c.statuses = []
         c.inline_comments = []
         c.inline_cnt = 0

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -80,44 +80,44 @@ class FilesController(BaseRepoController @@
             return c.rhodecode_repo.get_changeset(rev)
         except EmptyRepositoryError, e:
             if not redirect_after:
                 return None
             url_ = url('files_add_home',
                        repo_name=c.repo_name,
                        revision=0, f_path='')
             add_new = h.link_to(_('click here to add new file'), url_)
             h.flash(h.literal(_('There are no files yet %s') % add_new),
                     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):
         """
         Returns file_node, if error occurs or given path is directory,
         it'll redirect to top level path
         :param repo_name: repo_name
         :param cs: given changeset
         :param path: path to lookup
         """
         try:
             file_node = cs.get_node(path)
             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))
         return file_node
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def index(self, repo_name, revision, f_path, annotate=False):
         # redirect to given revision from form if given
         post_revision = request.POST.get('at_rev', None)
         if post_revision:

0 comments (0 inline, 0 general)