Mercurial > kallithea
changeset 1044:f3402cb92fdf beta
changed raw and download diffs to gitdiff
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Mon, 14 Feb 2011 16:43:57 +0100 |
parents | 6ec53c16c744 |
children | 3fc9183e05dd |
files | rhodecode/controllers/files.py |
diffstat | 1 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/files.py Mon Feb 14 15:29:53 2011 +0100 +++ b/rhodecode/controllers/files.py Mon Feb 14 16:43:57 2011 +0100 @@ -207,10 +207,10 @@ return redirect(url('files_home', repo_name=c.repo_name, f_path=f_path)) - f_udiff = differ.get_udiff(node1, node2) - diff = differ.DiffProcessor(f_udiff) if c.action == 'download': + diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) + diff_name = '%s_vs_%s.diff' % (diff1, diff2) response.content_type = 'text/plain' response.content_disposition = 'attachment; filename=%s' \ @@ -218,10 +218,13 @@ return diff.raw_diff() elif c.action == 'raw': + diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2)) response.content_type = 'text/plain' return diff.raw_diff() elif c.action == 'diff': + diff = differ.DiffProcessor(differ.get_udiff(node1, node2)) + if node1.size > self.cut_off_limit or node2.size > self.cut_off_limit: c.cur_diff = _('Diff is to big to display') elif node1.is_binary or node2.is_binary: @@ -229,6 +232,7 @@ else: c.cur_diff = diff.as_html() else: + diff = differ.DiffProcessor(differ.get_udiff(node1, node2)) #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')