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
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
|
// Copyright (C) 2016 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
#include "patchtool.h"
#include "coreplugintr.h"
#include "icore.h"
#include "messagemanager.h"
#include "systemsettings.h"
#include <utils/environment.h>
#include <utils/qtcprocess.h>
#include <QMessageBox>
using namespace Utils;
using namespace Core::Internal;
namespace Core {
FilePath PatchTool::patchCommand()
{
FilePath command = systemSettings().patchCommand();
if (HostOsInfo::isWindowsHost() && systemSettings().patchCommand.isDefaultValue()) {
const QSettings settings(R"(HKEY_LOCAL_MACHINE\SOFTWARE\GitForWindows)",
QSettings::NativeFormat);
const FilePath gitInstall = FilePath::fromUserInput(settings.value("InstallPath").toString());
if (gitInstall.exists())
command = command.searchInPath({gitInstall.pathAppended("usr/bin")},
FilePath::PrependToPath);
}
return command;
}
bool PatchTool::confirmPatching(QWidget *parent, PatchAction patchAction, bool isModified)
{
const QString title = patchAction == PatchAction::Apply ? Tr::tr("Apply Chunk")
: Tr::tr("Revert Chunk");
QString question = patchAction == PatchAction::Apply
? Tr::tr("Would you like to apply the chunk?")
: Tr::tr("Would you like to revert the chunk?");
if (isModified)
question += "\n" + Tr::tr("Note: The file will be saved before this operation.");
return QMessageBox::question(parent, title, question, QMessageBox::Yes | QMessageBox::No)
== QMessageBox::Yes;
}
static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirectory,
int strip, PatchAction patchAction, bool withCrlf)
{
const FilePath patch = PatchTool::patchCommand();
if (patch.isEmpty()) {
MessageManager::writeDisrupting(Tr::tr("There is no patch-command configured in "
"the general \"Environment\" settings."));
return false;
}
if (!patch.exists() && !patch.searchInPath().exists()) {
MessageManager::writeDisrupting(Tr::tr("The patch-command configured in the general "
"\"Environment\" settings does not exist."));
return false;
}
Process patchProcess;
if (!workingDirectory.isEmpty())
patchProcess.setWorkingDirectory(workingDirectory);
Environment env = Environment::systemEnvironment();
env.setupEnglishOutput();
patchProcess.setEnvironment(env);
QStringList args;
// Add argument 'apply' when git is used as patch command since git 2.5/Windows
// no longer ships patch.exe.
if (patch.endsWith("git") || patch.endsWith("git.exe"))
args << "apply";
if (strip >= 0)
args << ("-p" + QString::number(strip));
if (patchAction == PatchAction::Revert)
args << "-R";
args << "--binary";
MessageManager::writeDisrupting(
Tr::tr("Running in \"%1\": %2 %3.")
.arg(workingDirectory.toUserOutput(), patch.toUserOutput(), args.join(' ')));
patchProcess.setCommand({patch, args});
patchProcess.setWriteData(input);
patchProcess.start();
if (!patchProcess.waitForStarted()) {
MessageManager::writeFlashing(Tr::tr("Unable to launch \"%1\": %2")
.arg(patch.toUserOutput(), patchProcess.errorString()));
return false;
}
QByteArray stdOut;
QByteArray stdErr;
if (!patchProcess.readDataFromProcess(&stdOut, &stdErr)) {
patchProcess.stop();
patchProcess.waitForFinished();
MessageManager::writeFlashing(
Tr::tr("A timeout occurred running \"%1\".").arg(patch.toUserOutput()));
return false;
}
if (!stdOut.isEmpty()) {
if (stdOut.contains("(different line endings)") && !withCrlf) {
QByteArray crlfInput = input;
crlfInput.replace('\n', "\r\n");
return runPatchHelper(crlfInput, workingDirectory, strip, patchAction, true);
} else {
MessageManager::writeFlashing(QString::fromLocal8Bit(stdOut));
}
}
if (!stdErr.isEmpty())
MessageManager::writeFlashing(QString::fromLocal8Bit(stdErr));
if (patchProcess.exitStatus() != QProcess::NormalExit) {
MessageManager::writeFlashing(Tr::tr("\"%1\" crashed.").arg(patch.toUserOutput()));
return false;
}
if (patchProcess.exitCode() != 0) {
MessageManager::writeFlashing(Tr::tr("\"%1\" failed (exit code %2).")
.arg(patch.toUserOutput()).arg(patchProcess.exitCode()));
return false;
}
return true;
}
bool PatchTool::runPatch(const QByteArray &input, const FilePath &workingDirectory,
int strip, PatchAction patchAction)
{
return runPatchHelper(input, workingDirectory, strip, patchAction, false);
}
} // namespace Core
|
