diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2025-02-06 14:59:53 +0100 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2025-02-06 20:11:32 +0000 |
| commit | 2c120b24a6b9d804ce31285bde5d65dbb4bb8219 (patch) | |
| tree | 67c87c3318539d3a91c3acbb12056dd104568caa | |
| parent | 008b1c94c27cb11c7a1e820d4f61c144d99a5c05 (diff) | |
Subversion: Remove dead ends
It looks like the alternative implementation of vcsCheckout()
is currently createInitialCheckoutCommand().
Detected by Axivion plugin.
Change-Id: Iab375bf5839ee87345c01a682bc04e33198f6023
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index a1973af3f1e..5712a92f281 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -167,9 +167,6 @@ public: bool vcsAdd(const FilePath &workingDir, const QString &fileName); bool vcsDelete(const FilePath &workingDir, const QString &fileName); bool vcsMove(const FilePath &workingDir, const QString &from, const QString &to); - bool vcsCheckout(const FilePath &directory, const QByteArray &url); - - static SubversionPluginPrivate *instance(); QString monitorFile(const FilePath &repository) const; QString synchronousTopic(const FilePath &repository) const; @@ -939,12 +936,6 @@ IEditor *SubversionPluginPrivate::showOutputInEditor(const QString &title, const return editor; } -SubversionPluginPrivate *SubversionPluginPrivate::instance() -{ - QTC_ASSERT(dd, return dd); - return dd; -} - QString SubversionPluginPrivate::monitorFile(const FilePath &repository) const { QTC_ASSERT(!repository.isEmpty(), return QString()); @@ -994,33 +985,6 @@ bool SubversionPluginPrivate::vcsMove(const FilePath &workingDir, const QString == ProcessResult::FinishedWithSuccess; } -bool SubversionPluginPrivate::vcsCheckout(const FilePath &directory, const QByteArray &url) -{ - QUrl tempUrl = QUrl::fromEncoded(url); - const QString username = tempUrl.userName(); - const QString password = tempUrl.password(); - CommandLine args{settings().binaryPath(), {"checkout"}}; - args << Constants::NON_INTERACTIVE_OPTION; - - if (!username.isEmpty()) { - // If url contains username and password we have to use separate username and password - // arguments instead of passing those in the url. Otherwise the subversion 'non-interactive' - // authentication will always fail (if the username and password data are not stored locally), - // if for example we are logging into a new host for the first time using svn. There seems to - // be a bug in subversion, so this might get fixed in the future. - tempUrl.setUserInfo({}); - args << "--username" << username; - if (!password.isEmpty()) - args << "--password"; - args.addMaskedArg(password); - } - - args << QString::fromLatin1(tempUrl.toEncoded()) << directory.toUrlishString(); - - return runSvn(directory, args, RunFlags::None, nullptr, 10).result() - == ProcessResult::FinishedWithSuccess; -} - bool SubversionPluginPrivate::managesDirectory(const FilePath &directory, FilePath *topLevel /* = 0 */) const { const QStringList filesToCheck = transform(m_svnDirectories, [](const QString &s) { |