Mercurial > kallithea
diff rhodecode/controllers/files.py @ 1232:0dc8d578ff49
merges for stable
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sat, 09 Apr 2011 18:38:18 +0200 |
parents | 3d9da7893fdb |
children | 438524e84c57 |
line wrap: on
line diff
--- a/rhodecode/controllers/files.py Sat Apr 09 17:13:15 2011 +0200 +++ b/rhodecode/controllers/files.py Sat Apr 09 18:38:18 2011 +0200 @@ -7,7 +7,7 @@ :created_on: Apr 21, 2010 :author: marcink - :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com> + :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com> :license: GPLv3, see COPYING for more details. """ # This program is free software: you can redistribute it and/or modify @@ -45,6 +45,7 @@ log = logging.getLogger(__name__) + class FilesController(BaseController): @LoginRequired() @@ -58,7 +59,7 @@ """ Safe way to get changeset if error occur it redirects to tip with proper message - + :param rev: revision to fetch :param repo_name: repo name to redirect after """ @@ -228,10 +229,11 @@ return diff.raw_diff() elif c.action == 'diff': - 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: + if node1.is_binary or node2.is_binary: c.cur_diff = _('Binary file') + elif node1.size > self.cut_off_limit or \ + node2.size > self.cut_off_limit: + c.cur_diff = _('Diff is too big to display') else: c.cur_diff = diff.as_html() else: