Extend CachedChangeset and modify CachedRepo for get_branches

scbash · scbash · commit 3da8eeacbb6e · 2010-10-20T11:05:00.000-04:00
Trac's CachedChangeset does not implement get_branches, which is
required to show branch information on the timeline.  This commit
creates a CachedChangeset2 which GitPlugin's CachedRepository2
returns when asked for a changeset.  The new class uses GitPlugin's
internal rev_cache to speed up the branch information retrieval
(shamelessly copied from GitChangeset.get_branches)
diff --git a/tracext/git/git_fs.py b/tracext/git/git_fs.py
@@ -19,7 +19,7 @@
 from trac.versioncontrol.api import \
      Changeset, Node, Repository, IRepositoryConnector, NoSuchChangeset, NoSuchNode
 from trac.wiki import IWikiSyntaxProvider
-from trac.versioncontrol.cache import CachedRepository
+from trac.versioncontrol.cache import CachedRepository, CachedChangeset
 from trac.versioncontrol.web_ui import IPropertyRenderer
 from trac.config import BoolOption, IntOption, PathOption, Option
 from trac.web.chrome import Chrome
@@ -46,7 +46,16 @@ def normalize_rev(self, rev):
         if normrev is None:
             raise NoSuchChangeset(rev)
         return normrev
+    def get_changeset(self, rev):
+        return CachedChangeset2(self, self.normalize_rev(rev), self.env)
+
+class CachedChangeset2(CachedChangeset):
+    def get_branches(self):
+        _rev = self.rev
 
+        return [ (k, v == _rev) for k, v in 
+                    self.repos.repos.git.get_branch_contains(_rev, resolve=True) ]
+                                                 
 
 def _last_iterable(iterable):
     "helper for detecting last iteration in for-loop"
