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
|
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#pragma once
#include <utils/process.h>
#include <QObject>
#include <QStringList>
QT_BEGIN_NAMESPACE
class QMessageBox;
QT_END_NAMESPACE
namespace Git::Internal {
class MergeTool : public QObject
{
enum FileState {
UnknownState,
ModifiedState,
CreatedState,
DeletedState,
SubmoduleState,
SymbolicLinkState
};
public:
explicit MergeTool(QObject *parent = nullptr);
void start(const Utils::FilePath &workingDirectory, const QStringList &files = {});
enum MergeType {
NormalMerge,
SubmoduleMerge,
DeletedMerge,
SymbolicLinkMerge
};
private:
void prompt(const QString &title, const QString &question);
void readData();
void readLine(const QString &line);
void done();
void write(const QString &str);
FileState parseStatus(const QString &line, QString &extraInfo);
QString mergeTypeName();
QString stateName(FileState state, const QString &extraInfo);
void chooseAction();
void addButton(QMessageBox *msgBox, const QString &text, char key);
Utils::Process m_process;
MergeType m_mergeType = NormalMerge;
QString m_fileName;
FileState m_localState = UnknownState;
QString m_localInfo;
FileState m_remoteState = UnknownState;
QString m_remoteInfo;
QString m_unfinishedLine;
};
} // Git::Internal
|
