##// END OF EJS Templates
fixes #625 Git-Tags are not displayed in Shortlog...
marcink -
r2975:e0da2c0e beta
parent child Browse files
Show More
@@ -46,8 +46,7 b' class GitChangeset(BaseChangeset):'
46 self.revision = repository.revisions.index(revision)
46 self.revision = repository.revisions.index(revision)
47
47
48 self.message = safe_unicode(commit.message)
48 self.message = safe_unicode(commit.message)
49 #self.branch = None
49
50 self.tags = []
51 self.nodes = {}
50 self.nodes = {}
52 self._paths = {}
51 self._paths = {}
53
52
@@ -72,6 +71,14 b' class GitChangeset(BaseChangeset):'
72 return self.changed, self.added, self.removed
71 return self.changed, self.added, self.removed
73
72
74 @LazyProperty
73 @LazyProperty
74 def tags(self):
75 _tags = []
76 for tname, tsha in self.repository.tags.iteritems():
77 if tsha == self.raw_id:
78 _tags.append(tname)
79 return _tags
80
81 @LazyProperty
75 def branch(self):
82 def branch(self):
76
83
77 heads = self.repository._heads(reverse=False)
84 heads = self.repository._heads(reverse=False)
@@ -18,7 +18,7 b' import traceback'
18 import urllib
18 import urllib
19 import urllib2
19 import urllib2
20 from dulwich.repo import Repo, NotGitRepository
20 from dulwich.repo import Repo, NotGitRepository
21 #from dulwich.config import ConfigFile
21 from dulwich.objects import Tag
22 from string import Template
22 from string import Template
23 from subprocess import Popen, PIPE
23 from subprocess import Popen, PIPE
24 from rhodecode.lib.vcs.backends.base import BaseRepository
24 from rhodecode.lib.vcs.backends.base import BaseRepository
@@ -401,6 +401,10 b' class GitRepository(BaseRepository):'
401 for k, type_ in keys:
401 for k, type_ in keys:
402 if ref.startswith(k):
402 if ref.startswith(k):
403 _key = ref[len(k):]
403 _key = ref[len(k):]
404 if type_ == 'T':
405 obj = self._repo.get_object(sha)
406 if isinstance(obj, Tag):
407 sha = self._repo.get_object(sha).object[1]
404 _refs[_key] = [sha, type_]
408 _refs[_key] = [sha, type_]
405 break
409 break
406 return _refs
410 return _refs
General Comments 0
You need to be logged in to leave comments. Login now