Changeset 3202

Timestamp:

02/09/08 05:15:03 (10 months ago)

Author:

hvr

Message:

GitPlugin:

• factorized git execution
  
• implemented GIT version check (requires >= 1.5.2 now)
  

Files:

• gitplugin/0.11/gitplugin/git_fs.py (modified) (2 diffs)
• gitplugin/0.11/gitplugin/PyGIT.py (modified) (7 diffs)

gitplugin/0.11/gitplugin/git_fs.py

@@ -39 +39 @@
-                self._version = None
-
+                try:
+                        self._version = PyGIT.git_version()
+                except PyGIT.GitError, e:
+                        self.log.error("GitError: "+e.message)
+
+                if self._version:
+                        self.log.info("detected GIT version %s" % self._version['v_str'])
+                        self.env.systeminfo.append(('GIT', self._version['v_str']))
+                        if self._version['v_compatible']:
+                                self.log.error("GIT version %s installed not compatible (need >= %s)" %
+                                               (self._version['v_str'], self._version['v_min_str']))
+
-        def _format_sha_link(self, formatter, ns, sha, label, fullmatch=None):
-                try:
@@ -92 +104 @@
-                """GitRepository factory method"""
-                if not self._version:
-
-
+
+
+
+
-
-                options = dict(self.config.options(type))

gitplugin/0.11/gitplugin/PyGIT.py

@@ -17 +17 @@
-#from traceback import print_stack
-
-_profile_git_calls = False
-
-class GitError(Exception):
-    pass
@@ -25 +23 @@
-    pass
-
+GIT_CMD = "git"
+GIT_VERSION_MIN_REQUIRED = (1,5,2)
+GIT_PROFILE = False
+
+def _git_execute(gitcmd, git_dir=None, *args):
+    if GIT_PROFILE:
+        t = time.time()
+
+    # construct command tuple
+    cmd = [GIT_CMD]
+    if git_dir:
+        cmd.append('--git-dir=%s' % git_dir)
+    cmd.append(gitcmd)
+    cmd.extend(args)
+
+    # fds = (input, output, error)
+    fds = os.popen3(cmd)
+
+    if GIT_PROFILE:
+        t = time.time() - t # doesn't work actually, as popen3 runs async
+        print >>sys.stderr, "GIT: took %6.2fs for '%s'" % (t, cmd)
+        pass
+
+    return fds
+
-def git_version():
-    try:
-(input, output, error) = os.popen3('git --version')
+output = _git_execute("version")[1]
-        [v] = output.readlines()
-
-
+
+
+
+
+
+
+
+
+
+
-    except:
-
+("Could not retrieve GIT version")
-
-class StorageFactory:
@@ -84 +115 @@
-    def __del__(self):
-        self.logger.debug("PyGIT.Storage instance %d destructed" % id(self))
+
+    def _git_call_f(self, gitcmd, args=[]):
+        (input, output, error) = _git_execute(gitcmd, self.repo, *args)
+        return output
+
+    def _git_call(self, cmd, args=[]):
+        return self._git_call_f(cmd, args).read()
-
-    def _invalidate_caches(self,youngest_rev=None):
@@ -190 +228 @@
-        return self.history_relative_rev(sha, +1)
-
-    def _git_call_f(self, gitcmd, args=[]):
-        #print "GIT: "+cmd
-        if _profile_git_calls:
-            t = time.time()
-            pass
-
-        cmd = ["git", '--git-dir=%s' % self.repo, gitcmd]
-        cmd.extend(args)
-
-        (input, output, error) = os.popen3(cmd)
-
-        if _profile_git_calls:
-            t = time.time() - t # doesn't work actually, as popen3 runs async
-            print >>sys.stderr, "GIT: took %6.2fs for '%s'" % (t, cmd)
-            pass
-
-        return output
-
-    def _git_call(self, cmd, args=[]):
-        return self._git_call_f(cmd, args).read()
-
-    def get_commit_encoding(self):
-        if self.commit_encoding is None:
@@ -258 +275 @@
-        for e in self._git_call_f("branch", ["-v", "--no-abbrev"]).readlines():
-            (bname,bsha)=e[1:].strip().split()[:2]
-[0]=='*'
+.startswith('*')
-                result.insert(0,(bname,bsha))
-            else:
@@ -381 +398 @@
-            assert line
-            if in_metadata:
-line[0] != '\t'
+not line.startswith('\t')
-            else:
-                split_line = line.split()
@@ -430 +447 @@
-if __name__ == '__main__':
-    import sys, logging
+
+    print "git version [%s]" % str(git_version())
-
-    g = Storage(sys.argv[1], logging)