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