##// END OF EJS Templates
upstream » kallithea
RSS

Clone from https://kallithea-scm.org/repos/kallithea

fixed files diffs to use gitdiff enabled diffs
marcink -
r1132:c4b59dcf beta
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -228,7 +228,8 b' class FilesController(BaseRepoController'
228 228
229 229
230 230 if c.action == 'download':
231 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
231 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
232 format='gitdiff')
232 233
233 234 diff_name = '%s_vs_%s.diff' % (diff1, diff2)
234 235 response.content_type = 'text/plain'
@@ -237,12 +238,14 b' class FilesController(BaseRepoController'
237 238 return diff.raw_diff()
238 239
239 240 elif c.action == 'raw':
240 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
241 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
242 format='gitdiff')
241 243 response.content_type = 'text/plain'
242 244 return diff.raw_diff()
243 245
244 246 elif c.action == 'diff':
245 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
247 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
248 format='gitdiff')
246 249
247 250 if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:
248 251 c.cur_diff = _('Diff is to big to display')
@@ -251,7 +254,8 b' class FilesController(BaseRepoController'
251 254 else:
252 255 c.cur_diff = diff.as_html()
253 256 else:
254 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
257 diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2),
258 format='gitdiff')
255 259 #default option
256 260 if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit:
257 261 c.cur_diff = _('Diff is to big to display')
General Comments 0
You need to be logged in to leave comments. Login now