kallithea Changeset - 11feddcd75bb

Changeset - 11feddcd75bb

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2013-03-24 19:58:24
marcin@python-works.com

after hooks cleanup we don't need to have ui injections into repo so we don't need to cache git repos
- change to @property fixes all odd concurrency issues with zlib decompressions

2 files changed with 6 insertions and 5 deletions:

rhodecode/lib/middleware/simplegit.py

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

0 comments (0 inline, 0 general)

rhodecode/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -314,13 +314,12 @@ class SimpleGit(BaseVCSController): @@
         if len(service) < 2:
             return
         from rhodecode.model.db import Repository
         _repo = Repository.get_by_repo_name(repo_name)
         _repo = _repo.scm_instance
         _repo._repo.ui = baseui
         _hooks = dict(baseui.configitems('hooks')) or {}
         if action == 'pull':
             # stupid git, emulate pre-pull hook !
             pre_pull(ui=baseui, repo=_repo._repo)
         if action == 'pull' and _hooks.get(RhodeCodeUi.HOOK_PULL):

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

➞

Show inline comments

@@ @@ -61,13 +61,13 @@ class GitRepository(BaseRepository): @@
         self._config_files = [
             bare and abspath(self.path, 'config')
                      or abspath(self.path, '.git', 'config'),
             abspath(get_user_home(), '.gitconfig'),
+        ]
-    @ThreadLocalLazyProperty
+    @property
     def _repo(self):
         return Repo(self.path)
     @property
     def head(self):
         try:
@@ @@ -416,25 +416,27 @@ class GitRepository(BaseRepository): @@
     @LazyProperty
     def _parsed_refs(self):
         return self._get_parsed_refs()
     def _get_parsed_refs(self):
         refs = self._repo.get_refs()
         # cache the property
         _repo = self._repo
         refs = _repo.get_refs()
         keys = [('refs/heads/', 'H'),
                 ('refs/remotes/origin/', 'RH'),
                 ('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)
                         obj = _repo.get_object(sha)
                         if isinstance(obj, Tag):
-                            sha = self._repo.get_object(sha).object[1]
                             sha = _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)