diff --git a/rhodecode/controllers/changeset.py b/rhodecode/controllers/changeset.py --- a/rhodecode/controllers/changeset.py +++ b/rhodecode/controllers/changeset.py @@ -1,7 +1,15 @@ -#!/usr/bin/env python -# encoding: utf-8 -# changeset controller for pylons -# Copyright (C) 2009-2010 Marcin Kuzminski +# -*- coding: utf-8 -*- +""" + rhodecode.controllers.changeset + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + changeset controller for pylons + + :created_on: Apr 25, 2010 + :author: marcink + :copyright: (C) 2009-2010 Marcin Kuzminski + :license: GPLv3, see COPYING for more details. +""" # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; version 2 @@ -16,24 +24,22 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA. -""" -Created on April 25, 2010 -changeset controller for pylons -@author: marcink -""" +import logging +import traceback + from pylons import tmpl_context as c, url, request, response from pylons.i18n.translation import _ from pylons.controllers.util import redirect + +import rhodecode.lib.helpers as h 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.scm import ScmModel + from vcs.exceptions import RepositoryError, ChangesetError from vcs.nodes import FileNode from vcs.utils import diffs as differ -import logging -import traceback log = logging.getLogger(__name__) @@ -47,7 +53,6 @@ class ChangesetController(BaseController def index(self, revision): hg_model = ScmModel() - cut_off_limit = 1024 * 250 def wrap_to_table(str): @@ -82,7 +87,7 @@ class ChangesetController(BaseController diff = wrap_to_table(_('binary file')) else: c.sum_added += node.size - if c.sum_added < cut_off_limit: + if c.sum_added < self.cut_off_limit: f_udiff = differ.get_udiff(filenode_old, node) diff = differ.DiffProcessor(f_udiff).as_html() @@ -108,7 +113,7 @@ class ChangesetController(BaseController diff = wrap_to_table(_('binary file')) else: - if c.sum_removed < cut_off_limit: + if c.sum_removed < self.cut_off_limit: f_udiff = differ.get_udiff(filenode_old, node) diff = differ.DiffProcessor(f_udiff).as_html() if diff: @@ -151,7 +156,7 @@ class ChangesetController(BaseController for node in c.changeset.added: filenode_old = FileNode(node.path, '') if filenode_old.is_binary or node.is_binary: - diff = _('binary file') +'\n' + diff = _('binary file') + '\n' else: f_udiff = differ.get_udiff(filenode_old, node) diff = differ.DiffProcessor(f_udiff).raw_diff() @@ -173,15 +178,15 @@ class ChangesetController(BaseController c.changes.append(('changed', node, diff, cs1, cs2)) response.content_type = 'text/plain' - + if method == 'download': response.content_disposition = 'attachment; filename=%s.patch' % revision - + parent = True if len(c.changeset.parents) > 0 else False c.parent_tmpl = 'Parent %s' % c.changeset.parents[0].raw_id if parent else '' c.diffs = '' for x in c.changes: c.diffs += x[2] - + return render('changeset/raw_changeset.html')