From 9605244f6d73aced9ec33eea105030ae23eea896 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Tue, 11 Nov 2014 16:27:23 +0100
Subject: DiffEditor: Save description along with diff.

Save complete, git-applicable patch when saving the result of
for example 'git show'. Strips some Creator-specific tags
off the description and reformats the description such
that it is accepted by git.

Change-Id: I739d85a7263f97e2149a2794974ba026f2eca067
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
---
 src/plugins/diffeditor/diffutils.cpp | 39 ++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

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

diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp
index 3f9c43a20d..f356e4f366 100644
--- a/src/plugins/diffeditor/diffutils.cpp
+++ b/src/plugins/diffeditor/diffutils.cpp
@@ -31,6 +31,7 @@
 #include "diffutils.h"
 #include "differ.h"
 #include <QStringList>
+#include <QTextStream>
 #include "texteditor/fontsettings.h"
 
 namespace DiffEditor {
@@ -483,31 +484,35 @@ QString DiffUtils::makePatch(const ChunkData &chunkData,
     return diffText;
 }
 
-QString DiffUtils::makePatch(const QList<FileData> &fileDataList)
+QString DiffUtils::makePatch(const QList<FileData> &fileDataList, unsigned formatFlags)
 {
     QString diffText;
+    QTextStream str(&diffText);
 
     for (int i = 0; i < fileDataList.count(); i++) {
         const FileData &fileData = fileDataList.at(i);
-
+        if (formatFlags & GitFormat) {
+            str << "diff --git a/" << fileData.leftFileInfo.fileName
+                << " b/" << fileData.rightFileInfo.fileName << '\n';
+        }
         if (fileData.binaryFiles) {
-            const QString binaryLine = QLatin1String("Binary files ")
-                    + fileData.leftFileInfo.fileName
-                    + QLatin1String(" and ")
-                    + fileData.rightFileInfo.fileName
-                    + QLatin1String(" differ\n");
-            diffText += binaryLine;
+            str << "Binary files ";
+            if (formatFlags & AddLevel)
+                str << "a/";
+            str << fileData.leftFileInfo.fileName << " and ";
+            if (formatFlags & AddLevel)
+                str << "b/";
+            str << fileData.rightFileInfo.fileName << " differ\n";
         } else {
-            const QString leftFileInfo = QLatin1String("--- ")
-                    + fileData.leftFileInfo.fileName + QLatin1Char('\n');
-            const QString rightFileInfo = QLatin1String("+++ ")
-                    + fileData.rightFileInfo.fileName + QLatin1Char('\n');
-
-            diffText += leftFileInfo;
-            diffText += rightFileInfo;
-
+            str << "--- ";
+            if (formatFlags & AddLevel)
+                str << "a/";
+            str << fileData.leftFileInfo.fileName << "\n+++ ";
+            if (formatFlags & AddLevel)
+                str << "b/";
+            str << fileData.rightFileInfo.fileName << '\n';
             for (int j = 0; j < fileData.chunks.count(); j++) {
-                diffText += makePatch(fileData.chunks.at(j),
+                str << makePatch(fileData.chunks.at(j),
                                       (j == fileData.chunks.count() - 1)
                                       && fileData.lastChunkAtTheEndOfFile);
             }
-- 
cgit v1.2.1