Merge pull request #40 from linzhp/feature/commit_graph

Added commit graph

.gitignore

@@ -3,4 +3,4 @@
 .idea
 MANIFEST
 dist/
-config
+config

pycvsanaly2/DBContentHandler.py

@@ -22,7 +22,7 @@
 from ContentHandler import ContentHandler
 from Database import (DBRepository, DBLog, DBFile, DBFileLink, DBAction,
                       DBFileCopy, DBBranch, DBPerson, DBTag, DBTagRev,
-                      statement)
+                      DBGraph, statement)
 from profile import profiler_start, profiler_stop
 from utils import printdbg, printout, to_utf8, cvsanaly_cache_dir
 from cPickle import dump, load
@@ -640,6 +640,14 @@ def commit(self, commit):
                 tag_revs.append((db_tagrev.id, tag_id, log.id))
 
             self.cursor.executemany(statement(DBTagRev.__insert__, self.db.place_holder), tag_revs)
+
+        # Commit Graph
+        if len(commit.parents) > 0:
+            edges = []
+            for p in commit.parents:
+                edges.append((log.id, self.revision_cache[p]))
+
+            self.cursor.executemany(statement(DBGraph.__insert__, self.db.place_holder), edges)
 
         if len(self.actions) >= self.MAX_ACTIONS:
             printdbg("DBContentHandler: %d actions inserting", (len(self.actions),))

pycvsanaly2/Database.py

@@ -21,6 +21,7 @@
 
 
 class DBRepository:
+
     id_counter = 1
 
     __insert__ = "INSERT INTO repositories (id, uri, name, type) values (?, ?, ?, ?)"
@@ -56,6 +57,10 @@ def __init__(self, id, commit):
         self.author_date = commit.author_date
         self.message = to_unicode(commit.message)
         self.composed_rev = commit.composed_rev
+
+class DBGraph:
+
+    __insert__ = "INSERT INTO commit_graph (commit_id, parent_id) values (?, ?)"
 
 
 class DBFile:
@@ -445,7 +450,13 @@ def create_tables(self, cursor):
                            "tag_id integer, " +
                            "commit_id integer" +
                            ")")
+            cursor.execute("CREATE TABLE commit_graph (" +
+                           "commit_id integer," +
+                           "parent_id integer" +
+                           ")")
             cursor.execute("CREATE index files_file_name on files(file_name)")
+            cursor.execute("CREATE index commit_id on commit_graph(commit_id)")
+            cursor.execute("CREATE index parent_id on commit_graph(parent_id)")
             self._create_views(cursor)
         except sqlite3.OperationalError:
             raise TableAlreadyExists
@@ -592,6 +603,12 @@ def create_tables(self, cursor):
                            "FOREIGN KEY (commit_id) REFERENCES scmlog(id)" +
                            ") ENGINE=MyISAM" +
                            " CHARACTER SET=utf8")
+            cursor.execute("CREATE TABLE commit_graph (" +
+                           "commit_id integer REFERENCES scmlog(id)," +
+                           "parent_id integer REFERENCES scmlog(id)" +
+                           ")")
+            cursor.execute("CREATE index commit_id on commit_graph(commit_id)")
+            cursor.execute("CREATE index parent_id on commit_graph(parent_id)")
             self._create_views(cursor)
         except _mysql_exceptions.OperationalError, e:
             if e.args[0] == 1050:

pycvsanaly2/GitParser.py

@@ -115,6 +115,7 @@ def _parse_line(self, line):
             parents = match.group(3)
             if parents:
                 parents = parents.split()
+                self.commit.parents = parents
             git_commit = self.GitCommit(self.commit, parents)
 
             decorate = match.group(5)

pycvsanaly2/Repository.py

@@ -27,7 +27,8 @@ def __init__(self):
                          'branch': None,
                          'tags': None,
                          'message': "",
-                         'composed_rev': False}
+                         'composed_rev': False,
+                         'parents': []}
 
     def __getinitargs__(self):
         return ()