kallithea Changeset - 9784a54a0f5b

Changeset - 9784a54a0f5b

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Marcin Kuzminski - 14 years ago 2012-04-17 21:44:26
marcin@python-works.com

display current heads of branches for git in changelog and shortlog

4 files changed with 20 insertions and 22 deletions:

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

rhodecode/lib/vcs/backends/git/repository.py

rhodecode/templates/changelog/changelog.html

rhodecode/templates/shortlog/shortlog_data.html

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -66,26 +66,13 @@ class GitChangeset(BaseChangeset): @@
     @LazyProperty
     def branch(self):
         # TODO: Cache as we walk (id <-> branch name mapping)
         refs = self.repository._repo.get_refs()
         heads = {}
         for key, val in refs.items():
             for ref_key in ['refs/heads/', 'refs/remotes/origin/']:
                 if key.startswith(ref_key):
                     n = key[len(ref_key):]
                     if n not in ['HEAD']:
                         heads[n] = val
         heads = self.repository._heads(reverse=False)
         for name, id in heads.iteritems():
             walker = self.repository._repo.object_store.get_graph_walker([id])
             while True:
                 id_ = walker.next()
                 if not id_:
                     break
                 if id_ == self.id:
                     return safe_unicode(name)
         raise ChangesetError("This should not happen... Have you manually "
                              "change id of the changeset?")
         ref = heads.get(self.raw_id)
         if ref:
             return safe_unicode(ref)
     def _fix_path(self, path):
         """

rhodecode/lib/vcs/backends/git/repository.py

➞

Show inline comments

@@ @@ -246,6 +246,19 @@ class GitRepository(BaseRepository): @@
             if ref.startswith('refs/heads/') and not ref.endswith('/HEAD')]
         return OrderedDict(sorted(_branches, key=sortkey, reverse=False))
     def _heads(self, reverse=False):
         refs = self._repo.get_refs()
         heads = {}
         for key, val in refs.items():
             for ref_key in ['refs/heads/', 'refs/remotes/origin/']:
                 if key.startswith(ref_key):
                     n = key[len(ref_key):]
                     if n not in ['HEAD']:
                         heads[n] = val
         return heads if reverse else dict((y,x) for x,y in heads.iteritems())
     def _get_tags(self):
         if not self.revisions:
             return {}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -91,7 +91,7 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 									%if len(cs.parents)>1:
 									<span class="merge">${_('merge')}</span>
 									%endif
-									%if h.is_hg(c.rhodecode_repo) and cs.branch:
 									%if cs.branch:
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
 									   ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endif

rhodecode/templates/shortlog/shortlog_data.html

➞

Show inline comments

@@ @@ -26,9 +26,7 @@ @@
 		<td>
 			<span class="logtags">
 				<span class="branchtag">
                 %if h.is_hg(c.rhodecode_repo):
                     ${cs.branch}
                 %endif
                 </span>
 			</span>
 		</td>

0 comments (0 inline, 0 general)