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

vcsbase: throw away VCSJobRunner, replaced by GitCommand

Browse Source 
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:
cerf
2011-10-05 15:32:16 +00:00
committed by Tobias Hunger
parent d74a866bc6
commit 6a72edb28a
10 changed files with 594 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -33,11 +33,11 @@
#include "mercurialclient.h"
#include "constants.h"
#include <vcsbase/command.h>
#include <vcsbase/vcsbaseoutputwindow.h>
#include <vcsbase/vcsbaseplugin.h>
#include <vcsbase/vcsbaseeditor.h>
#include <vcsbase/vcsbaseeditorparameterwidget.h>
#include <vcsbase/vcsjobrunner.h>
#include <utils/synchronousprocess.h>
#include <utils/fileutils.h>
#include <utils/qtcassert.h>
@@ -277,12 +277,10 @@ void MercurialClient::incoming(const QString &repositoryRoot, const QString &rep
VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, repositoryRoot,
true, "incoming", id);
QSharedPointer<VCSBase::VCSJob> job(new VCSBase::VCSJob(repositoryRoot, args, editor));
// Suppress SSH prompting.
VCSBase::Command *cmd = createCommand(repository, editor);
if (!repository.isEmpty() && VCSBase::VCSBasePlugin::isSshPromptConfigured())
job->setUnixTerminalDisabled(true);
enqueueJob(job);
cmd->setUnixTerminalDisabled(true);
enqueueJob(cmd, args);
}
void MercurialClient::outgoing(const QString &repositoryRoot)
@@ -297,10 +295,9 @@ void MercurialClient::outgoing(const QString &repositoryRoot)
VCSBase::VCSBaseEditorWidget *editor = createVCSEditor(kind, title, repositoryRoot, true,
"outgoing", repositoryRoot);
QSharedPointer<VCSBase::VCSJob> job(new VCSBase::VCSJob(repositoryRoot, args, editor));
// Suppress SSH prompting
job->setUnixTerminalDisabled(VCSBase::VCSBasePlugin::isSshPromptConfigured());
enqueueJob(job);
VCSBase::Command *cmd = createCommand(repositoryRoot, editor);
cmd->setUnixTerminalDisabled(VCSBase::VCSBasePlugin::isSshPromptConfigured());
enqueueJob(cmd, args);
}
void MercurialClient::annotate(const QString &workingDir, const QString &file,