Hello community,
here is the log from the commit of package kdesvn for openSUSE:Factory
checked in at Fri Apr 16 00:34:16 CEST 2010.
--------
--- KDE/kdesvn/kdesvn.changes 2010-02-11 10:47:11.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdesvn/kdesvn.changes 2010-04-09 20:43:22.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Apr 9 18:42:43 UTC 2010 - tittiatcoke@gmail.com
+
+- update to 1.5.3
+ * fixed a problem with some svn servers where version of server
+ and svn-filesystem differs (ticket #765)
+ * fixed wrong default depth for update in svnqt and frontend
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdesvn-1.5.2.tar.bz2
New:
----
kdesvn-1.5.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdesvn.spec ++++++
--- /var/tmp/diff_new_pack.z1yDWf/_old 2010-04-16 00:33:40.000000000 +0200
+++ /var/tmp/diff_new_pack.z1yDWf/_new 2010-04-16 00:33:40.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdesvn (Version 1.5.2)
+# spec file for package kdesvn (Version 1.5.3)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -24,7 +24,7 @@
License: GPLv2+
Group: Development/Tools/Version Control
Summary: KDE Subversion Client
-Version: 1.5.2
+Version: 1.5.3
Release: 1
Source: %name-%version.tar.bz2
Patch: kdesvn.diff
++++++ kdesvn-1.5.2.tar.bz2 -> kdesvn-1.5.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/CMakeLists.txt new/kdesvn-1.5.3/CMakeLists.txt
--- old/kdesvn-1.5.2/CMakeLists.txt 2010-01-20 16:37:22.000000000 +0100
+++ new/kdesvn-1.5.3/CMakeLists.txt 2010-04-09 10:31:42.000000000 +0200
@@ -25,7 +25,7 @@
ELSE (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
ENDIF (CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION EQUAL 4)
-SET(BASE_VERSION 1.5.2)
+SET(BASE_VERSION 1.5.3)
OPTION(BUILD_TESTS "Building the tests yes or no (default off)")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/ChangeLog new/kdesvn-1.5.3/ChangeLog
--- old/kdesvn-1.5.2/ChangeLog 2010-02-10 11:40:16.000000000 +0100
+++ new/kdesvn-1.5.3/ChangeLog 2010-04-09 10:31:42.000000000 +0200
@@ -1,3 +1,7 @@
+version 1.5.3:
+ * fixed a problem with some svn servers where version of server and svn-filesystem differs (ticket #765)
+ * fixed wrong default depth for update in svnqt and frontend
+
version 1.5.2:
* Fixed an unicode translation error when open folders
* german translation updated
Files old/kdesvn-1.5.2/doc/en/index.cache.bz2 and new/kdesvn-1.5.3/doc/en/index.cache.bz2 differ
Files old/kdesvn-1.5.2/doc/nl/index.cache.bz2 and new/kdesvn-1.5.3/doc/nl/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/kdesvn.spec new/kdesvn-1.5.3/kdesvn.spec
--- old/kdesvn-1.5.2/kdesvn.spec 2010-02-10 11:43:26.000000000 +0100
+++ new/kdesvn-1.5.3/kdesvn.spec 2010-04-09 10:41:58.000000000 +0200
@@ -1,7 +1,7 @@
# norootforbuild
Summary: A subversion client for the KDE with KIO integration.
Name: kdesvn
-Version: 1.5.2
+Version: 1.5.3
Release: 1%{?dist}
License: LGPL
Vendor: Rajko Albrecht
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/src/svnfrontend/commandexec.cpp new/kdesvn-1.5.3/src/svnfrontend/commandexec.cpp
--- old/kdesvn-1.5.2/src/svnfrontend/commandexec.cpp 2009-12-03 12:45:43.000000000 +0100
+++ new/kdesvn-1.5.3/src/svnfrontend/commandexec.cpp 2010-03-25 23:04:55.000000000 +0100
@@ -427,7 +427,7 @@
void CommandExec::slotCmd_update()
{
m_pCPart->m_SvnWrapper->makeUpdate(m_pCPart->url,
- (m_pCPart->rev_set?m_pCPart->start:svn::Revision::HEAD),true);
+ (m_pCPart->rev_set?m_pCPart->start:svn::Revision::HEAD),svn::DepthUnknown);
}
void CommandExec::slotCmd_diff()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/src/svnfrontend/maintreewidget.cpp new/kdesvn-1.5.3/src/svnfrontend/maintreewidget.cpp
--- old/kdesvn-1.5.2/src/svnfrontend/maintreewidget.cpp 2010-01-17 00:49:18.000000000 +0100
+++ new/kdesvn-1.5.3/src/svnfrontend/maintreewidget.cpp 2010-03-25 23:04:55.000000000 +0100
@@ -33,6 +33,7 @@
#include "src/settings/kdesvnsettings.h"
#include "helpers/sshagent.h"
#include "src/svnqt/url.h"
+#include "src/svnqt/svnqttypes.h"
#include "fronthelpers/createdlg.h"
#include "fronthelpers/rangeinput_impl.h"
#include "fronthelpers/widgetblockstack.h"
@@ -2215,7 +2216,7 @@
what.append((*liter)->fullName());
}
}
- m_Data->m_Model->svnWrapper()->makeUpdate(what,svn::Revision::HEAD,true);
+ m_Data->m_Model->svnWrapper()->makeUpdate(what,svn::Revision::HEAD,svn::DepthUnknown);
}
void MainTreeWidget::slotRescanIcons()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/src/svnfrontend/svnactions.cpp new/kdesvn-1.5.3/src/svnfrontend/svnactions.cpp
--- old/kdesvn-1.5.2/src/svnfrontend/svnactions.cpp 2010-01-17 00:49:18.000000000 +0100
+++ new/kdesvn-1.5.3/src/svnfrontend/svnactions.cpp 2010-03-25 23:04:55.000000000 +0100
@@ -252,13 +252,13 @@
void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const QString&which,bool follow,bool list_files,int limit)
{
+ svn::SharedPointersvn::LogEntriesMap logs = getLog(start,end,peg,which,list_files,limit,follow);
+ if (!logs) return;
svn::InfoEntry info;
if (!singleInfo(which,peg,info)) {
return;
}
QString reposRoot = info.reposRoot();
- svn::SharedPointersvn::LogEntriesMap logs = getLog(start,end,peg,which,list_files,limit,follow);
- if (!logs) return;
bool need_modal = m_Data->runblocked||KApplication::activeModalWidget()!=0;
if (need_modal||!m_Data->m_LogDialog) {
m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal);
@@ -387,15 +387,11 @@
QVariant _m(false);
QString path;
- if (!svn::Url::isValid(originpath)) {
- svn::InfoEntry e;
- if (!singleInfo(originpath,svn::Revision::BASE,e)) {
- return false;
- }
- path = e.reposRoot();
- } else {
- path = originpath;
+ svn::InfoEntry e;
+ if (!singleInfo(originpath,svn::Revision::UNDEFINED,e)) {
+ return false;
}
+ path = e.reposRoot();
if (!m_Data->m_MergeInfoCache.findSingleValid(path,_m)) {
bool mergeinfo;
try {
@@ -419,6 +415,11 @@
svn::Revision rev = _rev;
svn::Revision peg = _peg;
if (!m_Data->m_CurrentContext) return false;
+#ifdef DEBUG_TIMER
+ QTime _counttime;
+ _counttime.start();
+#endif
+
if (!svn::Url::isValid(what)) {
// working copy
// url = svn::Wc::getUrl(what);
@@ -453,6 +454,7 @@
try {
e = (m_Data->m_Svnclient->info(url,svn::DepthEmpty,_rev,peg));
} catch (const svn::Exception&ce) {
+ kDebug()<<"single info: "<m_CurrentContext) return;
QString ex;
@@ -1438,12 +1443,12 @@
i18n("Making update - hit cancel for abort"));
connect(this,SIGNAL(sigExtraLogMsg(const QString&)),&sdlg,SLOT(slotExtraMessage(const QString&)));
svn::Targets pathes(what);
- ret = m_Data->m_Svnclient->update(pathes,rev, recurse?svn::DepthInfinity:svn::DepthFiles,false,false,true);
+ ret = m_Data->m_Svnclient->update(pathes,rev, depth,false,false,true);
} catch (const svn::Exception&e) {
emit clientException(e.msg());
return;
}
- removeFromUpdateCache(what,!recurse);
+ removeFromUpdateCache(what,depth!=svn::DepthFiles);
EMIT_REFRESH;
EMIT_FINISHED;
m_Data->clearCaches();
@@ -1494,7 +1499,7 @@
delete dlg;
if (result!=QDialog::Accepted) return;
}
- makeUpdate(what,r,true);
+ makeUpdate(what,r,svn::DepthUnknown);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/src/svnfrontend/svnactions.h new/kdesvn-1.5.3/src/svnfrontend/svnactions.h
--- old/kdesvn-1.5.2/src/svnfrontend/svnactions.h 2010-01-17 00:49:18.000000000 +0100
+++ new/kdesvn-1.5.3/src/svnfrontend/svnactions.h 2010-03-25 23:04:55.000000000 +0100
@@ -129,7 +129,7 @@
void makeBlame(const svn::Revision&start, const svn::Revision&end, SvnItem*k);
void makeBlame(const svn::Revision&start, const svn::Revision&end, const QString&,QWidget*parent=0,const svn::Revision&peg=svn::Revision::UNDEFINED,SimpleLogCb*_acb=0);
- void makeUpdate(const QStringList&what,const svn::Revision&rev,bool recurse);
+ void makeUpdate(const QStringList&what,const svn::Revision&rev,svn::Depth depth);
bool makeSwitch(const QString&rUrl,const QString&tPath,const svn::Revision&r,svn::Depth depth,const svn::Revision&peg,bool stickydepth,bool ignore_externals,bool allow_unversioned);
bool makeSwitch(const QString&path,const QString&what);
bool makeRelocate(const QString&fUrl,const QString&tUrl,const QString&path,bool rec = true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/src/svnqt/CMakeLists.txt new/kdesvn-1.5.3/src/svnqt/CMakeLists.txt
--- old/kdesvn-1.5.2/src/svnqt/CMakeLists.txt 2010-01-20 16:59:20.000000000 +0100
+++ new/kdesvn-1.5.3/src/svnqt/CMakeLists.txt 2010-03-25 23:07:35.000000000 +0100
@@ -189,7 +189,7 @@
SET(LIB_MAJOR 6)
SET(LIB_MINOR 0)
-SET(LIB_RELEASE 2)
+SET(LIB_RELEASE 3)
SET(_soversion ${LIB_MAJOR}.${LIB_MINOR}.${LIB_RELEASE})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdesvn-1.5.2/src/svnqt/client_modify.cpp new/kdesvn-1.5.3/src/svnqt/client_modify.cpp
--- old/kdesvn-1.5.2/src/svnqt/client_modify.cpp 2009-12-03 12:45:43.000000000 +0100
+++ new/kdesvn-1.5.3/src/svnqt/client_modify.cpp 2010-03-25 23:04:55.000000000 +0100
@@ -199,9 +199,6 @@
apr_array_header_t *apr_revisions = apr_array_make (apr_pool,
path.size(),
sizeof (svn_revnum_t));
- if (depth==DepthUnknown) {
- depth=DepthInfinity;
- }
#if ((SVN_VER_MAJOR == 1) && (SVN_VER_MINOR >= 5)) || (SVN_VER_MAJOR > 1)
error = svn_client_update3(&apr_revisions,path.array(pool),revision,internal::DepthToSvn(depth),sticky_depth,ignore_externals,allow_unversioned,*m_context,pool);
#else
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org