kallithea Changeset - edc266f04d5f

Changeset - edc266f04d5f

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Mads Kiilerich - 12 years ago 2014-07-18 18:44:45
madski@unity3d.com

allover: branchtags should link to the branch in the changelog as it says, not to the current revision

3 files changed with 11 insertions and 9 deletions:

kallithea/templates/branches/branches_data.html

kallithea/templates/changeset/changeset.html

kallithea/tests/functional/test_branches.py

0 comments (0 inline, 0 general)

kallithea/templates/branches/branches_data.html

➞

Show inline comments

@@ @@ -15,14 +15,15 @@ @@
       </thead>
         %for cnt,branch in enumerate(c.repo_branches.items()):
         <tr class="parity${cnt%2}">
             <td>${branch[0]}</td>
             <td>
                 <span class="logtags">
                     <span class="branchtag">${h.link_to(branch[0],
                     h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
                     <span class="branchtag">
                     ${h.link_to(branch[0],h.url('changelog_home',repo_name=c.repo_name,branch=branch[0]))}
                     </span>
                 </span>
             </td>
             <td>${branch[1]._timestamp}</td>
             <td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td>
             <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
             <td>${branch[1].revision}</td>
@@ @@ -41,14 +42,15 @@ @@
         % if hasattr(c,'repo_closed_branches') and c.repo_closed_branches:
           %for cnt,branch in enumerate(c.repo_closed_branches.items()):
           <tr class="parity${cnt%2}">
               <td>${branch[0]}</td>
               <td>
                   <span class="logtags">
                       <span class="branchtag">${h.link_to(branch[0]+' [closed]',
                       h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))}</span>
                       <span class="branchtag">
                       ${h.link_to(branch[0]+' [closed]',h.url('changelog_home',repo_name=c.repo_name,branch=branch[0]))}
                       </span>
                   </span>
               </td>
               <td>${branch[1]._timestamp}</td>
               <td><span class="tooltip" title="${h.tooltip(h.age(branch[1].date))}">${h.fmt_date(branch[1].date)}</span></td>
               <td title="${branch[1].author}">${h.person(branch[1].author)}</td>
               <td>${branch[1].revision}</td>

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -100,13 +100,13 @@ ${self.repo_context_bar('changelog')} @@
                          <span class="tagtag"  title="${_('Tag %s') % tag}">
                          ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
                         %endfor
                         %if c.changeset.branch:
                          <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">
-                         ${h.link_to(c.changeset.branch,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
+                         ${h.link_to(c.changeset.branch,h.url('changelog_home',repo_name=c.repo_name,branch=c.changeset.branch))}
                          </span>
                         %endif
                     </span>
                 </div>
                 <div class="left">
                      <div class="author">

kallithea/tests/functional/test_branches.py

➞

Show inline comments

@@ @@ -4,17 +4,17 @@ from kallithea.tests import * @@
 class TestBranchesController(TestController):
     def test_index_hg(self):
         self.log_user()
         response = self.app.get(url(controller='branches',
                                     action='index', repo_name=HG_REPO))
-        response.mustcontain("""<a href="/%s/changeset/96507bd11ecc815ebc6270fdf6db110928c09c1e">default</a>""" % HG_REPO)
+        response.mustcontain("""<a href="/%s/changelog?branch=default">default</a>""" % HG_REPO)
         # closed branches
         response.mustcontain("""<a href="/%s/changeset/95ca6417ec0de6ac3bd19b336d7b608f27b88711">git [closed]</a><""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changeset/0dd5fd7b37a4eea4dd9b662af63cee743b4ccce2">web [closed]</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changelog?branch=git">git [closed]</a>""" % HG_REPO)
         response.mustcontain("""<a href="/%s/changelog?branch=web">web [closed]</a>""" % HG_REPO)
     def test_index_git(self):
         self.log_user()
         response = self.app.get(url(controller='branches',
                                     action='index', repo_name=GIT_REPO))
-        response.mustcontain("""<a href="/%s/changeset/5f2c6ee195929b0be80749243c18121c9864a3b3">master</a>""" % GIT_REPO)
+        response.mustcontain("""<a href="/%s/changelog?branch=master">master</a>""" % GIT_REPO)

0 comments (0 inline, 0 general)