diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-29 16:46:45 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-05-11 13:22:49 +0000 |
commit | 94dc35694a3374ef785a6765730dfc1d9401075f (patch) | |
tree | b768a67347f96f6eb3972da56e885e95bd7c8ea6 /src/plugins/subversion | |
parent | f21d2023e86e8ba9c0725852a79394ec80baaf16 (diff) |
CheckoutWizards: Use IVersionControl::createInitialCheckoutCommand
Change-Id: I09dd38f66b9cad46d561493c2e27a833595d8728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/subversion')
-rw-r--r-- | src/plugins/subversion/checkoutwizard.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/plugins/subversion/checkoutwizard.cpp b/src/plugins/subversion/checkoutwizard.cpp index ad631b9f30..a1c6348a34 100644 --- a/src/plugins/subversion/checkoutwizard.cpp +++ b/src/plugins/subversion/checkoutwizard.cpp @@ -51,14 +51,8 @@ namespace Internal { // -------------------------------------------------------------------- CheckoutWizard::CheckoutWizard(const FileName &path, QWidget *parent) : - BaseCheckoutWizard(path, parent) + BaseCheckoutWizard(VcsBase::Constants::VCS_ID_SUBVERSION, parent) { - const Core::IVersionControl *vc = SubversionPlugin::instance()->versionControl(); - if (!vc->isConfigured()) { - auto configPage = new VcsConfigurationPage; - configPage->setVersionControl(vc); - addPage(configPage); - } auto cwp = new CheckoutWizardPage; cwp->setPath(path.toString()); addPage(cwp); @@ -70,23 +64,16 @@ VcsCommand *CheckoutWizard::createCommand(FileName *checkoutDir) const CheckoutWizardPage *cwp = find<CheckoutWizardPage>(); QTC_ASSERT(cwp, return 0); - SubversionClient *client = SubversionPlugin::instance()->client(); - const VcsBaseClientSettings &settings = client->settings(); - const FileName binary = client->vcsBinary(); - const QString directory = cwp->directory(); QStringList args; - args << QLatin1String("checkout"); - args << SubversionClient::addAuthenticationOptions(settings); - args << QLatin1String(Constants::NON_INTERACTIVE_OPTION); if (cwp->trustServerCert()) args << QLatin1String("--trust-server-cert"); - args << cwp->repository() << directory; + const QString directory = cwp->directory(); const QString workingDirectory = cwp->path(); + *checkoutDir = FileName::fromString(workingDirectory + QLatin1Char('/') + directory); - auto command = new VcsCommand(workingDirectory, QProcessEnvironment::systemEnvironment()); - command->addJob(binary, args, -1); - return command; + return createCommandImpl(cwp->repository(), Utils::FileName::fromString(workingDirectory), + directory, args); } } // namespace Internal |