1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "splitter.h"
#include <QRegularExpression>
FileDataList splitDiffToFiles(const QString &strData)
{
FileDataList ret;
QString splitExpression;
if (strData.contains(QLatin1String("==== ")) && strData.contains(QLatin1String(" ====\n"))) {
// Perforce diff
splitExpression = QLatin1String("==== ([^\\n\\r]+) - ([^\\n\\r]+) ====");
} else if (strData.contains(QLatin1String("--- ")) && strData.contains(QLatin1String("\n+++ "))) {
// Unified contextual diff
splitExpression = QLatin1String("\\-\\-\\- ([^\\n\\r]*)"
"\\n\\+\\+\\+ ([^\\n\\r]*)");
} else if (strData.contains(QLatin1String("*** ")) && strData.contains(QLatin1String("\n--- "))) {
// Copied contextual diff
splitExpression = QLatin1String("\\*\\*\\* ([^\\n\\r]*) [0-9\\-]* [0-9:\\.]*[^\\n\\r]*"
"\\n\\-\\-\\- ([^\\n\\r]*) [0-9\\-]* [0-9:\\.]*[^\\n\\r]*");
} else {
return FileDataList();
}
int splitIndex = 0, previousSplit = -1;
const QRegularExpression splitExpr(splitExpression);
QString filename;
// The algorithm works like this:
// On the first match we only get the filename of the first patch part
// On the second match (if any) we get the diff content, and the name of the next file patch
QRegularExpressionMatch match;
while ((match = splitExpr.match(strData, splitIndex)).hasMatch()) {
splitIndex = match.capturedStart();
if (!filename.isEmpty()) {
QString content = strData.mid(previousSplit, splitIndex - previousSplit);
ret.append(FileData(filename, content));
}
// If the first index in not at the beginning of the file, then we know there's content
// we're about to skip, which is common in commit diffs, so we get that content and give it
// a 'fake' filename.
if (previousSplit == -1 && splitIndex > 0 && filename.isEmpty()) {
QString content = strData.left(splitIndex);
ret.append(FileData(QLatin1String("<Header information>"), content));
}
filename = match.captured(1);
previousSplit = splitIndex;
++splitIndex;
}
// Append the last patch content
if (!filename.isEmpty()) {
const QString content = strData.mid(previousSplit);
ret.append(FileData(filename, content));
}
return ret;
}
|
