feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Handle similarity index in git commits

Browse Source 
Task-number: QTCREATORBUG-12619
Change-Id: I5af39f18bc02ce1f06bf72f155bf0aaabe8b228d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
jkobus
2014-07-07 14:26:41 +02:00
committed by Jarek Kobus
parent bf526f4cd1
commit e4ff24ea31
3 changed files with 223 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/diffeditor/diffutils.h
View File

@@ -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;