diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2014-11-06 13:23:40 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2014-11-21 10:08:36 +0100 |
| commit | 8d1940a7964a27c32f3a1f8f637f28511f6360a6 (patch) | |
| tree | 9427537dec87ca246abb4832f71f338fb95682b0 /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 07e3a032ff04ab1af665819baf267bcc80463d0b (diff) | |
| download | qt-creator-8d1940a7964a27c32f3a1f8f637f28511f6360a6.tar.gz | |
Replace old svn diff editor with the new one
Change-Id: I4137b709be718603cdc221ac938e139326c88835
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 3c48515d10..78f8cfee6b 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -894,6 +894,66 @@ void DiffEditor::Internal::DiffEditorPlugin::testReadPatch_data() fileDataList7 << fileData1; QTest::newRow("Dirty submodule") << patch << fileDataList7; + + ////////////// + + // Subversion New + patch = _("Index: src/plugins/subversion/subversioneditor.cpp\n" + "===================================================================\n" + "--- src/plugins/subversion/subversioneditor.cpp\t(revision 0)\n" + "+++ src/plugins/subversion/subversioneditor.cpp\t(revision 0)\n" + "@@ -0,0 +125 @@\n\n"); + fileData1 = FileData(); + fileData1.leftFileInfo = DiffFileInfo(_("src/plugins/subversion/subversioneditor.cpp")); + fileData1.rightFileInfo = DiffFileInfo(_("src/plugins/subversion/subversioneditor.cpp")); + chunkData1 = ChunkData(); + chunkData1.leftStartingLineNumber = -1; + chunkData1.rightStartingLineNumber = 124; + fileData1.chunks << chunkData1; + QList<FileData> fileDataList8; + fileDataList8 << fileData1; + QTest::newRow("Subversion New") << patch + << fileDataList8; + + ////////////// + + // Subversion Deleted + patch = _("Index: src/plugins/subversion/subversioneditor.cpp\n" + "===================================================================\n" + "--- src/plugins/subversion/subversioneditor.cpp\t(revision 42)\n" + "+++ src/plugins/subversion/subversioneditor.cpp\t(working copy)\n" + "@@ -1,125 +0,0 @@\n\n"); + fileData1 = FileData(); + fileData1.leftFileInfo = DiffFileInfo(_("src/plugins/subversion/subversioneditor.cpp")); + fileData1.rightFileInfo = DiffFileInfo(_("src/plugins/subversion/subversioneditor.cpp")); + chunkData1 = ChunkData(); + chunkData1.leftStartingLineNumber = 0; + chunkData1.rightStartingLineNumber = -1; + fileData1.chunks << chunkData1; + QList<FileData> fileDataList9; + fileDataList9 << fileData1; + QTest::newRow("Subversion Deleted") << patch + << fileDataList9; + + ////////////// + + // Subversion Normal + patch = _("Index: src/plugins/subversion/subversioneditor.cpp\n" + "===================================================================\n" + "--- src/plugins/subversion/subversioneditor.cpp\t(revision 42)\n" + "+++ src/plugins/subversion/subversioneditor.cpp\t(working copy)\n" + "@@ -120,7 +120,7 @@\n\n"); + fileData1 = FileData(); + fileData1.leftFileInfo = DiffFileInfo(_("src/plugins/subversion/subversioneditor.cpp")); + fileData1.rightFileInfo = DiffFileInfo(_("src/plugins/subversion/subversioneditor.cpp")); + chunkData1 = ChunkData(); + chunkData1.leftStartingLineNumber = 119; + chunkData1.rightStartingLineNumber = 119; + fileData1.chunks << chunkData1; + QList<FileData> fileDataList10; + fileDataList10 << fileData1; + QTest::newRow("Subversion Normal") << patch + << fileDataList10; } void DiffEditor::Internal::DiffEditorPlugin::testReadPatch() |