feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

VCS[Mercurial]: Make push/pull synchronous commands.

Browse Source 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
This commit is contained in:
Friedemann Kleint
2010-05-25 12:24:18 +02:00
parent 1c69b97ca6
commit 7b60fd1b89
4 changed files with 59 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/mercurial/mercurialclient.h
View File

@@ -48,6 +48,10 @@ namespace VCSBase{
class VCSBaseEditor;
}
namespace Utils {
struct SynchronousProcessResponse;
}
namespace Mercurial {
namespace Internal {
@@ -81,8 +85,8 @@ public:
void log(const QString &workingDir, const QStringList &files = QStringList(),
bool enableAnnotationContextMenu = false);
void import(const QString &repositoryRoot, const QStringList &files);
void pull(const QString &repositoryRoot, const QString &repository = QString());
void push(const QString &repositoryRoot, const QString &repository = QString());
bool pullSync(const QString &repositoryRoot, const QString &repository = QString());
bool pushSync(const QString &repositoryRoot, const QString &repository = QString());
void incoming(const QString &repositoryRoot, const QString &repository = QString());
void outgoing(const QString &repositoryRoot);
void status(const QString &workingDir, const QString &file = QString());
@@ -113,9 +117,16 @@ private slots:
void slotAnnotateRevisionRequested(const QString &source, QString change, int lineNumber);
private:
bool executeHgSynchronously(const QString &workingDir,
const QStringList &args,
QByteArray *output) const;
// Fully synchronous git execution (QProcess-based).
bool executeHgFullySynchronously(const QString &workingDir,
const QStringList &args,
QByteArray *output) const;
// Synchronous hg execution using Utils::SynchronousProcess, with
// log windows updating (using VCSBasePlugin::runVCS with flags).
inline Utils::SynchronousProcessResponse
executeHgSynchronously(const QString &workingDir, const QStringList &args,
unsigned flags = 0, QTextCodec *outputCodec = 0);
void enqueueJob(const QSharedPointer<HgTask> &);
void revert(const QString &workingDir, const QString &argument,
const QString &revision, const QVariant &cookie);