kallithea Changeset - ff5caafa26dc

Changeset - ff5caafa26dc

Parent rev.

Child rev.

[Not reviewed]

default

0 5 0

Mads Kiilerich (mads) - 9 years ago 2017-08-28 05:25:40
mads@kiilerich.com

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.

5 files changed with 21 insertions and 24 deletions:

kallithea/controllers/feed.py

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

kallithea/templates/changelog/changelog.html

kallithea/templates/changelog/changelog_summary_data.html

kallithea/templates/changeset/changeset.html

0 comments (0 inline, 0 general)

kallithea/controllers/feed.py

➞

Show inline comments

@@ @@ -83,15 +83,14 @@ class FeedController(BaseRepoController) @@
     def __get_desc(self, cs):
         desc_msg = [(_('%s committed on %s')
                      % (h.person(cs.author), h.fmt_date(cs.date))) + '<br/>']
         #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)
         # rev link
         _url = h.canonical_url('changeset_home', repo_name=c.db_repo.repo_name,
                    revision=cs.raw_id)

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

➞

Show inline comments

@@ @@ -47,12 +47,16 @@ class GitChangeset(BaseChangeset): @@
         self.revision = repository.revisions.index(revision)
         self.nodes = {}
         self._paths = {}
     @LazyProperty
     def bookmarks(self):
         return ()
     @LazyProperty
     def message(self):
         return safe_unicode(self._commit.message)
     @LazyProperty
     def committer(self):
         return safe_unicode(getattr(self._commit, self._committer_property))

kallithea/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -149,19 +149,17 @@ ${self.repo_context_bar('changelog', c.f @@
                                     %endif
                                     %if cs.phase:
                                         <span class="phasetag" title="Phase">
                                             ${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))}
                                         </span>
                                     %endfor
                                     %if (not c.branch_name) and cs.branch:

kallithea/templates/changelog/changelog_summary_data.html

➞

Show inline comments

@@ @@ -45,19 +45,17 @@ @@
         </td>
         <td><span data-toggle="tooltip" title="${h.fmt_date(cs.date)}">
                       ${h.age(cs.date)}</span>
         </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))}
              </span>
             %endfor
             %if cs.branch:

kallithea/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -70,19 +70,17 @@ ${self.repo_context_bar('changelog', c.c @@
                 <div class="pull-right">
                     <span class="logtags">
                         %if len(c.changeset.parents)>1:
                         <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}">
                          ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
                         %endfor

0 comments (0 inline, 0 general)