From e4ff24ea31eba26a3ebef1b18300283ac1be7198 Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Mon, 7 Jul 2014 14:26:41 +0200
Subject: Handle similarity index in git commits

Task-number: QTCREATORBUG-12619
Change-Id: I5af39f18bc02ce1f06bf72f155bf0aaabe8b228d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/diffeditor/diffutils.h | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'src/plugins/diffeditor/diffutils.h')

diff --git a/src/plugins/diffeditor/diffutils.h b/src/plugins/diffeditor/diffutils.h
index 1c5d237e2d..b649538026 100644
--- a/src/plugins/diffeditor/diffutils.h
+++ b/src/plugins/diffeditor/diffutils.h
@@ -46,13 +46,12 @@ class Diff;
 
 class DIFFEDITOR_EXPORT DiffFileInfo {
 public:
-    DiffFileInfo() : devNull(false) {}
-    DiffFileInfo(const QString &file) : fileName(file), devNull(false) {}
+    DiffFileInfo() {}
+    DiffFileInfo(const QString &file) : fileName(file) {}
     DiffFileInfo(const QString &file, const QString &type)
-        : fileName(file), typeInfo(type), devNull(false) {}
+        : fileName(file), typeInfo(type) {}
     QString fileName;
     QString typeInfo;
-    bool devNull;
 };
 
 class DIFFEDITOR_EXPORT TextLineData {
@@ -100,17 +99,28 @@ public:
 
 class DIFFEDITOR_EXPORT FileData {
 public:
+    enum FileOperation {
+        ChangeFile,
+        NewFile,
+        DeleteFile,
+        CopyFile,
+        RenameFile
+    };
+
     FileData()
-        : binaryFiles(false),
+        : fileOperation(ChangeFile),
+          binaryFiles(false),
           lastChunkAtTheEndOfFile(false),
           contextChunksIncluded(false) {}
     FileData(const ChunkData &chunkData)
-        : binaryFiles(false),
+        : fileOperation(ChangeFile),
+          binaryFiles(false),
           lastChunkAtTheEndOfFile(false),
           contextChunksIncluded(false) { chunks.append(chunkData); }
     QList<ChunkData> chunks;
     DiffFileInfo leftFileInfo;
     DiffFileInfo rightFileInfo;
+    FileOperation fileOperation;
     bool binaryFiles;
     bool lastChunkAtTheEndOfFile;
     bool contextChunksIncluded;
-- 
cgit v1.2.1