Mercurial > kallithea
changeset 6129:8d11063e025d
files: always show the requested version - not last changeset that touched the file
The last changeset to touch the file is rarely relevant - the whole annotate of
individual lines of code will give that kind of information in a much more
relevant way. The information is however available in the history drophown.
This also gets rid of some weird revision compare.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 12 Aug 2016 03:04:48 +0200 |
parents | b4db7ff78343 |
children | 59a38ec5ad8b |
files | kallithea/controllers/files.py kallithea/templates/files/files_source.html |
diffstat | 2 files changed, 12 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/files.py Fri Aug 12 03:04:48 2016 +0200 +++ b/kallithea/controllers/files.py Fri Aug 12 03:04:48 2016 +0200 @@ -166,10 +166,6 @@ if c.file.is_file(): c.load_full_history = False - file_last_cs = c.file.last_changeset - c.file_changeset = (c.changeset - if c.changeset.revision < file_last_cs.revision - else file_last_cs) #determine if we're on branch head _branches = c.db_repo_scm_instance.branches c.on_branch_head = revision in _branches.keys() + _branches.values()
--- a/kallithea/templates/files/files_source.html Fri Aug 12 03:04:48 2016 +0200 +++ b/kallithea/templates/files/files_source.html Fri Aug 12 03:04:48 2016 +0200 @@ -2,12 +2,12 @@ <div> <div style="float:left"> ${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.hidden('diff2',c.changeset.raw_id)} ${h.hidden('diff1')} ${h.submit('diff',_('Diff to Revision'),class_="btn btn-small")} ${h.submit('show_rev',_('Show at Revision'),class_="btn btn-small")} ${h.hidden('annotate', c.annotate)} - ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.file_changeset.raw_id, f_path=c.f_path),class_="btn btn-small")} + ${h.link_to(_('Show Full History'),h.url('changelog_file_home',repo_name=c.repo_name, revision=c.changeset.raw_id, f_path=c.f_path),class_="btn btn-small")} ${h.link_to(_('Show Authors'),'#',class_="btn btn-small" ,id="show_authors")} ${h.end_form()} @@ -22,17 +22,17 @@ <div class="code-header"> <div class="stats"> <div class="left img"><i class="icon-doc-inv"></i></div> - <div class="left item"><pre class="tooltip" title="${h.fmt_date(c.file_changeset.date)}">${h.link_to(h.show_id(c.file_changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div> + <div class="left item"><pre class="tooltip" title="${h.fmt_date(c.changeset.date)}">${h.link_to(h.show_id(c.changeset),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</pre></div> <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div> <div class="left item last"><pre>${c.file.mimetype}</pre></div> <div class="buttons"> %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_="btn btn-mini")} + ${h.link_to(_('Show Source'), h.url('files_home', repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} %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_="btn btn-mini")} + ${h.link_to(_('Show Annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} %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_="btn btn-mini")} - ${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_="btn btn-mini")} + ${h.link_to(_('Show as Raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} + ${h.link_to(_('Download as Raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="btn btn-mini")} % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): %if c.on_branch_head and not c.file.is_binary: ${h.link_to(_('Edit on Branch: %s') % c.changeset.branch, h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path, anchor='edit'),class_="btn btn-mini")} @@ -48,14 +48,14 @@ </div> </div> <div class="author"> - ${h.gravatar_div(h.email_or_none(c.file_changeset.author), size=16)} - <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div> + ${h.gravatar_div(h.email_or_none(c.changeset.author), size=16)} + <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div> </div> - <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div> + <div class="commit">${h.urlify_commit(c.changeset.message,c.repo_name)}</div> </div> <div class="code-body"> %if c.file.is_browser_compatible_image(): - <img src="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path)}" class="img-preview"/> + <img src="${h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path)}" class="img-preview"/> %elif c.file.is_binary: <div style="padding:5px"> ${_('Binary file (%s)') % c.file.mimetype} @@ -73,7 +73,7 @@ %if c.annotate: ${h.link_to(_('Show full annotation anyway.'), h.url.current(fulldiff=1, **request.GET.mixed()))} %else: - ${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.link_to(_('Show as raw.'), h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))} %endif </h4> %endif