Changeset 3268

Timestamp:

02/24/08 03:20:45 (9 months ago)

Author:

hvr

Message:

GitPlugin: various cleanups and minor improvements

Files:

• gitplugin/0.11/tracext/git/PyGIT.py (modified) (20 diffs)

gitplugin/0.11/tracext/git/PyGIT.py

@@ -51 +51 @@
-        return partial(self.__execute, name.replace('_','-'))
-
+    @staticmethod
+    def is_sha(sha):
+        """returns whether sha is a potential sha id
+        (i.e. proper hexstring between 4 and 40 characters"""
+        if len(sha) < 4 or len(sha) > 40:
+            return False
+        HEXCHARS = "0123456789abcdefABCDEF"
+        return all(s in HEXCHARS for s in sha)
-
-# helper class for caching...
@@ -115 +123 @@
-class Storage:
-    __SREV_MIN = 4 # minimum short-rev length
+
+    @staticmethod
+    def __rev_key(rev):
+        assert len(rev) >= 4
+        #assert GitCore.is_sha(rev)
+        srev_key = int(rev[:4], 16)
+        assert srev_key >= 0 and srev_key <= 0xffff
+        return srev_key
-
-    @staticmethod
@@ -152 +168 @@
-        self.logger.debug("PyGIT.Storage instance %d constructed" % id(self))
-
-        self.git_dir = git_dir
-        self.repo = GitCore(git_dir)
-
-        self.commit_encoding = None
-
-self._lock = Lock()
-last_youngest_rev = -1
-invalidate_caches
+# caches
+__rev_cache = None
+_rev_cache_lock = Lock
-
-        # cache the last 200 commit messages
@@ -172 +187 @@
-        self.logger.debug("PyGIT.Storage instance %d destructed" % id(self))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                self.logger.debug("triggered rebuild of commit tree db for %d" % id(self))
-                new_db = {}
-                new_sdb = {}
-                new_tags = set([])
-                parent = None
-                youngest = None
-rd_rev = 0
+ldest = None
-                for revs in self.repo.rev_parse("--tags").readlines():
-                    new_tags.add(revs.strip())
@@ -203 +227 @@
-                    return __rev_seen.setdefault(rev, rev)
-
+                ord_rev = 0
-                for revs in self.repo.rev_list("--parents", "--all").readlines():
-                    revs = revs.strip().split()
@@ -211 +236 @@
-
-                    # shortrev "hash" map
-
-
+
-                    new_sdb.setdefault(srev_key, []).append(rev)
-
@@ -219 +243 @@
-                    ord_rev += 1
-
+                    # first rev seen is assumed to be the youngest one (and has ord_rev=1)
-                    if not youngest:
-                        youngest = rev
@@ -241 +266 @@
-                            _children.append(rev)
-
+                # last rev seen is assumed to be the oldest one (with highest ord_rev)
+                oldest = rev
+
-                __rev_seen = None
+
+                assert len(new_db) == ord_rev
-
-                # convert children lists to tuples
-                tmp = {}
-while True
-try
+try
+while True
-                        k,v = new_db.popitem()
+                        assert v[2] > 0
-                        tmp[k] = tuple(v[0]),v[1],v[2]
-
-
+
+
+
-                assert len(new_db) == 0
-                new_db = tmp
@@ -257 +289 @@
-                tmp = [()]*(max(new_sdb.keys())+1) if len(new_sdb) > 5000 else {}
-
-while True
-try
+try
+while True
-                        k,v = new_sdb.popitem()
-                        tmp[k] = tuple(v)
-    
-    break
+
+pass
-
-                assert len(new_sdb) == 0
-                new_sdb = tmp
-
-
-
-
+
+
-                self.logger.debug("rebuilt commit tree db for %d with %d entries" % (id(self),len(new_db)))
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    def oldest_rev(self):
-
-
+
-
-    def youngest_rev(self):
-
-
+
-
-    def history_relative_rev(self, sha, rel_pos):
@@ -328 +360 @@
-    def verifyrev(self, rev):
-        "verify/lookup given revision object and return a sha id or None if lookup failed"
-        db = self.get_commits()
-        tag_db = self._commit_db[2]
-
-        rev = str(rev)
-
-
-
-
+
+
+
+
+
+
+
+
+
-        rc = self.repo.rev_parse("--verify", rev).read().strip()
-        if not rc:
@@ -352 +387 @@
-        return None
-
-
+, min_len=7
-        "try to shorten sha id"
-        #try to emulate the following:
-        #return self.repo.rev_parse("--short", str(rev)).read().strip()
-
-        rev = str(rev)
-
-
-
+
+
+
+
-
-        if rev not in db:
-
-
-
-
-
+
+
+
+
-
-        if len(srevs) == 1:
@@ -376 +411 @@
-        crevs = srevs - set([rev])
-
-self.__SREV_MIN
+min_len
-            srev = rev[:l]
-            if srev not in [ r[:l] for r in crevs ]:
@@ -382 +417 @@
-
-        return rev # worst-case, all except the last character match
+
+    def fullrev(self, srev):
+        "try to reverse shortrev()"
+        srev = str(srev)
+        db, tag_db, sdb = self.rev_cache[2:5]
+
+        # short-cut
+        if len(srev) == 40 and srev in db:
+            return srev
+
+        if not GitCore.is_sha(srev):
+            return None
+
+        srevs = sdb[self.__rev_key(srev)]
+
+        srevs = filter(lambda s: s.startswith(srev), srevs)
+        if len(srevs) == 1:
+            return srevs[0]
+
+        return None
-
-    def get_branches(self):
@@ -495 +550 @@
-            return []
-
+    def all_revs(self):
+        return self.get_commits().iterkeys()
+
+    def sync(self):
+        rev = self.repo.rev_list("--max-count=1", "--all").read().strip()
+        return self.__rev_cache_sync(rev)
+
+    def last_change(self, sha, path):
+        return self.repo.rev_list("--max-count=1",
+                                  sha, "--", path).read().strip() or None
+
-    def history(self, sha, path, limit=None):
-        if limit is None:
@@ -501 +567 @@
-                                      str(sha), "--", path).readlines():
-            yield rev.strip()
-
-    def all_revs(self):
-        return self.get_commits().iterkeys()
-
-    def history_timerange(self, start, stop):
@@ -538 +601 @@
-        assert not in_metadata
-
-    def last_change(self, sha, path):
-        return self.repo.rev_list("--max-count=1", sha, "--", path).read().strip() or None
-
-    def diff_tree(self, tree1, tree2, path="", find_renames=False):
-        """calls `git diff-tree` and returns tuples of the kind
@@ -618 +678 @@
-    print "statm =", proc_statm()
-    __data_size = proc_statm()[5]
+    __data_size_last = __data_size
-
-    def print_data_usage():
-
+
+
+
+
-
-    print_data_usage()
@@ -679 +743 @@
-        for i in revs:
-            i = str(i)
-
+, min_len=4
-            assert i.startswith(s)
+            assert g.fullrev(s) == i
-
-    iters = 1
@@ -688 +753 @@
-
-    #print len(check4loops(g.oldest_rev()))
-
-    #print len(list(g.children_recursive(g.oldest_rev())))
-
@@ -704 +768 @@
-
-            print "%s %s %10d [%s]" % (type, last_rev, s, name)
+
+    print "allocating 2nd instance"
+    print_data_usage()
+    g2 = Storage(sys.argv[1], logging)
+    g2.head()
+    print_data_usage()
+    print "allocating 3rd instance"
+    g3 = Storage(sys.argv[1], logging)
+    g3.head()
+    print_data_usage()