Create index and worktree objects just once

Create the objects for a repository's default index, worktree, and
index+worktree just once. Both for performance (though the gain is
probably negligible), and for future-proofing if we ever add mutable
state to those objects.

And make them properties while we're at it.

Signed-off-by: Karl Hasselström <kha@treskal.com>

diff --git a/stgit/commands/coalesce.py b/stgit/commands/coalesce.py
index d2cba3ee8c5a17b5a3e853a7d8ba80730c62d45a..291a537486428b5f2dbfb52bc546f09d9b13e8b4 100644 (file)
--- a/stgit/commands/coalesce.py
+++ b/stgit/commands/coalesce.py
@@ -118,5 +118,5 @@ def func(parser, options, args):
                                           + list(stack.patchorder.unapplied)))
     if len(patches) < 2:
         raise common.CmdException('Need at least two patches')
                                           + list(stack.patchorder.unapplied)))
     if len(patches) < 2:
         raise common.CmdException('Need at least two patches')

-    return _coalesce(stack, stack.repository.default_iw(), options.name,
+    return _coalesce(stack, stack.repository.default_iw, options.name,

                      options.message, options.save_template, patches)
                      options.message, options.save_template, patches)

diff --git a/stgit/commands/commit.py b/stgit/commands/commit.py
index 1d741b36beffd7642bb5b7cbebc1b7bf0c4e9c03..bff94ceff9a01b5858f4c48923ec0f6f4f7fe15b 100644 (file)
--- a/stgit/commands/commit.py
+++ b/stgit/commands/commit.py
@@ -68,7 +68,7 @@ def func(parser, options, args):
     if not patches:
         raise common.CmdException('No patches to commit')
 
     if not patches:
         raise common.CmdException('No patches to commit')
 

-    iw = stack.repository.default_iw()
+    iw = stack.repository.default_iw

     trans = transaction.StackTransaction(stack, 'stg commit')
     try:
         common_prefix = 0
     trans = transaction.StackTransaction(stack, 'stg commit')
     try:
         common_prefix = 0

diff --git a/stgit/commands/goto.py b/stgit/commands/goto.py
index 763a8aff29bc16c8d251d384b39848c8e6e8ddc1..fe13e497c50f006c453c81887b3c8c2716a101dd 100644 (file)
--- a/stgit/commands/goto.py
+++ b/stgit/commands/goto.py
@@ -35,7 +35,7 @@ def func(parser, options, args):
     patch = args[0]
 
     stack = directory.repository.current_stack
     patch = args[0]
 
     stack = directory.repository.current_stack

-    iw = stack.repository.default_iw()
+    iw = stack.repository.default_iw

     trans = transaction.StackTransaction(stack, 'stg goto')
     if patch in trans.applied:
         to_pop = set(trans.applied[trans.applied.index(patch)+1:])
     trans = transaction.StackTransaction(stack, 'stg goto')
     if patch in trans.applied:
         to_pop = set(trans.applied[trans.applied.index(patch)+1:])

diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index 118c9b244774fe0dcc6046fb76f6ff8049c1bc52..2af1844e4c887ea079fb8393c661f8f8650b0c4d 100644 (file)
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -211,6 +211,9 @@ class Repository(RunWithEnv):
         self.__refs = Refs(self)
         self.__trees = ObjectCache(lambda sha1: Tree(sha1))
         self.__commits = ObjectCache(lambda sha1: Commit(self, sha1))
         self.__refs = Refs(self)
         self.__trees = ObjectCache(lambda sha1: Tree(sha1))
         self.__commits = ObjectCache(lambda sha1: Commit(self, sha1))

+        self.__default_index = None
+        self.__default_worktree = None
+        self.__default_iw = None

     env = property(lambda self: { 'GIT_DIR': self.__git_dir })
     @classmethod
     def default(cls):
     env = property(lambda self: { 'GIT_DIR': self.__git_dir })
     @classmethod
     def default(cls):


@@ -220,21 +223,32 @@ class Repository(RunWithEnv):
                                ).output_one_line())
         except run.RunException:
             raise RepositoryException('Cannot find git repository')
                                ).output_one_line())
         except run.RunException:
             raise RepositoryException('Cannot find git repository')

+    @property

     def default_index(self):
     def default_index(self):

-        return Index(self, (os.environ.get('GIT_INDEX_FILE', None)
-                            or os.path.join(self.__git_dir, 'index')))
+        if self.__default_index == None:
+            self.__default_index = Index(
+                self, (os.environ.get('GIT_INDEX_FILE', None)
+                       or os.path.join(self.__git_dir, 'index')))
+        return self.__default_index

     def temp_index(self):
         return Index(self, self.__git_dir)
     def temp_index(self):
         return Index(self, self.__git_dir)

+    @property

     def default_worktree(self):
     def default_worktree(self):

-        path = os.environ.get('GIT_WORK_TREE', None)
-        if not path:
-            o = run.Run('git', 'rev-parse', '--show-cdup').output_lines()
-            o = o or ['.']
-            assert len(o) == 1
-            path = o[0]
-        return Worktree(path)
+        if self.__default_worktree == None:
+            path = os.environ.get('GIT_WORK_TREE', None)
+            if not path:
+                o = run.Run('git', 'rev-parse', '--show-cdup').output_lines()
+                o = o or ['.']
+                assert len(o) == 1
+                path = o[0]
+            self.__default_worktree = Worktree(path)
+        return self.__default_worktree
+    @property

     def default_iw(self):
     def default_iw(self):

-        return IndexAndWorktree(self.default_index(), self.default_worktree())
+        if self.__default_iw == None:
+            self.__default_iw = IndexAndWorktree(self.default_index,
+                                                 self.default_worktree)
+        return self.__default_iw

     directory = property(lambda self: self.__git_dir)
     refs = property(lambda self: self.__refs)
     def cat_object(self, sha1):
     directory = property(lambda self: self.__git_dir)
     refs = property(lambda self: self.__refs)
     def cat_object(self, sha1):