# HG changeset patch # User Mads Kiilerich # Date 1371032600 -7200 # Node ID f8f180cbe68d0a3dafc1a498ff170193ac3ea16c # Parent 82fa5c6e958eaeed9cdbd745b2b88c473a4cb56f allover: let tags and bookmarks link to the changeset - not to its files diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/bookmarks/bookmarks_data.html --- a/kallithea/templates/bookmarks/bookmarks_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/bookmarks/bookmarks_data.html Wed Jun 12 12:23:20 2013 +0200 @@ -19,7 +19,7 @@ ${h.link_to(book[0], - h.url('files_home',repo_name=c.repo_name,revision=book[1].raw_id))} + h.url('changeset_home',repo_name=c.repo_name,revision=book[1].raw_id))} ${book[1]._timestamp} @@ -28,7 +28,7 @@ ${book[1].revision}
-
r${book[1].revision}:${h.short_id(book[1].raw_id)}
+
r${book[1].revision}:${h.short_id(book[1].raw_id)}
diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/branches/branches_data.html --- a/kallithea/templates/branches/branches_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/branches/branches_data.html Wed Jun 12 12:23:20 2013 +0200 @@ -19,7 +19,7 @@ ${h.link_to(branch[0], - h.url('files_home',repo_name=c.repo_name,revision=branch[1].raw_id))} + h.url('changeset_home',repo_name=c.repo_name,revision=branch[1].raw_id))} ${branch[1]._timestamp} @@ -28,7 +28,7 @@ ${branch[1].revision}
-
r${branch[1].revision}:${h.short_id(branch[1].raw_id)}
+
r${branch[1].revision}:${h.short_id(branch[1].raw_id)}
@@ -54,7 +54,7 @@ ${branch[1].revision}
-
r${branch[1].revision}:${h.short_id(branch[1].raw_id)}
+
r${branch[1].revision}:${h.short_id(branch[1].raw_id)}
diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/changelog/changelog.html --- a/kallithea/templates/changelog/changelog.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changelog/changelog.html Wed Jun 12 12:23:20 2013 +0200 @@ -122,13 +122,13 @@ %if h.is_hg(c.db_repo_scm_instance): %for book in cs.bookmarks:
- ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(book),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
%endfor %endif %for tag in cs.tags:
- ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(tag),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
%endfor %if (not c.branch_name) and cs.branch: diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/changelog/changelog_summary_data.html --- a/kallithea/templates/changelog/changelog_summary_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changelog/changelog_summary_data.html Wed Jun 12 12:23:20 2013 +0200 @@ -34,7 +34,7 @@ %endif -
${h.show_id(cs)}
+
${h.show_id(cs)}
@@ -48,13 +48,13 @@ %if h.is_hg(c.db_repo_scm_instance): %for book in cs.bookmarks:
- ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(book),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
%endfor %endif %for tag in cs.tags:
- ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(tag),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
%endfor %if cs.branch: diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/changeset/changeset.html --- a/kallithea/templates/changeset/changeset.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset.html Wed Jun 12 12:23:20 2013 +0200 @@ -91,19 +91,19 @@ %if h.is_hg(c.db_repo_scm_instance): %for book in c.changeset.bookmarks: - ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + ${h.link_to(h.shorter(book),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endfor %endif %for tag in c.changeset.tags: - ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endfor %if c.changeset.branch: - ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} + ${h.link_to(c.changeset.branch,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))} %endif diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/changeset/changeset_range.html Wed Jun 12 12:23:20 2013 +0200 @@ -91,17 +91,17 @@ %if h.is_hg(c.db_repo_scm_instance): %for book in cs.bookmarks: - ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(book),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))} %endfor %endif %for tag in cs.tags: - ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(tag),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))} %endfor %if cs.branch: - ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))} + ${h.link_to(h.shorter(cs.branch),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))} %endif diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/templates/tags/tags_data.html --- a/kallithea/templates/tags/tags_data.html Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/templates/tags/tags_data.html Wed Jun 12 12:23:20 2013 +0200 @@ -19,7 +19,7 @@ ${h.link_to(tag[0], - h.url('files_home',repo_name=c.repo_name,revision=tag[1].raw_id))} + h.url('changeset_home',repo_name=c.repo_name,revision=tag[1].raw_id))} @@ -29,7 +29,7 @@ ${tag[1].revision}
-
r${tag[1].revision}:${h.short_id(tag[1].raw_id)}
+
r${tag[1].revision}:${h.short_id(tag[1].raw_id)}
diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/tests/functional/test_branches.py --- a/kallithea/tests/functional/test_branches.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/tests/functional/test_branches.py Wed Jun 12 12:23:20 2013 +0200 @@ -7,7 +7,7 @@ self.log_user() response = self.app.get(url(controller='branches', action='index', repo_name=HG_REPO)) - response.mustcontain("""default""" % HG_REPO) + response.mustcontain("""default""" % HG_REPO) # closed branches response.mustcontain("""git [closed]<""" % HG_REPO) @@ -17,4 +17,4 @@ self.log_user() response = self.app.get(url(controller='branches', action='index', repo_name=GIT_REPO)) - response.mustcontain("""master""" % GIT_REPO) + response.mustcontain("""master""" % GIT_REPO) diff -r 82fa5c6e958e -r f8f180cbe68d kallithea/tests/functional/test_tags.py --- a/kallithea/tests/functional/test_tags.py Tue Dec 10 19:30:37 2013 +0100 +++ b/kallithea/tests/functional/test_tags.py Wed Jun 12 12:23:20 2013 +0200 @@ -6,35 +6,35 @@ def test_index_hg(self): self.log_user() response = self.app.get(url(controller='tags', action='index', repo_name=HG_REPO)) - response.mustcontain("""tip""" % HG_REPO) - response.mustcontain("""v0.2.0""" % HG_REPO) - response.mustcontain("""v0.1.11""" % HG_REPO) - response.mustcontain("""v0.1.10""" % HG_REPO) - response.mustcontain("""v0.1.9""" % HG_REPO) - response.mustcontain("""v0.1.8""" % HG_REPO) - response.mustcontain("""v0.1.7""" % HG_REPO) - response.mustcontain("""v0.1.6""" % HG_REPO) - response.mustcontain("""v0.1.5""" % HG_REPO) - response.mustcontain("""v0.1.4""" % HG_REPO) - response.mustcontain("""v0.1.3""" % HG_REPO) - response.mustcontain("""v0.1.2""" % HG_REPO) - response.mustcontain("""v0.1.1""" % HG_REPO) + response.mustcontain("""tip""" % HG_REPO) + response.mustcontain("""v0.2.0""" % HG_REPO) + response.mustcontain("""v0.1.11""" % HG_REPO) + response.mustcontain("""v0.1.10""" % HG_REPO) + response.mustcontain("""v0.1.9""" % HG_REPO) + response.mustcontain("""v0.1.8""" % HG_REPO) + response.mustcontain("""v0.1.7""" % HG_REPO) + response.mustcontain("""v0.1.6""" % HG_REPO) + response.mustcontain("""v0.1.5""" % HG_REPO) + response.mustcontain("""v0.1.4""" % HG_REPO) + response.mustcontain("""v0.1.3""" % HG_REPO) + response.mustcontain("""v0.1.2""" % HG_REPO) + response.mustcontain("""v0.1.1""" % HG_REPO) def test_index_git(self): self.log_user() response = self.app.get(url(controller='tags', action='index', repo_name=GIT_REPO)) - response.mustcontain("""v0.2.2""" % GIT_REPO) - response.mustcontain("""v0.2.1""" % GIT_REPO) - response.mustcontain("""v0.2.0""" % GIT_REPO) - response.mustcontain("""v0.1.11""" % GIT_REPO) - response.mustcontain("""v0.1.10""" % GIT_REPO) - response.mustcontain("""v0.1.9""" % GIT_REPO) - response.mustcontain("""v0.1.8""" % GIT_REPO) - response.mustcontain("""v0.1.7""" % GIT_REPO) - response.mustcontain("""v0.1.6""" % GIT_REPO) - response.mustcontain("""v0.1.5""" % GIT_REPO) - response.mustcontain("""v0.1.4""" % GIT_REPO) - response.mustcontain("""v0.1.3""" % GIT_REPO) - response.mustcontain("""v0.1.2""" % GIT_REPO) - response.mustcontain("""v0.1.1""" % GIT_REPO) + response.mustcontain("""v0.2.2""" % GIT_REPO) + response.mustcontain("""v0.2.1""" % GIT_REPO) + response.mustcontain("""v0.2.0""" % GIT_REPO) + response.mustcontain("""v0.1.11""" % GIT_REPO) + response.mustcontain("""v0.1.10""" % GIT_REPO) + response.mustcontain("""v0.1.9""" % GIT_REPO) + response.mustcontain("""v0.1.8""" % GIT_REPO) + response.mustcontain("""v0.1.7""" % GIT_REPO) + response.mustcontain("""v0.1.6""" % GIT_REPO) + response.mustcontain("""v0.1.5""" % GIT_REPO) + response.mustcontain("""v0.1.4""" % GIT_REPO) + response.mustcontain("""v0.1.3""" % GIT_REPO) + response.mustcontain("""v0.1.2""" % GIT_REPO) + response.mustcontain("""v0.1.1""" % GIT_REPO)