kallithea Changeset - e0da2c0ecee1

Changeset - e0da2c0ecee1

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-10-29 22:26:44
marcin@python-works.com

fixes #625 Git-Tags are not displayed in Shortlog
- improved git extraction of git tags if they are associated to a commit
- added not implemented tags() function for git changesets

2 files changed with 14 insertions and 3 deletions:

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

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

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -43,14 +43,13 @@ class GitChangeset(BaseChangeset): @@
         self._commiter_property = 'committer'
         self._date_property = 'commit_time'
         self._date_tz_property = 'commit_timezone'
         self.revision = repository.revisions.index(revision)
         self.message = safe_unicode(commit.message)
         #self.branch = None
         self.tags = []
         self.nodes = {}
         self._paths = {}
     @LazyProperty
     def author(self):
         return safe_unicode(getattr(self._commit, self._commiter_property))
@@ @@ -69,12 +68,20 @@ class GitChangeset(BaseChangeset): @@
         """
         Returns modified, added, removed, deleted files for current changeset
         """
         return self.changed, self.added, self.removed
     @LazyProperty
     def tags(self):
         _tags = []
         for tname, tsha in self.repository.tags.iteritems():
             if tsha == self.raw_id:
                 _tags.append(tname)
         return _tags
     @LazyProperty
     def branch(self):
         heads = self.repository._heads(reverse=False)
         ref = heads.get(self.raw_id)
         if ref:

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

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ import time @@
 import posixpath
 import logging
 import traceback
 import urllib
 import urllib2
 from dulwich.repo import Repo, NotGitRepository
-#from dulwich.config import ConfigFile
+from dulwich.objects import Tag
 from string import Template
 from subprocess import Popen, PIPE
 from rhodecode.lib.vcs.backends.base import BaseRepository
 from rhodecode.lib.vcs.exceptions import BranchDoesNotExistError
 from rhodecode.lib.vcs.exceptions import ChangesetDoesNotExistError
 from rhodecode.lib.vcs.exceptions import EmptyRepositoryError
@@ @@ -398,12 +398,16 @@ class GitRepository(BaseRepository): @@
                 ('refs/tags/', 'T')]
         _refs = {}
         for ref, sha in refs.iteritems():
             for k, type_ in keys:
                 if ref.startswith(k):
                     _key = ref[len(k):]
                     if type_ == 'T':
                         obj = self._repo.get_object(sha)
                         if isinstance(obj, Tag):
                             sha = self._repo.get_object(sha).object[1]
                     _refs[_key] = [sha, type_]
                     break
         return _refs
     def _heads(self, reverse=False):
         refs = self._repo.get_refs()

0 comments (0 inline, 0 general)