libgit2 upgrade fixes

FabriceSalvaire · FabriceSalvaire · commit cd2db30c3bb4 · 2015-12-20T23:24:11.000+01:00
diff --git a/CodeReview/GUI/LogBrowser/CommitTableModel.py b/CodeReview/GUI/LogBrowser/CommitTableModel.py
@@ -20,7 +20,7 @@
 
 import logging
 
-####################################################################################################
+import pygit2 as git
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 from PyQt5.QtCore import Qt
@@ -53,6 +53,13 @@ class CommitTableModel(QtCore.QAbstractTableModel):
         'Similarity',
     )
 
+    __status_to_letter__ = {
+        git.GIT_DELTA_DELETED: 'D',
+        git.GIT_DELTA_MODIFIED: 'M',
+        git.GIT_DELTA_ADDED: 'A',
+        git.GIT_DELTA_RENAMED: 'R',
+    }
+
     ##############################################
 
     def __init__(self):
@@ -70,13 +77,15 @@ def update(self, diff):
         self._number_of_rows = 0
         
         for patch in diff:
-            if patch.new_file_path != patch.old_file_path:
-                new_file_path = patch.new_file_path
-                similarity = ' {} %'.format(patch.similarity)
+            delta = patch.delta
+            if delta.new_file.path != delta.old_file.path:
+                new_file_path = delta.new_file.path
+                similarity = ' {} %'.format(delta.similarity)
             else:
                 new_file_path = ''
                 similarity = ''
-            row = (patch.status, patch.old_file_path, new_file_path, similarity, patch)
+            status = self.__status_to_letter__[delta.status]
+            row = (status, delta.old_file.path, new_file_path, similarity, patch)
             self._rows.append(row)
         
         self._number_of_rows = len(self._rows)
diff --git a/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py b/CodeReview/GUI/LogBrowser/LogBrowserMainWindow.py
@@ -23,6 +23,8 @@
 from PyQt5 import QtWidgets
 from PyQt5.QtCore import Qt
 
+import pygit2 as git
+
 ####################################################################################################
 
 from CodeReview.GUI.Base.MainWindowBase import MainWindowBase
@@ -249,25 +251,26 @@ def _show_current_patch(self):
             self._diff_window.showMaximized()
         
         patch = self._diff[self._current_patch]
-        if not patch.is_binary:
-            self._logger.info('revision {} '.format(self._current_revision) + patch.new_file_path)
-            # print(patch.status, patch.similarity, patch.additions, patch.deletions, patch.is_binary)
-            # for hunk in patch.hunks:
+        delta = patch.delta
+        if not delta.is_binary:
+            self._logger.info('revision {} '.format(self._current_revision) + delta.new_file.path)
+            # print(delta.status, delta.similarity, delta.additions, delta.deletions, delta.is_binary)
+            # for hunk in delta.hunks:
             #     print(hunk.old_start, hunk.old_lines, hunk.new_start, hunk.new_lines, hunk.lines)
             repository = self._application.repository
-            if patch.status in ('M', 'R'):
-                paths = (patch.old_file_path, patch.new_file_path)
-            elif patch.status == 'A':
-                paths = (None, patch.new_file_path)
-            elif patch.status == 'D':
-                paths = (patch.old_file_path, None)
+            if delta.status in (git.GIT_DELTA_MODIFIED, git.GIT_DELTA_RENAMED):
+                paths = (delta.old_file.path, delta.new_file.path)
+            elif delta.status == git.GIT_DELTA_ADDED:
+                paths = (None, delta.new_file.path)
+            elif delta.status == git.GIT_DELTA_DELETED:
+                paths = (delta.old_file.path, None)
             texts = [repository.file_content(blob_id)
-                     for blob_id in (patch.old_id, patch.new_id)]
-            metadatas = [dict(path=patch.old_file_path, document_type='file', last_modification_date=None),
-                         dict(path=patch.new_file_path, document_type='file', last_modification_date=None)]
+                     for blob_id in (delta.old_file.id, delta.new_file.id)]
+            metadatas = [dict(path=delta.old_file.path, document_type='file', last_modification_date=None),
+                         dict(path=delta.new_file.path, document_type='file', last_modification_date=None)]
             self._diff_window.diff_documents(paths, texts, metadatas, workdir=repository.workdir)
         else:
-            self._logger.info('revision {} Binary '.format(self._current_revision) + patch.new_file_path)
+            self._logger.info('revision {} Binary '.format(self._current_revision) + delta.new_file.path)
         # Fixme: show image pdf ...
 
     ##############################################
diff --git a/CodeReview/Repository/Git.py b/CodeReview/Repository/Git.py
@@ -87,8 +87,9 @@ def diff(self, a=None, b=None, cached=False, path_filter=None):
         diff.find_similar()
         # flags, rename_threshold, copy_threshold, rename_from_rewrite_threshold, break_rewrite_threshold, rename_limit
         for patch in diff:
-            if path_filter and not patch.old_file_path.startswith(path_filter):
-                # self._logger.info('Skip ' + patch.old_file_path)
+            delta = patch.delta
+            if path_filter and not delta.old_file.path.startswith(path_filter):
+                # self._logger.info('Skip ' + delta.old_file.path)
                 continue
             patches.append(patch)
         
