forked from qt-creator/qt-creator
6e85ff9f4b
Before we have used the OutputProxyFactory, which was called in the non-gui thread. The factory, when run, created the connection between the thread and outside world (e.g. VersionControl output window). Instead of setting the factory we provide a set of virtual functions called directly from non-gui threads. We also provide overrides for them in VcsCommand class. Their implementation safely redirects the calls directly to the VcsOutputWindow through the QMetaObject::invokeMethod() with auto connection as a default. Task-number: QTCREATORBUG-25744 Change-Id: I09f2da278003b71095e953a51499a5513cb8f03f Reviewed-by: Eike Ziller <eike.ziller@qt.io>
71 lines
2.5 KiB
C++
71 lines
2.5 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 Brian McGillion and Hugues Delorme
|
|
** 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.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#pragma once
|
|
|
|
#include "vcsbase_global.h"
|
|
|
|
#include <coreplugin/shellcommand.h>
|
|
|
|
namespace VcsBase {
|
|
|
|
class VcsOutputWindow;
|
|
|
|
class VCSBASE_EXPORT VcsCommand : public Core::ShellCommand
|
|
{
|
|
Q_OBJECT
|
|
|
|
public:
|
|
enum VcsRunFlags {
|
|
SshPasswordPrompt = 0x1000, // Disable terminal on UNIX to force graphical prompt.
|
|
ExpectRepoChanges = 0x2000, // Expect changes in repository by the command
|
|
};
|
|
|
|
VcsCommand(const QString &defaultWorkingDirectory, const Utils::Environment &environment);
|
|
|
|
const Utils::Environment processEnvironment() const override;
|
|
|
|
void runCommand(Utils::SynchronousProcess &process,
|
|
const Utils::CommandLine &command,
|
|
const QString &workDirectory = {}) override;
|
|
|
|
protected:
|
|
void append(const QString &text) override;
|
|
void appendSilently(const QString &text) override;
|
|
void appendError(const QString &text) override;
|
|
void appendCommand(const QString &workingDirectory, const Utils::CommandLine &command) override;
|
|
void appendMessage(const QString &text) override;
|
|
|
|
private:
|
|
void emitRepositoryChanged(const QString &workingDirectory);
|
|
|
|
void coreAboutToClose() override;
|
|
|
|
bool m_preventRepositoryChanged;
|
|
VcsOutputWindow *m_outputWindow = nullptr;
|
|
};
|
|
|
|
} // namespace VcsBase
|