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

@@ @@ -57,44 +57,31 @@ class GitChangeset(BaseChangeset): @@
         return date_fromtimestamp(self._commit.commit_time,
                                   self._commit.commit_timezone)
     @LazyProperty
     def status(self):
         """
         Returns modified, added, removed, deleted files for current changeset
         """
         return self.changed, self.added, self.removed
     @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):
         """
         Paths are stored without trailing slash so we need to get rid off it if
         needed.
         """
         if path.endswith('/'):
             path = path.rstrip('/')
         return path
     def _get_id_for_path(self, path):

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

➞

Show inline comments

@@ @@ -237,24 +237,37 @@ class GitRepository(BaseRepository): @@
     @property
     def branches(self):
         if not self.revisions:
             return {}
         refs = self._repo.refs.as_dict()
         sortkey = lambda ctx: ctx[0]
         _branches = [('/'.join(ref.split('/')[2:]), head)
             for ref, head in refs.items()
             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 {}
         sortkey = lambda ctx: ctx[0]
         _tags = [('/'.join(ref.split('/')[2:]), head) for ref, head in
             self._repo.get_refs().items() if ref.startswith('refs/tags/')]
         return OrderedDict(sorted(_tags, key=sortkey, reverse=True))
     @LazyProperty
     def tags(self):
         return self._get_tags()

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -82,25 +82,25 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 											<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 										</div>
 									%endfor
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif
 								<span class="logtags">
 									%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
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 										${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endfor
 								</span>
 						</div>
 					</div>
 				%endfor

rhodecode/templates/shortlog/shortlog_data.html

➞

Show inline comments

@@ @@ -17,27 +17,25 @@ @@
         <td>
             ${h.link_to(h.truncate(cs.message,50),
             h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
             title=cs.message)}
         </td>
         <td><span class="tooltip" title="${cs.date}">
                       ${h.age(cs.date)}</span>
         </td>
 		<td title="${cs.author}">${h.person(cs.author)}</td>
 		<td>
 			<span class="logtags">
 				<span class="branchtag">
                 %if h.is_hg(c.rhodecode_repo):
                     ${cs.branch}
                 %endif
                 </span>
 			</span>
 		</td>
 		<td>
 			<span class="logtags">
 				%for tag in cs.tags:
 					<span class="tagtag">${tag}</span>
 				%endfor
 			</span>
 		</td>
 	</tr>
 %endfor

0 comments (0 inline, 0 general)