fixed branches and tags, fetching for new vcs implementation

7 files changed, 41 insertions, 28 deletions

diff --git a/pylons_app/controllers/branches.py b/pylons_app/controllers/branches.py
index 37f183ad..ab88992d 100644
--- a/pylons_app/controllers/branches.py
+++ b/pylons_app/controllers/branches.py
@@ -22,7 +22,7 @@ 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
@@ -39,6 +39,8 @@ class BranchesController(BaseController):
     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')
diff --git a/pylons_app/controllers/summary.py b/pylons_app/controllers/summary.py
index 331ee71f..76ad0031 100644
--- a/pylons_app/controllers/summary.py
+++ b/pylons_app/controllers/summary.py
@@ -47,6 +47,12 @@ class SummaryController(BaseController):
                                         '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')
diff --git a/pylons_app/controllers/tags.py b/pylons_app/controllers/tags.py
index e705e46b..639b78ee 100644
--- a/pylons_app/controllers/tags.py
+++ b/pylons_app/controllers/tags.py
@@ -39,6 +39,8 @@ class TagsController(BaseController):
     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')
diff --git a/pylons_app/templates/branches/branches.html b/pylons_app/templates/branches/branches.html
index e8e801e7..ae7bb5cb 100644
--- a/pylons_app/templates/branches/branches.html
+++ b/pylons_app/templates/branches/branches.html
@@ -18,18 +18,19 @@
     <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
diff --git a/pylons_app/templates/shortlog/shortlog_data.html b/pylons_app/templates/shortlog/shortlog_data.html
index 40785400..b0aa8134 100644
--- a/pylons_app/templates/shortlog/shortlog_data.html
+++ b/pylons_app/templates/shortlog/shortlog_data.html
@@ -22,9 +22,9 @@ from pylons_app.lib import filters
 				</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
diff --git a/pylons_app/templates/summary/summary.html b/pylons_app/templates/summary/summary.html
index 0a0a96cf..0c6f0a2d 100644
--- a/pylons_app/templates/summary/summary.html
+++ b/pylons_app/templates/summary/summary.html
@@ -93,18 +93,19 @@ E.onDOMReady(function(e){
 
     <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
@@ -112,18 +113,19 @@ E.onDOMReady(function(e){
 
     <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
diff --git a/pylons_app/templates/tags/tags.html b/pylons_app/templates/tags/tags.html
index 065007e7..7dd7a485 100644
--- a/pylons_app/templates/tags/tags.html
+++ b/pylons_app/templates/tags/tags.html
@@ -18,20 +18,20 @@ from pylons_app.lib import filters
 <%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