Mercurial > kallithea
changeset 1132:c4b59dcf063e beta
fixed files diffs to use gitdiff enabled diffs
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 13 Mar 2011 17:20:39 +0100 |
| parents | 461f5acc7bbb |
| children | 07fcf1683503 |
| files | rhodecode/controllers/files.py |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/files.py Sun Mar 13 15:01:49 2011 +0100 +++ b/rhodecode/controllers/files.py Sun Mar 13 17:20:39 2011 +0100 @@ -228,7 +228,8 @@ if c.action == 'download': - diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) + diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2), + format='gitdiff') diff_name = '%s_vs_%s.diff' % (diff1, diff2) response.content_type = 'text/plain' @@ -237,12 +238,14 @@ return diff.raw_diff() elif c.action == 'raw': - diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) + diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2), + format='gitdiff') response.content_type = 'text/plain' return diff.raw_diff() elif c.action == 'diff': - diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) + diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2), + format='gitdiff') if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: c.cur_diff = _('Diff is to big to display') @@ -251,7 +254,8 @@ else: c.cur_diff = diff.as_html() else: - diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) + diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2), + format='gitdiff') #default option if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: c.cur_diff = _('Diff is to big to display')