vcs: let Git changesets return an empty set of bookmarks and drop vcs check before iterating bookmarks

Git repositories already had an empty set of bookmarks. Do the same for Git changesets.

kallithea/controllers/feed.py

@@ -86,9 +86,8 b' class FeedController(BaseRepoController)'
         #branches, tags, bookmarks
         if cs.branch:
             desc_msg.append('branch: %s<br/>' % cs.branch)
-        if h.is_hg(c.db_repo_scm_instance):
-            for book in cs.bookmarks:
-                desc_msg.append('bookmark: %s<br/>' % book)
+        for book in cs.bookmarks:
+            desc_msg.append('bookmark: %s<br/>' % book)
         for tag in cs.tags:
             desc_msg.append('tag: %s<br/>' % tag)
         diff_processor, changes = self.__changes(cs)

kallithea/lib/vcs/backends/git/changeset.py

@@ -50,6 +50,10 b' class GitChangeset(BaseChangeset):'
         self._paths = {}
 
     @LazyProperty
+    def bookmarks(self):
+        return ()
+
+    @LazyProperty
     def message(self):
         return safe_unicode(self._commit.message)
 

kallithea/templates/changelog/changelog.html

@@ -152,13 +152,11 b''
                                             ${cs.phase}
                                         </span>
                                     %endif
-                                    %if h.is_hg(c.db_repo_scm_instance):
-                                        %for book in cs.bookmarks:
-                                            <span class="booktag" title="${_('Bookmark %s') % book}">
-                                                ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                                            </span>
-                                        %endfor
-                                    %endif
+                                    %for book in cs.bookmarks:
+                                        <span class="booktag" title="${_('Bookmark %s') % book}">
+                                            ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                                        </span>
+                                    %endfor
                                     %for tag in cs.tags:
                                         <span class="tagtag" title="${_('Tag %s') % tag}">
                                             ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

kallithea/templates/changelog/changelog_summary_data.html

@@ -48,13 +48,11 b''
         </td>
         <td title="${cs.author}">${h.person(cs.author)}</td>
         <td>
-            %if h.is_hg(c.db_repo_scm_instance):
-                %for book in cs.bookmarks:
-                    <span class="booktag" title="${_('Bookmark %s') % book}">
-                        ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
-                    </span>
-                %endfor
-            %endif
+            %for book in cs.bookmarks:
+                <span class="booktag" title="${_('Bookmark %s') % book}">
+                    ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                </span>
+            %endfor
             %for tag in cs.tags:
              <span class="tagtag" title="${_('Tag %s') % tag}">
                  ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}

kallithea/templates/changeset/changeset.html

@@ -73,13 +73,11 b''
                         <span class="mergetag">${_('Merge')}</span>
                         %endif
 
-                        %if h.is_hg(c.db_repo_scm_instance):
-                          %for book in c.changeset.bookmarks:
-                          <span class="booktag" title="${_('Bookmark %s') % book}">
-                             ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
-                          </span>
-                          %endfor
-                        %endif
+                        %for book in c.changeset.bookmarks:
+                        <span class="booktag" title="${_('Bookmark %s') % book}">
+                           ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
+                        </span>
+                        %endfor
 
                         %for tag in c.changeset.tags:
                          <span class="tagtag"  title="${_('Tag %s') % tag}">