Mercurial > public > src > rhodecode
diff pylons_app/controllers/files.py @ 130:ffddbd80649e
Added differ lib from mercurial.
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 04 May 2010 13:45:17 +0200 |
| parents | 42d46deb124d |
| children | 49c7e191c2cd |
line wrap: on
line diff
--- a/pylons_app/controllers/files.py Tue May 04 00:54:00 2010 +0200 +++ b/pylons_app/controllers/files.py Tue May 04 13:45:17 2010 +0200 @@ -41,6 +41,11 @@ from difflib import unified_diff d = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1)) c.diff = ''.join(d) + + from pylons_app.lib.differ import render_udiff + d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1)) + c.diff_2 = render_udiff(udiff=d2) + return render('files/file_diff.html') def _get_history(self, repo, node, f_path):