##// END OF EJS Templates
#93 fixed errors on new revranges generation
marcink -
r978:6d223936 beta
parent child Browse files
Show More
@@ -38,7 +38,8 b' from rhodecode.lib.base import BaseContr'
38 from rhodecode.lib.utils import EmptyChangeset
38 from rhodecode.lib.utils import EmptyChangeset
39 from rhodecode.model.scm import ScmModel
39 from rhodecode.model.scm import ScmModel
40
40
41 from vcs.exceptions import RepositoryError, ChangesetError
41 from vcs.exceptions import RepositoryError, ChangesetError, \
42 ChangesetDoesNotExistError
42 from vcs.nodes import FileNode
43 from vcs.nodes import FileNode
43 from vcs.utils import diffs as differ
44 from vcs.utils import diffs as differ
44 from vcs.utils.ordered_dict import OrderedDict
45 from vcs.utils.ordered_dict import OrderedDict
@@ -77,7 +78,7 b' class ChangesetController(BaseController'
77 end_cs = repo.get_changeset(rev_end)
78 end_cs = repo.get_changeset(rev_end)
78
79
79 if start_cs.revision >= end_cs.revision:
80 if start_cs.revision >= end_cs.revision:
80 raise Exception('Start cannot be after End')
81 raise Exception('Start revision cannot be after End')
81
82
82 yield start_cs
83 yield start_cs
83
84
@@ -100,10 +101,11 b' class ChangesetController(BaseController'
100 rev_start = rev_range[0]
101 rev_start = rev_range[0]
101 rev_end = rev_range[1]
102 rev_end = rev_range[1]
102 rev_ranges = get_cs_range(repo, rev_start, rev_end)
103 rev_ranges = get_cs_range(repo, rev_start, rev_end)
104 c.cs_ranges = list(rev_ranges)
103
105
104 else:
106 else:
105 rev_ranges = [repo.get_changeset(revision)]
107 rev_ranges = [repo.get_changeset(revision)]
106 except RepositoryError, e:
108 except (RepositoryError, ChangesetDoesNotExistError, Exception), e:
107 log.error(traceback.format_exc())
109 log.error(traceback.format_exc())
108 h.flash(str(e), category='warning')
110 h.flash(str(e), category='warning')
109 return redirect(url('home'))
111 return redirect(url('home'))
@@ -112,7 +114,6 b' class ChangesetController(BaseController'
112 c.sum_added = 0
114 c.sum_added = 0
113 c.sum_removed = 0
115 c.sum_removed = 0
114
116
115 c.cs_ranges = list(rev_ranges)
116
117
117 for changeset in c.cs_ranges:
118 for changeset in c.cs_ranges:
118 c.changes[changeset.raw_id] = []
119 c.changes[changeset.raw_id] = []
General Comments 0
You need to be logged in to leave comments. Login now