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

@@ @@ -106,8 +106,8 @@ class ChangesetController(BaseRepoContro @@
                 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'
@@ @@ -131,8 +131,8 @@ class ChangesetController(BaseRepoContro @@
                 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:
@@ @@ -179,8 +179,8 @@ class ChangesetController(BaseRepoContro @@
                 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
@@ @@ -191,8 +191,8 @@ class ChangesetController(BaseRepoContro @@
                 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

rhodecode/controllers/files.py

➞

Show inline comments

@@ @@ -242,7 +242,7 @@ class FilesController(BaseRepoController @@
             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')
@@ @@ -251,7 +251,7 @@ class FilesController(BaseRepoController @@
             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')

0 comments (0 inline, 0 general)