files.py
60 lines
| 2.2 KiB
| text/x-python
|
PythonLexer
r93 | import logging | |||
r99 | from pylons import request, response, session, tmpl_context as c, url, config, app_globals as g | |||
r93 | from pylons.controllers.util import abort, redirect | |||
from pylons_app.lib.base import BaseController, render | ||||
r99 | from pylons_app.lib.utils import get_repo_slug | |||
from pylons_app.model.hg_model import HgModel | ||||
r93 | log = logging.getLogger(__name__) | |||
class FilesController(BaseController): | ||||
r99 | def __before__(self): | |||
c.repos_prefix = config['repos_name'] | ||||
c.repo_name = get_repo_slug(request) | ||||
r93 | ||||
r99 | def index(self, repo_name, revision, f_path): | |||
hg_model = HgModel() | ||||
c.repo = repo = hg_model.get_repo(c.repo_name) | ||||
c.cur_rev = revision | ||||
c.f_path = f_path | ||||
r106 | c.changeset = repo.get_changeset(repo._get_revision(revision)) | |||
r99 | ||||
c.files_list = c.changeset.get_node(f_path) | ||||
r128 | c.file_history = self._get_history(repo, c.files_list, f_path) | |||
return render('files/files.html') | ||||
r129 | def diff(self, repo_name, f_path): | |||
hg_model = HgModel() | ||||
diff1 = request.GET.get('diff1') | ||||
diff2 = request.GET.get('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) | ||||
r130 | ||||
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) | ||||
r129 | return render('files/file_diff.html') | |||
r128 | def _get_history(self, repo, node, f_path): | |||
from vcs.nodes import NodeKind | ||||
if not node.kind is NodeKind.FILE: | ||||
return [] | ||||
r129 | changesets = node.history | |||
r128 | hist_l = [] | |||
for chs in changesets: | ||||
n_desc = 'r%s:%s' % (chs.revision, chs._short) | ||||
hist_l.append((chs._short, n_desc,)) | ||||
return hist_l | ||||