Changeset View
Changeset View
Standalone View
Standalone View
src/kiosvn/kiosvn.cpp
Show First 20 Lines • Show All 310 Lines • ▼ Show 20 Line(s) | 309 | } catch (const svn::ClientException &e) { | |||
---|---|---|---|---|---|
311 | return; | 311 | return; | ||
312 | } | 312 | } | ||
313 | finished(); | 313 | finished(); | ||
314 | } | 314 | } | ||
315 | 315 | | |||
316 | void kio_svnProtocol::mkdir(const QList<QUrl> &urls, int) | 316 | void kio_svnProtocol::mkdir(const QList<QUrl> &urls, int) | ||
317 | { | 317 | { | ||
318 | try { | 318 | try { | ||
319 | m_pData->m_Svnclient->mkdir(svn::Targets::fromUrlList(urls), getDefaultLog()); | 319 | m_pData->m_Svnclient->mkdir(svn::Targets::fromUrlList(urls, svn::Targets::UrlConversion::PreferLocalPath), getDefaultLog()); | ||
320 | } catch (const svn::ClientException &e) { | 320 | } catch (const svn::ClientException &e) { | ||
321 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | 321 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | ||
322 | return; | 322 | return; | ||
323 | } | 323 | } | ||
324 | finished(); | 324 | finished(); | ||
325 | } | 325 | } | ||
326 | 326 | | |||
327 | void kio_svnProtocol::rename(const QUrl &src, const QUrl &target, KIO::JobFlags flags) | 327 | void kio_svnProtocol::rename(const QUrl &src, const QUrl &target, KIO::JobFlags flags) | ||
▲ Show 20 Lines • Show All 475 Lines • ▼ Show 20 Line(s) | 790 | { | |||
803 | if (lt.count() != 1) { | 803 | if (lt.count() != 1) { | ||
804 | msg = i18n("Wrong or missing log (may cancel pressed)."); | 804 | msg = i18n("Wrong or missing log (may cancel pressed)."); | ||
805 | qCDebug(KDESVN_LOG) << msg << endl; | 805 | qCDebug(KDESVN_LOG) << msg << endl; | ||
806 | return; | 806 | return; | ||
807 | } | 807 | } | ||
808 | msg = lt[0]; | 808 | msg = lt[0]; | ||
809 | svn::Revision nnum = svn::Revision::UNDEFINED; | 809 | svn::Revision nnum = svn::Revision::UNDEFINED; | ||
810 | svn::CommitParameter commit_parameters; | 810 | svn::CommitParameter commit_parameters; | ||
811 | commit_parameters.targets(svn::Targets::fromUrlList(urls)).message(msg).depth(svn::DepthInfinity).keepLocks(false); | 811 | commit_parameters.targets(svn::Targets::fromUrlList(urls, svn::Targets::UrlConversion::PreferLocalPath)).message(msg).depth(svn::DepthInfinity).keepLocks(false); | ||
812 | 812 | | |||
813 | try { | 813 | try { | ||
814 | nnum = m_pData->m_Svnclient->commit(commit_parameters); | 814 | nnum = m_pData->m_Svnclient->commit(commit_parameters); | ||
815 | } catch (const svn::ClientException &e) { | 815 | } catch (const svn::ClientException &e) { | ||
816 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | 816 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | ||
817 | } | 817 | } | ||
818 | for (long j = 0; j < urls.count(); ++j) { | 818 | for (long j = 0; j < urls.count(); ++j) { | ||
819 | QString userstring; | 819 | QString userstring; | ||
▲ Show 20 Lines • Show All 73 Lines • ▼ Show 20 Line(s) | 876 | for (; it != logs.constEnd(); ++it) { | |||
893 | } | 893 | } | ||
894 | } | 894 | } | ||
895 | } | 895 | } | ||
896 | } | 896 | } | ||
897 | 897 | | |||
898 | void kio_svnProtocol::revert(const QList<QUrl> &urls) | 898 | void kio_svnProtocol::revert(const QList<QUrl> &urls) | ||
899 | { | 899 | { | ||
900 | try { | 900 | try { | ||
901 | m_pData->m_Svnclient->revert(svn::Targets::fromUrlList(urls), svn::DepthEmpty); | 901 | m_pData->m_Svnclient->revert(svn::Targets::fromUrlList(urls, svn::Targets::UrlConversion::PreferLocalPath), svn::DepthEmpty); | ||
902 | } catch (const svn::ClientException &e) { | 902 | } catch (const svn::ClientException &e) { | ||
903 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | 903 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | ||
904 | } | 904 | } | ||
905 | } | 905 | } | ||
906 | 906 | | |||
907 | void kio_svnProtocol::wc_switch(const QUrl &wc, const QUrl &target, bool rec, int rev, const QString &revstring) | 907 | void kio_svnProtocol::wc_switch(const QUrl &wc, const QUrl &target, bool rec, int rev, const QString &revstring) | ||
908 | { | 908 | { | ||
909 | svn::Revision where(rev, revstring); | 909 | svn::Revision where(rev, revstring); | ||
▲ Show 20 Lines • Show All 64 Lines • ▼ Show 20 Line(s) | 972 | } catch (const svn::ClientException &e) { | |||
974 | return; | 974 | return; | ||
975 | } | 975 | } | ||
976 | finished(); | 976 | finished(); | ||
977 | } | 977 | } | ||
978 | 978 | | |||
979 | void kio_svnProtocol::wc_delete(const QList<QUrl> &urls) | 979 | void kio_svnProtocol::wc_delete(const QList<QUrl> &urls) | ||
980 | { | 980 | { | ||
981 | try { | 981 | try { | ||
982 | m_pData->m_Svnclient->remove(svn::Targets::fromUrlList(urls), false); | 982 | m_pData->m_Svnclient->remove(svn::Targets::fromUrlList(urls, svn::Targets::UrlConversion::PreferLocalPath), false); | ||
983 | } catch (const svn::ClientException &e) { | 983 | } catch (const svn::ClientException &e) { | ||
984 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | 984 | extraError(KIO::ERR_SLAVE_DEFINED, e.msg()); | ||
985 | return; | 985 | return; | ||
986 | } | 986 | } | ||
987 | finished(); | 987 | finished(); | ||
988 | } | 988 | } | ||
989 | 989 | | |||
990 | void kio_svnProtocol::wc_resolve(const QUrl &url, bool recurse) | 990 | void kio_svnProtocol::wc_resolve(const QUrl &url, bool recurse) | ||
▲ Show 20 Lines • Show All 145 Lines • Show Last 20 Lines |