Mercurial > kallithea
changeset 131:49c7e191c2cd
Implemented mercurial style diff-lib
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Fri, 07 May 2010 01:02:47 +0200 |
| parents | ffddbd80649e |
| children | 20680c6b0a7f |
| files | pylons_app/controllers/files.py |
| diffstat | 1 files changed, 9 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/pylons_app/controllers/files.py Tue May 04 13:45:17 2010 +0200 +++ b/pylons_app/controllers/files.py Fri May 07 01:02:47 2010 +0200 @@ -6,6 +6,9 @@ from pylons_app.lib.base import BaseController, render from pylons_app.lib.utils import get_repo_slug from pylons_app.model.hg_model import HgModel +from difflib import unified_diff +from pylons_app.lib.differ import render_udiff + log = logging.getLogger(__name__) class FilesController(BaseController): @@ -29,6 +32,7 @@ hg_model = HgModel() diff1 = request.GET.get('diff1') diff2 = request.GET.get('diff2') + c.no_changes = diff1 == diff2 c.f_path = f_path c.repo = hg_model.get_repo(c.repo_name) c.changeset_1 = c.repo.get_changeset(diff1) @@ -38,14 +42,12 @@ c.file_2 = c.changeset_2.get_node(f_path).content c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short) c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short) - from difflib import unified_diff - d = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1)) - c.diff = ''.join(d) + + d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1)) + c.diff_files = render_udiff(udiff=d2) - 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) - + if len(c.diff_files) < 1: + c.no_changes = True return render('files/file_diff.html') def _get_history(self, repo, node, f_path):