kallithea Changeset - 49c7e191c2cd

Changeset - 49c7e191c2cd

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Marcin Kuzminski - 16 years ago 2010-05-07 01:02:47
marcin@python-works.com

Implemented mercurial style diff-lib

1 file changed with 9 insertions and 7 deletions:

pylons_app/controllers/files.py

0 comments (0 inline, 0 general)

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -3,12 +3,15 @@ import logging @@
 from pylons import request, response, session, tmpl_context as c, url, config, app_globals as g
 from pylons.controllers.util import abort, redirect
 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):
     def __before__(self):
         c.repos_prefix = config['repos_name']
         c.repo_name = get_repo_slug(request)
@@ @@ -26,29 +29,28 @@ class FilesController(BaseController): @@
         return render('files/files.html')
     def diff(self, repo_name, f_path):
         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)
         c.changeset_2 = c.repo.get_changeset(diff2)
         c.file_1 = c.changeset_1.get_node(f_path).content
         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):
         from vcs.nodes import NodeKind
         if not node.kind is NodeKind.FILE:
             return []

0 comments (0 inline, 0 general)