kallithea Changeset - ce4287e3e3c9

Changeset - ce4287e3e3c9

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-03-10 23:21:16
marcin@python-works.com

changed all instances of udiff into gitdiff, for vcs issue #49

2 files changed with 10 insertions and 10 deletions:

rhodecode/controllers/changeset.py

rhodecode/controllers/files.py

0 comments (0 inline, 0 general)

rhodecode/controllers/changeset.py

➞

Show inline comments

@@ @@ -103,14 +103,14 @@ class ChangesetController(BaseRepoContro @@
                 filenode_old = FileNode(node.path, '', EmptyChangeset())
                 if filenode_old.is_binary or node.is_binary:
                     diff = wrap_to_table(_('binary file'))
                 else:
                     c.sum_added += node.size
                     if c.sum_added < self.cut_off_limit:
                         f_udiff = differ.get_udiff(filenode_old, node)
                         diff = differ.DiffProcessor(f_udiff).as_html()
                         f_gitdiff = differ.get_gitdiff(filenode_old, node)
                         diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').as_html()
                     else:
                         diff = wrap_to_table(_('Changeset is to big and was cut'
                                             ' off, see raw changeset instead'))
                 cs1 = None
@@ @@ -128,14 +128,14 @@ class ChangesetController(BaseRepoContro @@
                 if filenode_old.is_binary or node.is_binary:
                     diff = wrap_to_table(_('binary file'))
                 else:
                     if c.sum_removed < self.cut_off_limit:
                         f_udiff = differ.get_udiff(filenode_old, node)
                         diff = differ.DiffProcessor(f_udiff).as_html()
                         f_gitdiff = differ.get_gitdiff(filenode_old, node)
                         diff = differ.DiffProcessor(f_gitdiff, format='gitdiff').as_html()
                         if diff:
                             c.sum_removed += len(diff)
                     else:
                         diff = wrap_to_table(_('Changeset is to big and was cut'
                                             ' off, see raw changeset instead'))
@@ @@ -176,26 +176,26 @@ class ChangesetController(BaseRepoContro @@
             for node in c.changeset.added:
                 filenode_old = FileNode(node.path, '')
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file') + '\n'
                 else:
                     f_udiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_udiff).raw_diff()
                     f_gitdiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_gitdiff).raw_diff()
                 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_parent.get_node(node.path)
                 if filenode_old.is_binary or node.is_binary:
                     diff = _('binary file')
                 else:
                     f_udiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_udiff).raw_diff()
                     f_gitdiff = differ.get_gitdiff(filenode_old, node)
                     diff = differ.DiffProcessor(f_gitdiff).raw_diff()
                 cs1 = filenode_old.last_changeset.raw_id
                 cs2 = node.last_changeset.raw_id
                 c.changes.append(('changed', node, diff, cs1, cs2))
         response.content_type = 'text/plain'

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -239,22 +239,22 @@ class FilesController(BaseRepoController @@
         elif c.action == 'raw':
             diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
             response.content_type = 'text/plain'
             return diff.raw_diff()
         elif c.action == 'diff':
-            diff = differ.DiffProcessor(differ.get_udiff(node1, node2))
+            diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
             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:
                 c.cur_diff = _('Binary file')
             else:
                 c.cur_diff = diff.as_html()
         else:
-            diff = differ.DiffProcessor(differ.get_udiff(node1, node2))
+            diff = differ.DiffProcessor(differ.get_gitdiff(node1, node2))
             #default option
             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:
                 c.cur_diff = _('Binary file')
             else:

0 comments (0 inline, 0 general)