Convert merge actions with 'M'

MetricsGrimoire · Mar 26, 2014 · af146b5 · af146b5
1 parent 6b45c6d
commit af146b5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/pycvsanaly2/DBContentHandler.py b/pycvsanaly2/DBContentHandler.py
@@ -609,7 +609,7 @@ def commit(self, commit):
             if action.type == 'A':
                 # A file has been added
                 file_id = self.__action_add(path, prefix, log)
-            elif action.type.find('M') >= 0:
+            elif action.type == 'M':
                 # A file has been modified
                 file_id = self.__get_file_for_path(path, log.id)[0]
             elif action.type == 'D':

diff --git a/pycvsanaly2/Database.py b/pycvsanaly2/Database.py
@@ -407,7 +407,7 @@ def create_tables(self, cursor):
                            ")")
             cursor.execute("CREATE TABLE actions (" +
                            "id integer primary key," +
-                           "type varchar(2)," +
+                           "type varchar(1)," +
                            "file_id integer," +
                            "commit_id integer," +
                            "branch_id integer" +
@@ -556,7 +556,7 @@ def create_tables(self, cursor):
                            " CHARACTER SET=utf8")
             cursor.execute("CREATE TABLE actions (" +
                            "id INT," +
-                           "type varchar(2)," +
+                           "type varchar(1)," +
                            "file_id integer," +
                            "commit_id integer," +
                            "branch_id integer," +

diff --git a/pycvsanaly2/GitParser.py b/pycvsanaly2/GitParser.py
@@ -237,7 +237,16 @@ def _parse_line(self, line):
         match = self.patterns['file'].match(line)
         if match:
             action = Action()
-            action.type = match.group(1)
+            type = match.group(1)
+            if len(type) > 1:
+                # merge actions
+                if 'M' in type:
+                    type = 'M'
+                else:
+                    # ignore merge actions without 'M'
+                    return
+
+            action.type = type
             action.f1 = match.group(2)
 
             self.commit.actions.append(action)

diff --git a/pycvsanaly2/extensions/Content.py b/pycvsanaly2/extensions/Content.py
@@ -137,13 +137,8 @@ def _get_file_contents(self):
             # utf-8, ie. it's not already unicode, or latin-1, or something
             # obvious. This almost always means that the file isn't source
             # code at all. 
-            # TODO: I should really throw a "not source" exception,
-            # but just doing None is fine for now.
-            try:
-                return to_utf8(self._file_contents).encode("utf-8")
-            except:
-                return None
-
+            return to_utf8(self._file_contents)
+
     def _set_file_contents(self, contents):
         self._file_contents = contents