kallithea Changeset - 3f01d02c2cc6

Changeset - 3f01d02c2cc6

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Marcin Kuzminski - 16 years ago 2010-05-10 23:12:45
marcin@python-works.com

fixed error when browsing revisions on path that doesn't exist. Fixed files browsing. Fixed templates in branches and tags

5 files changed with 14 insertions and 7 deletions:

pylons_app/controllers/files.py

pylons_app/templates/branches/branches.html

pylons_app/templates/files/files.html

pylons_app/templates/files/files_browser.html

pylons_app/templates/tags/tags.html

0 comments (0 inline, 0 general)

pylons_app/controllers/files.py

➞

Show inline comments

 import logging
 from pylons import request, response, session, tmpl_context as c, url, config, app_globals as g
 from pylons.controllers.util import abort, redirect
 from pylons_app.lib.base import BaseController, render
 from pylons_app.lib.utils import get_repo_slug
 from pylons_app.model.hg_model import HgModel
 from difflib import unified_diff
 from pylons_app.lib.differ import render_udiff
 from vcs.exceptions import RepositoryError
+from vcs.exceptions import RepositoryError, ChangesetError
 log = logging.getLogger(__name__)
 class FilesController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
         c.repo_name = get_repo_slug(request)
     def index(self, repo_name, revision, f_path):
         revision = request.POST.get('at_rev', None) or revision
         hg_model = HgModel()
         c.repo = repo = hg_model.get_repo(c.repo_name)
         revision = request.POST.get('at_rev', None) or revision
         if request.POST.get('view_low'):
             revision = int(revision) - 1
         if request.POST.get('view_high'):
             revision = int(revision) + 1
             max_rev = len(c.repo.revisions) - 1
             if revision > max_rev:
                 revision = max_rev
         c.f_path = f_path
         try:
             c.changeset = repo.get_changeset(repo._get_revision(revision))
             c.cur_rev = c.changeset.raw_id
             c.rev_nr = c.changeset.revision
             c.files_list = c.changeset.get_node(f_path)
             c.file_history = self._get_history(repo, c.files_list, f_path)
         except RepositoryError:
+        except (RepositoryError, ChangesetError):
             c.files_list = None
         return render('files/files.html')
     def diff(self, repo_name, f_path):
         hg_model = HgModel()
         diff1 = request.GET.get('diff1')
         diff2 = request.GET.get('diff2')
         c.no_changes = diff1 == diff2
         c.f_path = f_path
         c.repo = hg_model.get_repo(c.repo_name)
         c.changeset_1 = c.repo.get_changeset(diff1)
         c.changeset_2 = c.repo.get_changeset(diff2)
         c.file_1 = c.changeset_1.get_node(f_path).content
         c.file_2 = c.changeset_2.get_node(f_path).content
         c.diff1 = 'r%s:%s' % (c.changeset_1.revision, c.changeset_1._short)
         c.diff2 = 'r%s:%s' % (c.changeset_2.revision, c.changeset_2._short)
         d2 = unified_diff(c.file_1.splitlines(1), c.file_2.splitlines(1))
         c.diff_files = render_udiff(udiff=d2)
         if len(c.diff_files) < 1:
             c.no_changes = True
         return render('files/file_diff.html')
     def _get_history(self, repo, node, f_path):
         from vcs.nodes import NodeKind
         if not node.kind is NodeKind.FILE:
             return []
         changesets = node.history
         hist_l = []
         for chs in changesets:
             n_desc = 'r%s:%s' % (chs.revision, chs._short)
             hist_l.append((chs._short, n_desc,))
         return hist_l

pylons_app/templates/branches/branches.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%! from pylons_app.lib import filters %>
 <%def name="title()">
     ${_('Branches')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
+    /
     ${_('branches')}
 </%def>
 <%def name="page_nav()">
         <form action="log">
             <dl class="search">
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
 		${self.menu('branches')}
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Branches')}</h2>
     <table>
 		%for cnt,branch in enumerate(c.repo_branches):
 		<tr class="parity${cnt%2}">
 			<td>${branch._ctx.date()|n,filters.age}</td>
 			<td></td>
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${h.link_to(branch.branch,h.url('changeset_home',repo_name=c.repo_name,revision=branch._short))}</span>
 				</span>
 			</td>
 			<td class="nowrap">
 			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch._short))}
+			|
 			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch._short))}
 			</td>
 		</tr>
 		%endfor
     </table>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/files/files.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Repository managment')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('files_home',repo_name=c.repo_name))}
+    /
     ${_('files')}
 </%def>
 <%def name="page_nav()">
         <form action="log">
             <dl class="search">
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
 		${self.menu('files')}
 </%def>
 <%def name="css()">
 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
 <link rel="stylesheet" href="/css/pygments.css" type="text/css" />
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Files')}</h2>
 	<div id="files_data">
 	%if c.files_list:
 		<h2>${_('Location')}: ${h.files_breadcrumbs(c.repo_name,c.cur_rev,c.files_list.path)}</h2>
 			%if c.files_list.is_dir():
 				<%include file='files_browser.html'/>
 			%else:
 				<%include file='files_source.html'/>
 			%endif
 	%else:
 		<h2>${_('No files')}</h2>
+		<h2><a href="#" onClick="javascript:parent.history.back();" target="main">${_('Go back')}</a> ${_('No files at given path')}: "${c.f_path or "/"}" </h2>
 	%endif
 	</div>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/files/files_browser.html

➞

Show inline comments

 <%def name="file_class(node)">
 	%if node.is_file():
 		<%return "browser-file" %>
 	%else:
 		<%return "browser-dir"%>
 	%endif
 </%def>
 <div id="body" class="browserblock">
 	<div class="browser-header">
 		${h.form(h.url.current())}
-		<span>${_('view')}@rev:${h.text('at_rev',value=c.rev_nr,size='5')}</span>
+		<span>${_('view')}@rev ${h.submit('view_low','-')}${h.text('at_rev',value=c.rev_nr,size='5')}${h.submit('view_high','+')}</span>
 		${h.submit('view','view')}
 		${h.end_form()}
 	</div>
 	<div class="browser-body">
 		<table class="code-browser">
 		         <thead>
 		             <tr>
 		                 <th>${_('Name')}</th>
 		                 <th>${_('Size')}</th>
 		                 <th>${_('Revision')}</th>
 		                 <th>${_('Last modified')}</th>
 		                 <th>${_('Last commiter')}</th>
 		             </tr>
 		         </thead>
 		         	<tr class="parity0">
 		          		<td>
 		          		% if c.files_list.parent:
 		          			${h.link_to('..',h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=c.files_list.parent.path),class_="browser-dir")}
 		          		%endif
 		          		</td>
 		          		<td></td>
 		          		<td></td>
 		          		<td></td>
 		          		<td></td>
 		         	</tr>
 		    %for cnt,node in enumerate(c.files_list,1):
 				<tr class="parity${cnt%2}">
 		             <td>
 						${h.link_to(node.name,h.url('files_home',repo_name=c.repo_name,revision=c.cur_rev,f_path=node.path),class_=file_class(node))}
 		             </td>
 		             <td>
 		                %if node.is_file():
 		             		${h.filesizeformat(node.size)}
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.revision}
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.date}
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.author}
 		             	%endif
 		             </td>
 				</tr>
 			%endfor
 		</table>
 	</div>
 </div>
@@ \ No newline at end of file @@

pylons_app/templates/tags/tags.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%!
 from pylons_app.lib import filters
 %>
 <%def name="title()">
     ${_('Tags')}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
+    /
     ${_('tags')}
 </%def>
 <%def name="page_nav()">
         <form action="log">
             <dl class="search">
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
 		${self.menu('tags')}
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Tags')}</h2>
     <table>
 		%for cnt,tag in enumerate(c.repo_tags):
 		<tr class="parity${cnt%2}">
 			<td>${tag._ctx.date()|n,filters.age}</td>
 			<td></td>
 			<td>
 				<span class="logtags">
 					<span class="tagtag">${h.link_to(tag.tags[-1],h.url('changeset_home',repo_name=c.repo_name,revision=tag._short))}</span>
 				</span>
 			</td>
 			<td class="nowrap">
 			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag._short))}
+			|
 			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag._short))}
 			</td>
 		</tr>
 		%endfor
     </table>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)