fixed branches and tags, fetching for new vcs implementation

pylons_app/controllers/branches.py

@@ -1,44 +1,46
 #!/usr/bin/env python
 # encoding: utf-8
 # branches controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 branches controller for pylons
 @author: marcink
 """
-from pylons import tmpl_context as c, app_globals as g
+from pylons import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 import logging
 
 log = logging.getLogger(__name__)
 
 class BranchesController(BaseController):
     
     @LoginRequired()
     def __before__(self):
         super(BranchesController, self).__before__()
     
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
-        c.repo_branches = c.repo_info.branches
+        c.repo_branches = {}
+        for name, hash in c.repo_info.branches.items():
+            c.repo_branches[name] = c.repo_info.get_changeset(hash)
                 
         return render('branches/branches.html')

pylons_app/controllers/summary.py

@@ -1,52 +1,58
 #!/usr/bin/env python
 # encoding: utf-8
 # summary controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 18, 2010
 summary controller for pylons
 @author: marcink
 """
 from pylons import tmpl_context as c, request
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel, _full_changelog_cached
 import logging
 
 log = logging.getLogger(__name__)
 
 class SummaryController(BaseController):
     
     @LoginRequired()
     def __before__(self):
         super(SummaryController, self).__before__()
         
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_changesets = _full_changelog_cached(c.repo_name)[:10]
         e = request.environ
         uri = u'%(protocol)s://%(user)s@%(host)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':str(c.hg_app_user.username),
                                         'host':e.get('HTTP_HOST'),
                                         'repo_name':c.repo_name, }
         c.clone_repo_url = uri
-        c.repo_tags = c.repo_info.tags[:10]
-        c.repo_branches = c.repo_info.branches[:10]
+        c.repo_tags = {}
+        for name, hash in c.repo_info.tags.items()[:10]:
+            c.repo_tags[name] = c.repo_info.get_changeset(hash)
+        
+        c.repo_branches = {}
+        for name, hash in c.repo_info.branches.items()[:10]:
+            c.repo_branches[name] = c.repo_info.get_changeset(hash)
+                    
         return render('summary/summary.html')

pylons_app/controllers/tags.py

@@ -1,44 +1,46
 #!/usr/bin/env python
 # encoding: utf-8
 # tags controller for pylons
 # Copyright (C) 2009-2010 Marcin Kuzminski <[e-mail]>
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; version 2
 # of the License or (at your opinion) any later version of the license.
 # 
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 tags controller for pylons
 @author: marcink
 """
 from pylons import tmpl_context as c
 from pylons_app.lib.auth import LoginRequired
 from pylons_app.lib.base import BaseController, render
 from pylons_app.model.hg_model import HgModel
 import logging
 
 log = logging.getLogger(__name__)
 
 class TagsController(BaseController):
     
     @LoginRequired()
     def __before__(self):
         super(TagsController, self).__before__()
         
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
-        c.repo_tags = c.repo_info.tags
+        c.repo_tags = {}
+        for name, hash in c.repo_info.tags.items():
+            c.repo_tags[name] = c.repo_info.get_changeset(hash)
         
         return render('tags/tags.html')

pylons_app/templates/branches/branches.html

@@ -1,38 +1,39
 <%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()">
 	${self.menu('branches')}    
 </%def>
 <%def name="main()">
 
     <h2 class="no-link no-border">${_('Branches')}</h2>
 
     <table>
-		%for cnt,branch in enumerate(c.repo_branches):
+		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
-			<td>${branch._ctx.date()|n,filters.age}</td>
+			<td>${branch[1]._ctx.date()|n,filters.age}</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 class="branchtag">${h.link_to(branch[0],
+					h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</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(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch._short))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor
     </table>
 
 </%def>    
  No newline at end of file

pylons_app/templates/shortlog/shortlog_data.html

@@ -1,48 +1,48
 ## -*- coding: utf-8 -*-
 <%!
 from pylons_app.lib import filters
 %>
 <table>
 %for cnt,cs in enumerate(c.repo_changesets):
 	<tr class="parity${cnt%2}">
 		<td>${cs._ctx.date()|n,filters.age}</td>
 		<td title="${cs.author}">${cs.author|n,filters.person}</td>
 		<td>r${cs.revision}</td>
 		<td>
 			${h.link_to(h.truncate(cs.message,60),
 			h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
 			title=cs.message)}
 		</td>
 		<td>
 				<span class="logtags">
 					<span class="branchtag">${cs.branch}</span>
 					%for tag in cs.tags:
 						<span class="tagtag">${tag}</span>
 					%endfor
 				</span>
 		</td>
 		<td class="nowrap">
-		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
+		${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
 		|
-		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))}
+		${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
 		</td>
 	</tr>	
 %endfor
 
 </table>
 	<div>
 		<script type="text/javascript">
 		var data_div = 'shortlog_data';
 		YAHOO.util.Event.onDOMReady(function(){
 			YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
 					YAHOO.util.Dom.setStyle('shortlog_data','opacity','0.3');});});
 		</script>	
 		<h2>
 		${c.repo_changesets.pager('$link_previous ~2~ $link_next',
 		onclick="""YAHOO.util.Connect.asyncRequest('GET','$partial_url',{
 		success:function(o){YAHOO.util.Dom.get(data_div).innerHTML=o.responseText;
 		YAHOO.util.Event.addListener(YAHOO.util.Dom.getElementsByClassName('pager_link'),"click",function(){
 				YAHOO.util.Dom.setStyle(data_div,'opacity','0.3');});		
 		YAHOO.util.Dom.setStyle(data_div,'opacity','1');}},null); return false;""")}
 		</h2>
 	</div>	
  No newline at end of file

pylons_app/templates/summary/summary.html

@@ -1,132 +1,134
 <%inherit file="/base/base.html"/>
 <%!
 from pylons_app.lib import filters
 %>
 <%def name="title()">
     ${_('Repository managment')}
 </%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))}
     /
     ${_('summary')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('summary')}    
 </%def>
 
 <%def name="js()">
 <script type="text/javascript" src="/js/yui/utilities/utilities.js"></script>
 <script type="text/javascript">
 var E = YAHOO.util.Event;
 var D = YAHOO.util.Dom;
 
 E.onDOMReady(function(e){
     id = 'clone_url';
 	E.addListener(id,'click',function(e){
 	    D.get('clone_url').select();
 	})
 })
 </script>
 </%def>
 
 <%def name="main()">
     <h2 class="no-link no-border">${_('Mercurial Repository Overview')}</h2>
     <dl class="overview">
         <dt>${_('name')}</dt>
         <dd>${c.repo_info.name}</dd>
         <dt>${_('description')}</dt>
         <dd>${c.repo_info.description}</dd>
         <dt>${_('contact')}</dt>
         <dd>${c.repo_info.contact}</dd>
         <dt>${_('last change')}</dt>
         <dd>${c.repo_info.last_change|n,filters.age} - ${c.repo_info.last_change|n,filters.rfc822date}</dd>
         <dt>${_('clone url')}</dt>
         <dd><input type="text" id="clone_url"  readonly="readonly" value="hg clone ${c.clone_repo_url}" size="70"/></dd>
         <dt>${_('download')}</dt>
         <dd>
        	%for cnt,archive in enumerate(c.repo_info._get_archives()):
        		 %if cnt >=1:
        		 |
        		 %endif
        		 ${h.link_to(c.repo_info.name+'.'+archive['type'],
        			h.url('files_archive_home',repo_name=c.repo_info.name,
        			revision='tip',fileformat=archive['extension']),class_="archive_logo")}
 		%endfor
         </dd>
         <dt>${_('feeds')}</dt>
         <dd>
         	${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_logo')}
 			${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_logo')}
         </dd>
     </dl>
 
     <h2>${h.link_to(_('Changes'),h.url('changelog_home',repo_name=c.repo_name))}</h2>
     <table>
 	%for cnt,cs in enumerate(c.repo_changesets):
 		<tr class="parity${cnt%2}">
 			<td>${cs._ctx.date()|n,filters.age}</td>
 			<td>${cs.author|n,filters.person}</td>
 			<td>r${cs.revision}</td>
 			<td>
 				${h.link_to(h.truncate(cs.message,60),
 				h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
 				title=cs.message)}
 			</td>
 			<td>
 				<span class="logtags">
 					<span class="branchtag">${cs.branch}</span>
 					%for tag in cs.tags:
 						<span class="tagtag">${tag}</span>
 					%endfor
 				</span>
 			</td>
 			<td class="nowrap">
 			${h.link_to(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=cs._short))}
 			|
 			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=cs._short))}
 			</td>
 		</tr>
 	%endfor
     </table>
 
     <h2>${h.link_to(_('Tags'),h.url('tags_home',repo_name=c.repo_name))}</h2>
     <table>
-		%for cnt,tag in enumerate(c.repo_tags):
+		%for cnt,tag in enumerate(c.repo_tags.items()):
 		<tr class="parity${cnt%2}">
-			<td>${tag._ctx.date()|n,filters.age}</td>
+			<td>${tag[1]._ctx.date()|n,filters.age}</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 class="tagtag">${h.link_to(tag[0],
+					h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}</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(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag._short))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor
     </table>
 
     <h2>${h.link_to(_('Branches'),h.url('branches_home',repo_name=c.repo_name))}</h2>
     <table>
-		%for cnt,branch in enumerate(c.repo_branches):
+		%for cnt,branch in enumerate(c.repo_branches.items()):
 		<tr class="parity${cnt%2}">
-			<td>${branch._ctx.date()|n,filters.age}</td>
+			<td>${branch[1]._ctx.date()|n,filters.age}</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 class="branchtag">${h.link_to(branch[0],
+					h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</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(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch._short))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor
     </table>
 
 </%def>    
  No newline at end of file

pylons_app/templates/tags/tags.html

@@ -1,40 +1,40
 <%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()">
 	${self.menu('tags')}    
 </%def>
 <%def name="main()">
 
     <h2 class="no-link no-border">${_('Tags')}</h2>
-
     <table>
-		%for cnt,tag in enumerate(c.repo_tags):
+		%for cnt,tag in enumerate(c.repo_tags.items()):
 		<tr class="parity${cnt%2}">
-			<td>${tag._ctx.date()|n,filters.age}</td>
+			<td>${tag[1]._ctx.date()|n,filters.age}</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 class="tagtag">${h.link_to(tag[0],
+					h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}</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(_('changeset'),h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			|
-			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag._short))}
+			${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))}
 			</td>
 		</tr>	
 		%endfor
     </table>
 
 </%def>    
  No newline at end of file