forked from qt-creator/qt-creator
vcsbase: throw away VCSJobRunner, replaced by GitCommand
VCSBase::Command was created from GitCommand, it replaces VCSJobRunner. VCSBase::Command is simpler to use (in VCSBaseClient) and commands can show up in the progress manager. From now on, the git plugin can easily rely on vcsbase. Change-Id: I40593f354249cd94a4c79e90f9bf1362ff3bf5ec Merge-request: 394 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-on: http://codereview.qt-project.org/6078
This commit is contained in:
105
src/plugins/vcsbase/command.h
Normal file
105
src/plugins/vcsbase/command.h
Normal file
@@ -0,0 +1,105 @@
|
||||
/**************************************************************************
|
||||
**
|
||||
** This file is part of Qt Creator
|
||||
**
|
||||
** Copyright (c) 2010 Brian McGillion & Hugues Delorme
|
||||
**
|
||||
** Contact: Nokia Corporation (info@qt.nokia.com)
|
||||
**
|
||||
**
|
||||
** GNU Lesser General Public License Usage
|
||||
**
|
||||
** This file may be used under the terms of the GNU Lesser General Public
|
||||
** License version 2.1 as published by the Free Software Foundation and
|
||||
** appearing in the file LICENSE.LGPL included in the packaging of this file.
|
||||
** Please review the following information to ensure the GNU Lesser General
|
||||
** Public License version 2.1 requirements will be met:
|
||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
||||
**
|
||||
** In addition, as a special exception, Nokia gives you certain additional
|
||||
** rights. These rights are described in the Nokia Qt LGPL Exception
|
||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
||||
**
|
||||
** Other Usage
|
||||
**
|
||||
** Alternatively, this file may be used in accordance with the terms and
|
||||
** conditions contained in a signed written agreement between you and Nokia.
|
||||
**
|
||||
** If you have questions regarding the use of this file, please contact
|
||||
** Nokia at info@qt.nokia.com.
|
||||
**
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef VCSBASE_COMMAND_H
|
||||
#define VCSBASE_COMMAND_H
|
||||
|
||||
#include "vcsbase_global.h"
|
||||
|
||||
#include <QtCore/QObject>
|
||||
#include <QtCore/QStringList>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QProcessEnvironment>
|
||||
|
||||
namespace VCSBase {
|
||||
|
||||
class VCSBASE_EXPORT Command : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
// Where to report command termination with exit code if desired
|
||||
enum TerminationReportMode { NoReport,
|
||||
ReportStdout, // This assumes UTF8
|
||||
ReportStderr };
|
||||
|
||||
Command(const QString &binary,
|
||||
const QString &workingDirectory,
|
||||
const QProcessEnvironment &environment);
|
||||
~Command();
|
||||
|
||||
void addJob(const QStringList &arguments);
|
||||
void addJob(const QStringList &arguments, int timeout);
|
||||
void execute();
|
||||
bool lastExecutionSuccess() const;
|
||||
int lastExecutionExitCode() const;
|
||||
|
||||
// Clean output from carriage return and ANSI color codes
|
||||
// Workaround until all relevant commands support "--no-color"
|
||||
static void removeColorCodes(QByteArray *data);
|
||||
|
||||
const QString &binaryPath() const;
|
||||
const QString &workingDirectory() const;
|
||||
const QProcessEnvironment &processEnvironment() const;
|
||||
|
||||
// Report command termination with exit code
|
||||
TerminationReportMode reportTerminationMode() const;
|
||||
void setTerminationReportMode(TerminationReportMode m);
|
||||
|
||||
int defaultTimeout() const;
|
||||
void setDefaultTimeout(int timeout);
|
||||
|
||||
// Disable Terminal on UNIX (see VCS SSH handling)
|
||||
bool unixTerminalDisabled() const;
|
||||
void setUnixTerminalDisabled(bool);
|
||||
|
||||
static QString msgTimeout(int seconds);
|
||||
|
||||
const QVariant &cookie() const;
|
||||
void setCookie(const QVariant &cookie);
|
||||
|
||||
private:
|
||||
void run();
|
||||
|
||||
signals:
|
||||
void outputData(const QByteArray &);
|
||||
void errorText(const QString &);
|
||||
void finished(bool ok, int exitCode, const QVariant &cookie);
|
||||
void success(const QVariant &cookie);
|
||||
|
||||
private:
|
||||
class CommandPrivate *d;
|
||||
};
|
||||
|
||||
} //namespace VCSBase
|
||||
|
||||
#endif // VCSBASE_COMMAND_H
|
||||
Reference in New Issue
Block a user