2014-04-17 12:47:38 +02:00
|
|
|
/****************************************************************************
|
|
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
|
|
|
** Contact: https://www.qt.io/licensing/
|
2014-04-17 12:47:38 +02:00
|
|
|
**
|
|
|
|
|
** 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
|
2016-01-15 14:57:40 +01:00
|
|
|
** 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.
|
2014-04-17 12:47:38 +02:00
|
|
|
**
|
2016-01-15 14:57:40 +01:00
|
|
|
** 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.
|
2014-04-17 12:47:38 +02:00
|
|
|
**
|
|
|
|
|
****************************************************************************/
|
|
|
|
|
|
|
|
|
|
#include "patchtool.h"
|
|
|
|
|
#include "messagemanager.h"
|
|
|
|
|
#include "icore.h"
|
2021-05-04 07:37:42 +02:00
|
|
|
|
2016-04-07 13:06:01 +02:00
|
|
|
#include <utils/environment.h>
|
2021-05-04 07:37:42 +02:00
|
|
|
#include <utils/qtcprocess.h>
|
2014-04-17 12:47:38 +02:00
|
|
|
|
|
|
|
|
#include <QApplication>
|
|
|
|
|
|
2021-05-04 07:37:42 +02:00
|
|
|
using namespace Utils;
|
|
|
|
|
|
2014-04-17 12:47:38 +02:00
|
|
|
namespace Core {
|
|
|
|
|
|
2021-08-17 13:37:20 +02:00
|
|
|
const char settingsGroupC[] = "General";
|
|
|
|
|
const char patchCommandKeyC[] = "PatchCommand";
|
|
|
|
|
const char patchCommandDefaultC[] = "patch";
|
|
|
|
|
|
|
|
|
|
FilePath PatchTool::patchCommand()
|
2014-04-17 12:47:38 +02:00
|
|
|
{
|
2014-11-16 10:52:41 +02:00
|
|
|
QSettings *s = ICore::settings();
|
2014-04-17 12:47:38 +02:00
|
|
|
|
2020-12-10 10:48:03 +01:00
|
|
|
s->beginGroup(settingsGroupC);
|
2021-08-17 13:37:20 +02:00
|
|
|
const FilePath command = FilePath::fromVariant(s->value(patchCommandKeyC, patchCommandDefaultC));
|
2014-04-17 12:47:38 +02:00
|
|
|
s->endGroup();
|
|
|
|
|
|
|
|
|
|
return command;
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-17 13:37:20 +02:00
|
|
|
void PatchTool::setPatchCommand(const FilePath &newCommand)
|
2014-04-17 12:47:38 +02:00
|
|
|
{
|
2020-12-10 11:24:27 +01:00
|
|
|
Utils::QtcSettings *s = ICore::settings();
|
2021-08-17 13:37:20 +02:00
|
|
|
s->beginGroup(settingsGroupC);
|
|
|
|
|
s->setValueWithDefault(patchCommandKeyC, newCommand.toVariant(), QVariant(QString(patchCommandDefaultC)));
|
2014-04-17 12:47:38 +02:00
|
|
|
s->endGroup();
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-17 13:37:20 +02:00
|
|
|
static bool runPatchHelper(const QByteArray &input, const FilePath &workingDirectory,
|
2015-09-24 23:50:50 +03:00
|
|
|
int strip, bool reverse, bool withCrlf)
|
2014-04-17 12:47:38 +02:00
|
|
|
{
|
2021-08-17 13:37:20 +02:00
|
|
|
const FilePath patch = PatchTool::patchCommand();
|
2014-04-17 12:47:38 +02:00
|
|
|
if (patch.isEmpty()) {
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeDisrupting(QApplication::translate(
|
|
|
|
|
"Core::PatchTool",
|
|
|
|
|
"There is no patch-command configured in the general \"Environment\" settings."));
|
2014-04-17 12:47:38 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-17 14:49:19 +02:00
|
|
|
if (!patch.exists() && !patch.searchInPath().exists()) {
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeDisrupting(
|
|
|
|
|
QApplication::translate("Core::PatchTool",
|
|
|
|
|
"The patch-command configured in the general \"Environment\" "
|
|
|
|
|
"settings does not exist."));
|
2017-07-27 11:14:55 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2021-05-04 07:37:42 +02:00
|
|
|
QtcProcess patchProcess;
|
2014-04-17 12:47:38 +02:00
|
|
|
if (!workingDirectory.isEmpty())
|
|
|
|
|
patchProcess.setWorkingDirectory(workingDirectory);
|
2021-05-04 07:37:42 +02:00
|
|
|
Environment env = Environment::systemEnvironment();
|
2021-05-20 11:57:21 +02:00
|
|
|
env.setupEnglishOutput();
|
2021-05-04 07:37:42 +02:00
|
|
|
patchProcess.setEnvironment(env);
|
2014-02-13 16:43:28 +01:00
|
|
|
QStringList args;
|
2015-08-28 08:55:15 +02:00
|
|
|
// Add argument 'apply' when git is used as patch command since git 2.5/Windows
|
|
|
|
|
// no longer ships patch.exe.
|
2021-08-17 13:37:20 +02:00
|
|
|
if (patch.endsWith("git") || patch.endsWith("git.exe"))
|
|
|
|
|
args << "apply";
|
|
|
|
|
|
2014-02-13 16:43:28 +01:00
|
|
|
if (strip >= 0)
|
2021-08-17 13:37:20 +02:00
|
|
|
args << ("-p" + QString::number(strip));
|
2014-04-17 12:47:38 +02:00
|
|
|
if (reverse)
|
2021-08-17 13:37:20 +02:00
|
|
|
args << "-R";
|
2015-09-24 23:50:50 +03:00
|
|
|
if (withCrlf)
|
2021-08-17 13:37:20 +02:00
|
|
|
args << "--binary";
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeDisrupting(
|
|
|
|
|
QApplication::translate("Core::PatchTool", "Running in %1: %2 %3")
|
2021-08-17 13:37:20 +02:00
|
|
|
.arg(workingDirectory.toUserOutput(), patch.toUserOutput(), args.join(' ')));
|
|
|
|
|
patchProcess.setCommand({patch, args});
|
2021-08-07 11:41:23 +02:00
|
|
|
patchProcess.setWriteData(input);
|
2021-05-04 07:37:42 +02:00
|
|
|
patchProcess.start();
|
2014-04-17 12:47:38 +02:00
|
|
|
if (!patchProcess.waitForStarted()) {
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeFlashing(
|
|
|
|
|
QApplication::translate("Core::PatchTool", "Unable to launch \"%1\": %2")
|
2021-08-17 13:37:20 +02:00
|
|
|
.arg(patch.toUserOutput(), patchProcess.errorString()));
|
2014-04-17 12:47:38 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
2021-05-14 15:21:54 +02:00
|
|
|
|
2014-04-17 12:47:38 +02:00
|
|
|
QByteArray stdOut;
|
|
|
|
|
QByteArray stdErr;
|
2022-07-05 18:01:44 +02:00
|
|
|
if (!patchProcess.readDataFromProcess(30, &stdOut, &stdErr)) {
|
2022-06-16 10:17:33 +02:00
|
|
|
patchProcess.stop();
|
|
|
|
|
patchProcess.waitForFinished();
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeFlashing(
|
|
|
|
|
QApplication::translate("Core::PatchTool", "A timeout occurred running \"%1\"")
|
2021-08-17 13:37:20 +02:00
|
|
|
.arg(patch.toUserOutput()));
|
2014-04-17 12:47:38 +02:00
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
}
|
2015-09-24 23:50:50 +03:00
|
|
|
if (!stdOut.isEmpty()) {
|
|
|
|
|
if (stdOut.contains("(different line endings)") && !withCrlf) {
|
|
|
|
|
QByteArray crlfInput = input;
|
|
|
|
|
crlfInput.replace('\n', "\r\n");
|
|
|
|
|
return runPatchHelper(crlfInput, workingDirectory, strip, reverse, true);
|
|
|
|
|
} else {
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeFlashing(QString::fromLocal8Bit(stdOut));
|
2015-09-24 23:50:50 +03:00
|
|
|
}
|
|
|
|
|
}
|
2014-04-17 12:47:38 +02:00
|
|
|
if (!stdErr.isEmpty())
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeFlashing(QString::fromLocal8Bit(stdErr));
|
2014-04-17 12:47:38 +02:00
|
|
|
|
|
|
|
|
if (patchProcess.exitStatus() != QProcess::NormalExit) {
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeFlashing(
|
2021-08-17 13:37:20 +02:00
|
|
|
QApplication::translate("Core::PatchTool", "\"%1\" crashed.").arg(patch.toUserOutput()));
|
2014-04-17 12:47:38 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
if (patchProcess.exitCode() != 0) {
|
2020-12-01 13:02:12 +01:00
|
|
|
MessageManager::writeFlashing(
|
|
|
|
|
QApplication::translate("Core::PatchTool", "\"%1\" failed (exit code %2).")
|
2021-08-17 13:37:20 +02:00
|
|
|
.arg(patch.toUserOutput())
|
2020-12-01 13:02:12 +01:00
|
|
|
.arg(patchProcess.exitCode()));
|
2014-04-17 12:47:38 +02:00
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
2021-08-17 13:37:20 +02:00
|
|
|
bool PatchTool::runPatch(const QByteArray &input, const FilePath &workingDirectory,
|
2015-09-24 23:50:50 +03:00
|
|
|
int strip, bool reverse)
|
|
|
|
|
{
|
|
|
|
|
return runPatchHelper(input, workingDirectory, strip, reverse, false);
|
|
|
|
|
}
|
2014-04-17 12:47:38 +02:00
|
|
|
|
|
|
|
|
} // namespace Core
|