Changeset 3209

Timestamp:

02/11/08 05:23:19 (10 months ago)

Author:

hvr

Message:

GitPlugin: cleanups, factorizations, and minor fixes

Files:

• gitplugin/0.11/tracext/git/git_fs.py (modified) (12 diffs)

gitplugin/0.11/tracext/git/git_fs.py

@@ -34 +34 @@
-import PyGIT
-
+
+# helper
+def _parse_user_time(s):
+        """parse author/committer attribute lines and return
+        (user,timestamp)"""
+        (user,time,tz_str) = s.rsplit(None, 2)
+        tz = FixedOffset((int(tz_str)*6)/10, tz_str)
+        time = datetime.fromtimestamp(float(time), tz)
+        return (user,time)
+
-class GitConnector(Component):
-        implements(IRepositoryConnector, IWikiSyntaxProvider, IPropertyRenderer)
@@ -68 +78 @@
-        # relied upon by GitChangeset
-
-        _rendered_props = ('Parents','Children','git-committer','git-author')
-
-        def match_property(self, name, mode):
-                if name in ('Parents','Children','git-committer','git-author') \
@@ -163 +171 @@
-
-        def normalize_rev(self, rev):
-rev=='None' or rev == None or rev == '
+not rev or rev=='None
-                        return self.get_youngest_rev()
-                normrev=self.git.verifyrev(rev)
@@ -174 +182 @@
-
-        def get_node(self, path, rev=None):
-
+, self.log
-
-        def get_quickjump_entries(self, rev):
@@ -202 +210 @@
-                        (mode1,mode2,obj1,obj2,action,path) = chg
-
-
+
+
-                                kind = Node.DIRECTORY
-                        else:
-                                kind = Node.FILE
-
-                        change = GitChangeset.action_map[action]
@@ -245 +252 @@
-
-class GitNode(Node):
-
+
+
-                self.git = git
-sha = None
-
-data_len
+fs_sha = None # points to either tree or blobs
+fs_
+fs_size
-
-                kind = Node.DIRECTORY
-                p = path.strip('/')
- != "":
-ls_tree_info == None or ls_tree_info == ""
-
- != []
+: # ie. not the root-tree
+not ls_tree_info
+ or None
+
-                                        [ls_tree_info] = ls_tree_info
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-                        if k=='tree':
@@ -273 +280 @@
-                                kind = Node.FILE
-                        else:
-
-
-
+
-
-                self.created_path = path
-                self.created_rev = rev
-
+                Node.__init__(self, path, rev, kind)
+
+        def __git_path(self):
+                "return path as expected by PyGIT"
+                p = self.path.strip('/')
+                if self.isfile:
+                        assert p
+                        return p
+                if self.isdir:
+                        return p and (p + '/')
+
+                raise TracError("internal error")
+
-        def get_content(self):
-
-
-
-
-
+
+
+
+
-
-        def get_properties(self):
-
-
-
+
-
-        def get_annotations(self):
-                p = self.path.strip('/')
-                if not self.isfile:
-                        return
-
-
-
-
-
-
+
-
-        def get_entries(self):
@@ -307 +317 @@
-                        return
-
-
-
-
-
+
+
-
-        def get_content_type(self):
-                if self.isdir:
-                        return None
+
-                return ''
-
-        def get_content_length(self):
-
-
-
-
-
+
+
+
+
+
+
+
-
-        def get_history(self, limit=None):
-
-
-
+
-                        yield (self.path, rev, Changeset.EDIT)
-
@@ -340 +349 @@
-                'D': Changeset.DELETE 
-                }
-
-        # helper
-        def __parse_user_time(self, s):
-                """parse author/committer attribute lines and return
-                (user,timestamp)"""
-                (user,time,tz_str) = s.rsplit(None, 2)
-                tz = FixedOffset((int(tz_str)*6)/10, tz_str)
-                time = datetime.fromtimestamp(float(time), tz)
-                return (user,time)
-
-        def __init__(self, git, sha):
@@ -364 +364 @@
-
-                # use 1st committer as changeset owner/timestamp
-self._
+
-
-                Changeset.__init__(self, sha, msg, user_, time_)
@@ -376 +376 @@
-                if 'committer' in self.props:
-                        properties['git-committer'] = \
-self._
+
-                if 'author' in self.props:
-self._
+
-                        if not (properties.has_key('git-committer') and
-                                properties['git-committer'] == git_author):
@@ -390 +390 @@
-                for chg in self.git.diff_tree(prev, self.rev):
-                        (mode1,mode2,obj1,obj2,action,path) = chg
+
-                        kind = Node.FILE
-1[0:1] == '04' or mode2[0:1] == '04'
+2.startswith('04') or mode1.startswith('04')
-                                kind = Node.DIRECTORY
-