Mercurial > kallithea
changeset 1125:ce4287e3e3c9 beta
changed all instances of udiff into gitdiff, for vcs issue #49
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 10 Mar 2011 23:21:16 +0100 |
| parents | c52de8aa10e0 |
| children | e654898120b6 a31b0bf8c9a7 |
| files | rhodecode/controllers/changeset.py rhodecode/controllers/files.py |
| diffstat | 2 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/changeset.py Wed Mar 09 22:58:43 2011 +0100 +++ b/rhodecode/controllers/changeset.py Thu Mar 10 23:21:16 2011 +0100 @@ -106,8 +106,8 @@ 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 @@ 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 @@ 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 @@ 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
--- a/rhodecode/controllers/files.py Wed Mar 09 22:58:43 2011 +0100 +++ b/rhodecode/controllers/files.py Thu Mar 10 23:21:16 2011 +0100 @@ -242,7 +242,7 @@ 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 @@ 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')