Mercurial > kallithea
changeset 649:3765f0f479a2 beta
fixed raw diff as purly raw without html
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Wed, 03 Nov 2010 16:18:45 +0100 |
| parents | 74bbfdd47884 |
| children | 0c065f793d0e |
| files | rhodecode/controllers/changeset.py rhodecode/controllers/files.py |
| diffstat | 2 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py Wed Nov 03 16:09:12 2010 +0100 +++ b/rhodecode/controllers/changeset.py Wed Nov 03 16:18:45 2010 +0100 @@ -16,7 +16,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. -from rhodecode.lib.utils import EmptyChangeset """ Created on April 25, 2010 changeset controller for pylons @@ -27,6 +26,7 @@ from pylons.controllers.util import redirect from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator from rhodecode.lib.base import BaseController, render +from rhodecode.lib.utils import EmptyChangeset import rhodecode.lib.helpers as h from rhodecode.model.hg import HgModel from vcs.exceptions import RepositoryError, ChangesetError @@ -181,5 +181,5 @@ c.diffs = '' for x in c.changes: c.diffs += x[2] - + return render('changeset/raw_changeset.html')
--- a/rhodecode/controllers/files.py Wed Nov 03 16:09:12 2010 +0100 +++ b/rhodecode/controllers/files.py Wed Nov 03 16:18:45 2010 +0100 @@ -189,7 +189,9 @@ return diff.raw_diff() elif c.action == 'raw': - c.cur_diff = '<pre class="raw">%s</pre>' % h.escape(diff.raw_diff()) + response.content_type = 'text/plain' + return diff.raw_diff() + elif c.action == 'diff': if node1.size > c.file_size_limit or node2.size > c.file_size_limit: c.cur_diff = _('Diff is to big to display')