# HG changeset patch # User Marcin Kuzminski # Date 1350499614 -7200 # Node ID a01c5994015c14bdfb0395aa6ca8682b36d96689 # Parent f3b913b76be126b8a90bcc7ab8945f606cc291bf smarter calculation of showed associated changeset in file source view - before rhodecode showed TIP changeset when initially displaing file source as description of associated commit this can be misleading. Now smart calculate last commit of a file, and show specific commits when switching from history view diff -r f3b913b76be1 -r a01c5994015c rhodecode/controllers/files.py --- a/rhodecode/controllers/files.py Wed Oct 17 20:32:25 2012 +0200 +++ b/rhodecode/controllers/files.py Wed Oct 17 20:46:54 2012 +0200 @@ -154,6 +154,7 @@ if c.file.is_file(): _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path) + c.file_changeset = c.changeset if c.changeset.revision < _hist[0].revision else _hist[0] c.file_history = self._get_node_history(None, f_path, _hist) c.authors = [] for a in set([x.author for x in _hist]): diff -r f3b913b76be1 -r a01c5994015c rhodecode/templates/files/files_source.html --- a/rhodecode/templates/files/files_source.html Wed Oct 17 20:32:25 2012 +0200 +++ b/rhodecode/templates/files/files_source.html Wed Oct 17 20:46:54 2012 +0200 @@ -4,8 +4,8 @@
${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')} - ${h.hidden('diff2',c.file.changeset.raw_id)} - ${h.select('diff1',c.file.changeset.raw_id,c.file_history)} + ${h.hidden('diff2',c.file_changeset.raw_id)} + ${h.select('diff1',c.file_changeset.raw_id,c.file_history)} ${h.submit('diff',_('diff to revision'),class_="ui-btn")} ${h.submit('show_rev',_('show at revision'),class_="ui-btn")} ${h.end_form()} @@ -28,31 +28,31 @@
-
${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}
+
${h.link_to("r%s:%s" % (c.file_changeset.revision,h.short_id(c.file_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}
${h.format_byte_size(c.file.size,binary=True)}
${c.file.mimetype}
%if c.annotate: - ${h.link_to(_('show source'), h.url('files_home', repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show source'), h.url('files_home', repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} %else: - ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} %endif - ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} - ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): % if not c.file.is_binary: - ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")} + ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")} % endif % endif
- gravatar + gravatar
-
${h.person(c.file.changeset.author)}
+
${h.person(c.file_changeset.author)}
-
${h.urlify_commit(c.file.changeset.message,c.repo_name)}
+
${h.urlify_commit(c.file_changeset.message,c.repo_name)}
%if c.file.is_binary: @@ -66,7 +66,7 @@ %endif %else: ${_('File is too big to display')} ${h.link_to(_('show as raw'), - h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path))} + h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))} %endif %endif