Show More
@@ -1,76 +1,93 b'' | |||||
1 | import logging |
|
1 | import logging | |
2 |
|
2 | |||
3 | from pylons import request, response, session, tmpl_context as c, url, config, app_globals as g |
|
3 | from pylons import request, response, session, tmpl_context as c, url, config, app_globals as g | |
4 | from pylons.controllers.util import abort, redirect |
|
4 | from pylons.controllers.util import abort, redirect | |
5 |
|
5 | |||
6 | from pylons_app.lib.base import BaseController, render |
|
6 | from pylons_app.lib.base import BaseController, render | |
7 | from pylons_app.lib.utils import get_repo_slug |
|
7 | from pylons_app.lib.utils import get_repo_slug | |
8 | from pylons_app.model.hg_model import HgModel |
|
8 | from pylons_app.model.hg_model import HgModel | |
9 | from difflib import unified_diff |
|
9 | from difflib import unified_diff | |
10 | from pylons_app.lib.differ import render_udiff |
|
10 | from pylons_app.lib.differ import render_udiff | |
11 | from vcs.exceptions import RepositoryError, ChangesetError |
|
11 | from vcs.exceptions import RepositoryError, ChangesetError | |
12 |
|
12 | |||
13 | log = logging.getLogger(__name__) |
|
13 | log = logging.getLogger(__name__) | |
14 |
|
14 | |||
15 | class FilesController(BaseController): |
|
15 | class FilesController(BaseController): | |
16 | def __before__(self): |
|
16 | def __before__(self): | |
17 | c.repos_prefix = config['repos_name'] |
|
17 | c.repos_prefix = config['repos_name'] | |
18 | c.repo_name = get_repo_slug(request) |
|
18 | c.repo_name = get_repo_slug(request) | |
19 |
|
19 | |||
20 | def index(self, repo_name, revision, f_path): |
|
20 | def index(self, repo_name, revision, f_path): | |
21 | hg_model = HgModel() |
|
21 | hg_model = HgModel() | |
22 | c.repo = repo = hg_model.get_repo(c.repo_name) |
|
22 | c.repo = repo = hg_model.get_repo(c.repo_name) | |
23 |
|
23 | |||
24 | revision = request.POST.get('at_rev', None) or revision |
|
24 | revision = request.POST.get('at_rev', None) or revision | |
25 | if request.POST.get('view_low'): |
|
25 | if request.POST.get('view_low'): | |
26 | revision = int(revision) - 1 |
|
26 | revision = int(revision) - 1 | |
27 | if request.POST.get('view_high'): |
|
27 | if request.POST.get('view_high'): | |
28 | revision = int(revision) + 1 |
|
28 | revision = int(revision) + 1 | |
29 | max_rev = len(c.repo.revisions) - 1 |
|
29 | max_rev = len(c.repo.revisions) - 1 | |
30 | if revision > max_rev: |
|
30 | if revision > max_rev: | |
31 | revision = max_rev |
|
31 | revision = max_rev | |
32 |
|
32 | |||
33 | c.f_path = f_path |
|
33 | c.f_path = f_path | |
|
34 | ||||
|
35 | ||||
34 | try: |
|
36 | try: | |
35 | c.changeset = repo.get_changeset(repo._get_revision(revision)) |
|
37 | c.changeset = repo.get_changeset(repo._get_revision(revision)) | |
|
38 | try: | |||
|
39 | c.file_msg = c.changeset.get_file_message(f_path) | |||
|
40 | except: | |||
|
41 | c.file_msg = None | |||
|
42 | ||||
36 | c.cur_rev = c.changeset.raw_id |
|
43 | c.cur_rev = c.changeset.raw_id | |
37 | c.rev_nr = c.changeset.revision |
|
44 | c.rev_nr = c.changeset.revision | |
38 | c.files_list = c.changeset.get_node(f_path) |
|
45 | c.files_list = c.changeset.get_node(f_path) | |
39 | c.file_history = self._get_history(repo, c.files_list, f_path) |
|
46 | c.file_history = self._get_history(repo, c.files_list, f_path) | |
|
47 | ||||
40 | except (RepositoryError, ChangesetError): |
|
48 | except (RepositoryError, ChangesetError): | |
41 | c.files_list = None |
|
49 | c.files_list = None | |
42 |
|
50 | |||
43 | return render('files/files.html') |
|
51 | return render('files/files.html') | |
44 |
|
52 | |||
|
53 | def rawfile(self, repo_name, revision, f_path): | |||
|
54 | hg_model = HgModel() | |||
|
55 | c.repo = hg_model.get_repo(c.repo_name) | |||
|
56 | file_node = c.repo.get_changeset(revision).get_node(f_path) | |||
|
57 | response.headers['Content-type'] = file_node.mimetype | |||
|
58 | response.headers['Content-disposition'] = 'attachment; filename=%s' \ | |||
|
59 | % f_path.split('/')[-1] | |||
|
60 | return file_node.content | |||
|
61 | ||||
45 | def diff(self, repo_name, f_path): |
|
62 | def diff(self, repo_name, f_path): | |
46 | hg_model = HgModel() |
|
63 | hg_model = HgModel() | |
47 | diff1 = request.GET.get('diff1') |
|
64 | diff1 = request.GET.get('diff1') | |
48 | diff2 = request.GET.get('diff2') |
|
65 | diff2 = request.GET.get('diff2') | |
49 | c.no_changes = diff1 == diff2 |
|
66 | c.no_changes = diff1 == diff2 | |
50 | c.f_path = f_path |
|
67 | c.f_path = f_path | |
51 | c.repo = hg_model.get_repo(c.repo_name) |
|
68 | c.repo = hg_model.get_repo(c.repo_name) | |
52 | c.changeset_1 = c.repo.get_changeset(diff1) |
|
69 | c.changeset_1 = c.repo.get_changeset(diff1) | |
53 | c.changeset_2 = c.repo.get_changeset(diff2) |
|
70 | c.changeset_2 = c.repo.get_changeset(diff2) | |
54 |
|
71 | |||
55 |
c.file_1 = c.changeset_1.get_ |
|
72 | c.file_1 = c.changeset_1.get_file_content(f_path) | |
56 |
c.file_2 = c.changeset_2.get_ |
|
73 | c.file_2 = c.changeset_2.get_file_content(f_path) | |
57 | c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short) |
|
74 | c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short) | |
58 | c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short) |
|
75 | c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short) | |
59 |
|
76 | |||
60 | d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1)) |
|
77 | d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1)) | |
61 | c.diff_files = render_udiff(udiff=d2) |
|
78 | c.diff_files = render_udiff(udiff=d2) | |
62 |
|
79 | |||
63 | if len(c.diff_files) < 1: |
|
80 | if len(c.diff_files) < 1: | |
64 | c.no_changes = True |
|
81 | c.no_changes = True | |
65 | return render('files/file_diff.html') |
|
82 | return render('files/file_diff.html') | |
66 |
|
83 | |||
67 | def _get_history(self, repo, node, f_path): |
|
84 | def _get_history(self, repo, node, f_path): | |
68 | from vcs.nodes import NodeKind |
|
85 | from vcs.nodes import NodeKind | |
69 | if not node.kind is NodeKind.FILE: |
|
86 | if not node.kind is NodeKind.FILE: | |
70 | return [] |
|
87 | return [] | |
71 | changesets = node.history |
|
88 | changesets = node.history | |
72 | hist_l = [] |
|
89 | hist_l = [] | |
73 | for chs in changesets: |
|
90 | for chs in changesets: | |
74 | n_desc = 'r%s:%s' % (chs.revision, chs._short) |
|
91 | n_desc = 'r%s:%s' % (chs.revision, chs._short) | |
75 | hist_l.append((chs._short, n_desc,)) |
|
92 | hist_l.append((chs._short, n_desc,)) | |
76 | return hist_l |
|
93 | return hist_l |
General Comments 0
You need to be logged in to leave comments.
Login now