Mercurial > public > src > rhodecode

comparison pylons_app/controllers/files.py @ 559:d945c95ba4ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring for new vcs implementation renamed all ._short and .raw_id into .short_id updated dependency for vcs to 0.1.6
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 28 Sep 2010 20:25:58 +0000
parents 9836541b0509
children d8778cde98f0
comparison
equal deleted inserted replaced
558:0fce1f9e4dce 559:d945c95ba4ac
66 c.f_path = f_path 66 c.f_path = f_path
67 67
68 68
69 try: 69 try:
70 cur_rev = repo.get_changeset(revision).revision 70 cur_rev = repo.get_changeset(revision).revision
71 prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).raw_id 71 prev_rev = repo.get_changeset(get_prev_rev(cur_rev)).short_id
72 next_rev = repo.get_changeset(get_next_rev(cur_rev)).raw_id 72 next_rev = repo.get_changeset(get_next_rev(cur_rev)).short_id
73 73
74 c.url_prev = url('files_home', repo_name=c.repo_name, 74 c.url_prev = url('files_home', repo_name=c.repo_name,
75 revision=prev_rev, f_path=f_path) 75 revision=prev_rev, f_path=f_path)
76 c.url_next = url('files_home', repo_name=c.repo_name, 76 c.url_next = url('files_home', repo_name=c.repo_name,
77 revision=next_rev, f_path=f_path) 77 revision=next_rev, f_path=f_path)
78 78
79 c.changeset = repo.get_changeset(revision) 79 c.changeset = repo.get_changeset(revision)
80 80
81 c.cur_rev = c.changeset.raw_id 81 c.cur_rev = c.changeset.short_id
82 c.rev_nr = c.changeset.revision 82 c.rev_nr = c.changeset.revision
83 c.files_list = c.changeset.get_node(f_path) 83 c.files_list = c.changeset.get_node(f_path)
84 c.file_history = self._get_history(repo, c.files_list, f_path) 84 c.file_history = self._get_history(repo, c.files_list, f_path)
85 85
86 except (RepositoryError, ChangesetError): 86 except (RepositoryError, ChangesetError):
109 hg_model = HgModel() 109 hg_model = HgModel()
110 c.repo = hg_model.get_repo(c.repo_name) 110 c.repo = hg_model.get_repo(c.repo_name)
111 cs = c.repo.get_changeset(revision) 111 cs = c.repo.get_changeset(revision)
112 c.file = cs.get_node(f_path) 112 c.file = cs.get_node(f_path)
113 c.file_msg = cs.get_file_message(f_path) 113 c.file_msg = cs.get_file_message(f_path)
114 c.cur_rev = cs.raw_id 114 c.cur_rev = cs.short_id
115 c.rev_nr = cs.revision 115 c.rev_nr = cs.revision
116 c.f_path = f_path 116 c.f_path = f_path
117 117
118 return render('files/files_annotate.html') 118 return render('files/files_annotate.html')
119 119
169 node2 = FileNode('.', '') 169 node2 = FileNode('.', '')
170 except RepositoryError: 170 except RepositoryError:
171 return redirect(url('files_home', 171 return redirect(url('files_home',
172 repo_name=c.repo_name, f_path=f_path)) 172 repo_name=c.repo_name, f_path=f_path))
173 173
174 c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1.raw_id) 174 c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1.short_id)
175 c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2.raw_id) 175 c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2.short_id)
176 f_udiff = differ.get_udiff(node1, node2) 176 f_udiff = differ.get_udiff(node1, node2)
177 177
178 diff = differ.DiffProcessor(f_udiff) 178 diff = differ.DiffProcessor(f_udiff)
179 179
180 if c.action == 'download': 180 if c.action == 'download':
200 if not node.kind is NodeKind.FILE: 200 if not node.kind is NodeKind.FILE:
201 return [] 201 return []
202 changesets = node.history 202 changesets = node.history
203 hist_l = [] 203 hist_l = []
204 for chs in changesets: 204 for chs in changesets:
205 n_desc = 'r%s:%s' % (chs.revision, chs._short) 205 n_desc = 'r%s:%s' % (chs.revision, chs.short_id)
206 hist_l.append((chs._short, n_desc,)) 206 hist_l.append((chs.short_id, n_desc,))
207 return hist_l 207 return hist_l