Changeset 7695

Timestamp:

Feb 21, 2010, 10:28:17 PM (14 years ago)

Author:

Herbert Valerio Riedel

Message:

created 0.12/ branch, tweaked setup.py, and applied patch by kevin.mcconnell@… (see #6554)

Location:

gitplugin/0.12

Files:

• . (copied) (copied from gitplugin/0.11)
• setup.py (modified) (1 diff)
• tracext/git/PyGIT.py (modified) (1 diff)
• tracext/git/git_fs.py (modified) (22 diffs)

gitplugin/0.12/setup.py

@@ -5 +5 @@
 setup(
     name='TracGit',
-    install_requires='Trac ==0.11, ==0.11rc2, ==0.11rc1, ==0.11b2, ==0.11b1, >=0.11dev',
-    description='GIT version control plugin for Trac 0.11',
+    install_requires=[],#'Trac ==0.12',
+    description='GIT version control plugin for Trac 0.12',
     author='Herbert Valerio Riedel',
     author_email='hvr@gnu.org',
     keywords='trac scm plugin git',
     url="http://trac-hacks.org/wiki/GitPlugin",
-    version='0.11.0.2',
+    version='0.12.0.2',
     license="GPL",
     long_description="""
-    This Trac 0.11 plugin provides support for the GIT SCM.
+    This Trac 0.12 plugin provides support for the GIT SCM.
 
     See http://trac-hacks.org/wiki/GitPlugin for more details.

gitplugin/0.12/tracext/git/PyGIT.py

@@ -506 +506 @@
             raise GitError("read_commit called with empty commit_id")
 
-        commit_id = str(commit_id)
+        commit_id = self.fullrev(commit_id)
 
         db = self.get_commits()

gitplugin/0.12/tracext/git/git_fs.py

@@ -27 +27 @@
         def short_rev(self, path):
                 return self.repos.short_rev(path)
+        def normalize_rev(self, rev):
+                if not rev:
+                        return self.repos.get_youngest_rev()
+                normrev=self.repos.git.verifyrev(rev)
+                if normrev is None:
+                        raise NoSuchChangeset(rev)
+                return normrev
+
 
 from genshi.builder import tag
@@ -144 +152 @@
                 yield ("git", 8)
 
-        def get_repository(self, type, dir, authname):
+        def get_repository(self, type, dir, params):
                 """GitRepository factory method"""
                 assert type == "git"
@@ -154 +162 @@
                                         (self._version['v_str'], self._version['v_min_str']))
 
-                repos = GitRepository(dir, self.log,
+                repos = GitRepository(dir, params, self.log,
                                       persistent_cache=self._persistent_cache,
                                       git_bin=self._git_bin,
@@ -160 +168 @@
 
                 if self._cached_repository:
-                        repos = CachedRepository2(self.env.get_db_cnx(), repos, None, self.log)
+                        repos = CachedRepository2(self.env, repos, self.log)
                         self.log.info("enabled CachedRepository for '%s'" % dir)
                 else:
@@ -168 +176 @@
 
 class GitRepository(Repository):
-        def __init__(self, path, log, persistent_cache=False, git_bin='git', shortrev_len=7):
+        def __init__(self, path, params, log, persistent_cache=False,
+                        git_bin='git', shortrev_len=7):
                 self.logger = log
                 self.gitrepo = path
+                self.params = params
                 self._shortrev_len = max(4, min(shortrev_len, 40))
 
                 self.git = PyGIT.StorageFactory(path, log, not persistent_cache,
                                                 git_bin=git_bin).getInstance()
-                Repository.__init__(self, "git:"+path, None, log)
+                Repository.__init__(self, "git:"+path, self.params, log)
 
         def close(self):
@@ -207 +217 @@
 
         def get_node(self, path, rev=None):
-                return GitNode(self.git, path, rev, self.log)
+                return GitNode(self, path, rev, self.log)
 
         def get_quickjump_entries(self, rev):
@@ -221 +231 @@
         def get_changeset(self, rev):
                 """GitChangeset factory method"""
-                return GitChangeset(self.git, rev)
+                return GitChangeset(self, rev)
 
         def get_changes(self, old_path, old_rev, new_path, new_rev, ignore_ancestry=0):
@@ -260 +270 @@
                 self.sync()
 
-        def sync(self, rev_callback=None):
+        def sync(self, rev_callback=None, clean=None):
                 if rev_callback:
                         revs = set(self.git.all_revs())
@@ -273 +283 @@
 
 class GitNode(Node):
-        def __init__(self, git, path, rev, log, ls_tree_info=None):
+        def __init__(self, repos, path, rev, log, ls_tree_info=None):
                 self.log = log
-                self.git = git
+                self.repos = repos
                 self.fs_sha = None # points to either tree or blobs
                 self.fs_perm = None
@@ -285 +295 @@
                 if p: # ie. not the root-tree
                         if not ls_tree_info:
-                                ls_tree_info = git.ls_tree(rev, p) or None
+                                ls_tree_info = repos.git.ls_tree(rev, p) or None
                                 if ls_tree_info:
                                         [ls_tree_info] = ls_tree_info
@@ -295 +305 @@
 
                         # fix-up to the last commit-rev that touched this node
-                        rev = self.git.last_change(rev, p)
+                        rev = repos.git.last_change(rev, p)
 
                         if k=='tree':
@@ -307 +317 @@
                 self.created_rev = rev
 
-                Node.__init__(self, path, rev, kind)
+                Node.__init__(self, repos, path, rev, kind)
 
         def __git_path(self):
@@ -324 +334 @@
                         return None
 
-                return self.git.get_file(self.fs_sha)
+                return self.repos.git.get_file(self.fs_sha)
 
         def get_properties(self):
@@ -333 +343 @@
                         return
 
-                return [ rev for (rev,lineno) in self.git.blame(self.rev, self.__git_path()) ]
+                return [ rev for (rev,lineno) in self.repos.git.blame(self.rev, self.__git_path()) ]
 
         def get_entries(self):
@@ -339 +349 @@
                         return
 
-                for ent in self.git.ls_tree(self.rev, self.__git_path()):
-                        yield GitNode(self.git, ent[-1], self.rev, self.log, ent)
+                for ent in self.repos.git.ls_tree(self.rev, self.__git_path()):
+                        yield GitNode(self.repos, ent[-1], self.rev, self.log, ent)
 
         def get_content_type(self):
@@ -353 +363 @@
 
                 if self.fs_size is None:
-                        self.fs_size = self.git.get_obj_size(self.fs_sha)
+                        self.fs_size = self.repos.git.get_obj_size(self.fs_sha)
 
                 return self.fs_size
@@ -359 +369 @@
         def get_history(self, limit=None):
                 # TODO: find a way to follow renames/copies
-                for is_last,rev in _last_iterable(self.git.history(self.rev, self.__git_path(), limit)):
+                for is_last,rev in _last_iterable(self.repos.git.history(self.rev, self.__git_path(), limit)):
                         yield (self.path, rev, Changeset.EDIT if not is_last else Changeset.ADD)
 
@@ -367 +377 @@
 
                 try:
-                        msg, props = self.git.read_commit(self.rev)
+                        msg, props = self.repos.git.read_commit(self.rev)
                         user,ts = _parse_user_time(props['committer'][0])
                 except:
@@ -386 +396 @@
                 } # TODO: U, X, B
 
-        def __init__(self, git, sha):
-                self.git = git
+        def __init__(self, repos, sha):
+                self.repos = repos
                 try:
-                        (msg, props) = git.read_commit(sha)
+                        (msg, props) = repos.git.read_commit(sha)
                 except PyGIT.GitErrorSha:
                         raise NoSuchChangeset(sha)
@@ -395 +405 @@
 
                 assert 'children' not in props
-                _children = list(git.children(sha))
+                _children = list(repos.git.children(sha))
                 if _children:
                         props['children'] = _children
@@ -402 +412 @@
                 (user_, time_) = _parse_user_time(props['committer'][0])
 
-                Changeset.__init__(self, sha, msg, user_, time_)
+                Changeset.__init__(self, repos, sha, msg, user_, time_)
 
         def get_properties(self):
@@ -424 +434 @@
                 for parent in self.props.get('parent', [None]):
                         for mode1,mode2,obj1,obj2,action,path1,path2 in \
-                                    self.git.diff_tree(parent, self.rev, find_renames=True):
+                                    self.repos.git.diff_tree(parent, self.rev, find_renames=True):
                                 path = path2 or path1
                                 p_path, p_rev = path1, parent