kallithea Changeset - cad478edb1c7

Changeset - cad478edb1c7

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 15 years ago 2010-06-08 23:48:41
marcin@python-works.com

added support for binary files, and, protection again unicode decode errors that might occure in changesets views

1 file changed with 25 insertions and 3 deletions:

pylons_app/controllers/changeset.py

0 comments (0 inline, 0 general)

pylons_app/controllers/changeset.py

➞

Show inline comments

@@ @@ -3,62 +3,84 @@ @@
 # changeset controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
 # 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
 # of the License or (at your opinion) any later version of the license.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # 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
 """
 from pylons import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 from vcs.utils import diffs as differ
 import logging
 from vcs.nodes import FileNode
 log = logging.getLogger(__name__)
 class ChangesetController(BaseController):
     @LoginRequired()
     def __before__(self):
         super(ChangesetController, self).__before__()
     def index(self, revision):
         hg_model = HgModel()
         c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
         c.changeset_old = c.changeset.parents[0]
         c.changes = []
         for node in c.changeset.added:
             filenode_old = FileNode(node.path, '')
             if filenode_old.is_binary or node.is_binary:
                 diff = 'binary file'
             else:
             f_udiff = differ.get_udiff(filenode_old, node)
             diff = differ.DiffProcessor(f_udiff).as_html()
             c.changes.append(('added', node, diff))
                 try:
                     diff = unicode(diff)
                 except:
                     log.warning('Decoding failed of %s', filenode_old)
                     log.warning('Decoding failed of %s', node)
                     diff = 'unsupported type'
             cs1 = None
             cs2 = node.last_changeset.raw_id
             c.changes.append(('added', node, diff, cs1, cs2))
         for node in c.changeset.changed:
             filenode_old = c.changeset_old.get_node(node.path)
             if filenode_old.is_binary or node.is_binary:
                 diff = 'binary file'
             else:
             f_udiff = differ.get_udiff(filenode_old, node)
             diff = differ.DiffProcessor(f_udiff).as_html()
             c.changes.append(('changed', node, diff))
                 try:
                     diff = unicode(diff)
                 except:
                     log.warning('Decoding failed of %s', filenode_old)
                     log.warning('Decoding failed of %s', node)
                     diff = 'unsupported type'
             cs1 = filenode_old.last_changeset.raw_id
             cs2 = node.last_changeset.raw_id
             c.changes.append(('changed', node, diff, cs1, cs2))
         for node in c.changeset.removed:
             c.changes.append(('removed', node, None))
+            c.changes.append(('removed', node, None, None, None))
         return render('changeset/changeset.html')

0 comments (0 inline, 0 general)