Changeset 3197

Timestamp:

02/08/08 05:25:47 (10 months ago)

Author:

hvr

Message:

GitPlugin: implemented "blame"/annotate support for 0.11

Files:

• gitplugin/0.11/gitplugin/git_fs.py (modified) (4 diffs)
• gitplugin/0.11/gitplugin/PyGIT.py (modified) (1 diff)

gitplugin/0.11/gitplugin/git_fs.py

@@ -149 +149 @@
-
-        def get_node(self, path, rev=None):
-                #print "get_node", path, rev
-                return GitNode(self.git, path, rev)
-
@@ -220 +219 @@
-        def __init__(self, git, path, rev, tree_ls_info=None):
-                self.git = git
-rev
+None
-                self.perm = None
-                self.data_len = None
@@ -235 +234 @@
-
-                        if tree_ls_info != None:
-k,self.sha,
+ k, self.sha, 
-                        else:
-                                k = 'blob'
-
-=self.git.last_change(rev, p)
+ = self.git.last_change(rev, p) # FIXME
-
-                        if k=='tree':
@@ -265 +264 @@
-                return {}
-
+        def get_annotations(self):
+                p = self.path.strip('/')
+                if not self.isfile:
+                        return
+
+                result = []
+                for brev,blineno in self.git.blame(self.rev, p):
+                        result.append(brev)
+
+                return result
+
-        def get_entries(self):
-                if self.isfile:
-                        return
-                if not self.isdir:
-                        return

gitplugin/0.11/gitplugin/PyGIT.py

@@ -365 +365 @@
-        return rev2 in self.children_recursive(rev1)
-
+    def blame(self, commit_sha, path):
+        in_metadata = False
+        for line in self._git_call_f("git-blame -p -- '%s' %s" \
+                                         % (path, commit_sha)).readlines():
+            assert line
+            if in_metadata:
+                in_metadata = line[0] != '\t'
+            else:
+                split_line = line.split()
+                if len(split_line) == 4:
+                    (sha, orig_lineno, lineno, group_size) = split_line
+                else:
+                    (sha, orig_lineno, lineno) = split_line
+
+                assert len(sha) == 40
+                yield (sha, lineno)
+                in_metadata = True
+
+        assert not in_metadata
+
-    def last_change(self, sha, path):
-        for rev in self._git_call_f("git-rev-list --max-count=1 %s -- '%s'" % (sha,path)).readlines():