##// END OF EJS Templates
fixed files when repository is empty
marcink -
r138:5f42d751 default
parent child Browse files
Show More
@@ -1,62 +1,65 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
11
12
12 log = logging.getLogger(__name__)
13 log = logging.getLogger(__name__)
13
14
14 class FilesController(BaseController):
15 class FilesController(BaseController):
15 def __before__(self):
16 def __before__(self):
16 c.repos_prefix = config['repos_name']
17 c.repos_prefix = config['repos_name']
17 c.repo_name = get_repo_slug(request)
18 c.repo_name = get_repo_slug(request)
18
19
19 def index(self, repo_name, revision, f_path):
20 def index(self, repo_name, revision, f_path):
20 hg_model = HgModel()
21 hg_model = HgModel()
21 c.repo = repo = hg_model.get_repo(c.repo_name)
22 c.repo = repo = hg_model.get_repo(c.repo_name)
22 c.cur_rev = revision
23 c.cur_rev = revision
23 c.f_path = f_path
24 c.f_path = f_path
24 c.changeset = repo.get_changeset(repo._get_revision(revision))
25 try:
26 c.changeset = repo.get_changeset(repo._get_revision(revision))
27 c.files_list = c.changeset.get_node(f_path)
28 c.file_history = self._get_history(repo, c.files_list, f_path)
29 except RepositoryError:
30 c.files_list = None
25
31
26 c.files_list = c.changeset.get_node(f_path)
27
28 c.file_history = self._get_history(repo, c.files_list, f_path)
29 return render('files/files.html')
32 return render('files/files.html')
30
33
31 def diff(self, repo_name, f_path):
34 def diff(self, repo_name, f_path):
32 hg_model = HgModel()
35 hg_model = HgModel()
33 diff1 = request.GET.get('diff1')
36 diff1 = request.GET.get('diff1')
34 diff2 = request.GET.get('diff2')
37 diff2 = request.GET.get('diff2')
35 c.no_changes = diff1 == diff2
38 c.no_changes = diff1 == diff2
36 c.f_path = f_path
39 c.f_path = f_path
37 c.repo = hg_model.get_repo(c.repo_name)
40 c.repo = hg_model.get_repo(c.repo_name)
38 c.changeset_1 = c.repo.get_changeset(diff1)
41 c.changeset_1 = c.repo.get_changeset(diff1)
39 c.changeset_2 = c.repo.get_changeset(diff2)
42 c.changeset_2 = c.repo.get_changeset(diff2)
40
43
41 c.file_1 = c.changeset_1.get_node(f_path).content
44 c.file_1 = c.changeset_1.get_node(f_path).content
42 c.file_2 = c.changeset_2.get_node(f_path).content
45 c.file_2 = c.changeset_2.get_node(f_path).content
43 c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short)
46 c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short)
44 c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short)
47 c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short)
45
48
46 d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1))
49 d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1))
47 c.diff_files = render_udiff(udiff=d2)
50 c.diff_files = render_udiff(udiff=d2)
48
51
49 if len(c.diff_files) < 1:
52 if len(c.diff_files) < 1:
50 c.no_changes = True
53 c.no_changes = True
51 return render('files/file_diff.html')
54 return render('files/file_diff.html')
52
55
53 def _get_history(self, repo, node, f_path):
56 def _get_history(self, repo, node, f_path):
54 from vcs.nodes import NodeKind
57 from vcs.nodes import NodeKind
55 if not node.kind is NodeKind.FILE:
58 if not node.kind is NodeKind.FILE:
56 return []
59 return []
57 changesets = node.history
60 changesets = node.history
58 hist_l = []
61 hist_l = []
59 for chs in changesets:
62 for chs in changesets:
60 n_desc = 'r%s:%s' % (chs.revision, chs._short)
63 n_desc = 'r%s:%s' % (chs.revision, chs._short)
61 hist_l.append((chs._short, n_desc,))
64 hist_l.append((chs._short, n_desc,))
62 return hist_l
65 return hist_l
General Comments 0
You need to be logged in to leave comments. Login now