# HG changeset patch # User Marcin Kuzminski # Date 1276033721 -7200 # Node ID cad478edb1c7e7f964431d26ba342d8cd97f6bea # Parent a83e86e3f580ad5ae82f7925210b5c5c7ff896a4 added support for binary files, and, protection again unicode decode errors that might occure in changesets views diff -r a83e86e3f580 -r cad478edb1c7 pylons_app/controllers/changeset.py --- a/pylons_app/controllers/changeset.py Tue Jun 08 23:02:24 2010 +0200 +++ b/pylons_app/controllers/changeset.py Tue Jun 08 23:48:41 2010 +0200 @@ -48,17 +48,39 @@ for node in c.changeset.added: filenode_old = FileNode(node.path, '') - f_udiff = differ.get_udiff(filenode_old, node) - diff = differ.DiffProcessor(f_udiff).as_html() - c.changes.append(('added', node, diff)) + 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() + 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) - f_udiff = differ.get_udiff(filenode_old, node) - diff = differ.DiffProcessor(f_udiff).as_html() - c.changes.append(('changed', node, diff)) + 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() + 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')