Show More
@@ -31,17 +31,34 b' class FilesController(BaseController):' | |||
|
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') |
@@ -52,8 +69,8 b' class FilesController(BaseController):' | |||
|
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_ |
|
|
56 |
c.file_2 = c.changeset_2.get_ |
|
|
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 |
General Comments 0
You need to be logged in to leave comments.
Login now