Show More
@@ -106,8 +106,8 b' class ChangesetController(BaseRepoContro' | |||||
106 | else: |
|
106 | else: | |
107 | c.sum_added += node.size |
|
107 | c.sum_added += node.size | |
108 | if c.sum_added < self.cut_off_limit: |
|
108 | if c.sum_added < self.cut_off_limit: | |
109 |
f_ |
|
109 | f_gitdiff = differ.get_gitdiff(filenode_old, node) | |
110 |
diff = differ.DiffProcessor(f_ |
|
110 | diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').as_html() | |
111 |
|
111 | |||
112 | else: |
|
112 | else: | |
113 | diff = wrap_to_table(_('Changeset is to big and was cut' |
|
113 | diff = wrap_to_table(_('Changeset is to big and was cut' | |
@@ -131,8 +131,8 b' class ChangesetController(BaseRepoContro' | |||||
131 | else: |
|
131 | else: | |
132 |
|
132 | |||
133 | if c.sum_removed < self.cut_off_limit: |
|
133 | if c.sum_removed < self.cut_off_limit: | |
134 |
f_ |
|
134 | f_gitdiff = differ.get_gitdiff(filenode_old, node) | |
135 |
diff = differ.DiffProcessor(f_ |
|
135 | diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').as_html() | |
136 | if diff: |
|
136 | if diff: | |
137 | c.sum_removed += len(diff) |
|
137 | c.sum_removed += len(diff) | |
138 | else: |
|
138 | else: | |
@@ -179,8 +179,8 b' class ChangesetController(BaseRepoContro' | |||||
179 | if filenode_old.is_binary or node.is_binary: |
|
179 | if filenode_old.is_binary or node.is_binary: | |
180 | diff = _('binary file') + '\n' |
|
180 | diff = _('binary file') + '\n' | |
181 | else: |
|
181 | else: | |
182 |
f_ |
|
182 | f_gitdiff = differ.get_gitdiff(filenode_old, node) | |
183 |
diff = differ.DiffProcessor(f_ |
|
183 | diff = differ.DiffProcessor(f_gitdiff).raw_diff() | |
184 |
|
184 | |||
185 | cs1 = None |
|
185 | cs1 = None | |
186 | cs2 = node.last_changeset.raw_id |
|
186 | cs2 = node.last_changeset.raw_id | |
@@ -191,8 +191,8 b' class ChangesetController(BaseRepoContro' | |||||
191 | if filenode_old.is_binary or node.is_binary: |
|
191 | if filenode_old.is_binary or node.is_binary: | |
192 | diff = _('binary file') |
|
192 | diff = _('binary file') | |
193 | else: |
|
193 | else: | |
194 |
f_ |
|
194 | f_gitdiff = differ.get_gitdiff(filenode_old, node) | |
195 |
diff = differ.DiffProcessor(f_ |
|
195 | diff = differ.DiffProcessor(f_gitdiff).raw_diff() | |
196 |
|
196 | |||
197 | cs1 = filenode_old.last_changeset.raw_id |
|
197 | cs1 = filenode_old.last_changeset.raw_id | |
198 | cs2 = node.last_changeset.raw_id |
|
198 | cs2 = node.last_changeset.raw_id |
@@ -242,7 +242,7 b' class FilesController(BaseRepoController' | |||||
242 | return diff.raw_diff() |
|
242 | return diff.raw_diff() | |
243 |
|
243 | |||
244 | elif c.action == 'diff': |
|
244 | elif c.action == 'diff': | |
245 |
diff = differ.DiffProcessor(differ.get_ |
|
245 | diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) | |
246 |
|
246 | |||
247 | if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: |
|
247 | if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: | |
248 | c.cur_diff = _('Diff is to big to display') |
|
248 | c.cur_diff = _('Diff is to big to display') | |
@@ -251,7 +251,7 b' class FilesController(BaseRepoController' | |||||
251 | else: |
|
251 | else: | |
252 | c.cur_diff = diff.as_html() |
|
252 | c.cur_diff = diff.as_html() | |
253 | else: |
|
253 | else: | |
254 |
diff = differ.DiffProcessor(differ.get_ |
|
254 | diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) | |
255 | #default option |
|
255 | #default option | |
256 | if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: |
|
256 | if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: | |
257 | c.cur_diff = _('Diff is to big to display') |
|
257 | c.cur_diff = _('Diff is to big to display') |
General Comments 0
You need to be logged in to leave comments.
Login now