rpms/svnkit/devel svnkit-1.3.3-dependencies.patch, NONE, 1.1 svnkit-1.3.3-ISVNStatusFileProvider.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 svnkit.spec, 1.15, 1.16 svnkit-1.3.2-ISVNStatusFileProvider.patch, 1.1, NONE svnkit-1.3.2-dependencies.patch, 1.1, NONE

Tue Jul 13 10:16:55 UTC 2010

Author: akurtakov

Update of /cvs/pkgs/rpms/svnkit/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21674/devel

Modified Files:
	.cvsignore sources svnkit.spec 
Added Files:
	svnkit-1.3.3-dependencies.patch 
	svnkit-1.3.3-ISVNStatusFileProvider.patch 
Removed Files:
	svnkit-1.3.2-ISVNStatusFileProvider.patch 
	svnkit-1.3.2-dependencies.patch 
Log Message:
Update to 1.3.3.

svnkit-1.3.3-dependencies.patch:
 build.xml                                       |   11 ++++++-----
 svnkit-eclipse/com.sun.jna/MANIFEST.MF          |    2 +-
 svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF |    1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

--- NEW FILE svnkit-1.3.3-dependencies.patch ---
--- svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF.orig	2009-08-11 23:09:44.000000000 +0300
+++ svnkit-eclipse/org.tmatesoft.svnkit/MANIFEST.MF	2009-12-03 11:22:40.006747135 +0200
@@ -14,6 +14,7 @@ Require-Bundle: com.sun.jna;bundle-versi
 Bundle-ClassPath: .,
  svnkit.jar,
  svnkit-javahl.jar,
+ svn-javahl.jar,
  trilead.jar,
  sqljet.%sqljet.version%.jar,
  antlr-runtime-%antlr.version%.jar
--- build.xml.orig	2009-11-24 12:52:48.000000000 +0200
+++ build.xml	2009-12-03 11:25:45.749957330 +0200
@@ -34,7 +34,8 @@
 
         <path id="library.classpath">
             <pathelement location="contrib/trilead/trilead.jar" />
-            <pathelement location="contrib/jna/jna.jar" />            
+            <pathelement location="contrib/jna/jna.jar" /> 
+        	 <pathelement location="contrib/javahl/svn-javahl.jar" />
             <pathelement location="contrib/sqljet/antlr-runtime-${antlr.version}.jar" />            
             <pathelement location="contrib/sqljet/sqljet.jar" />            
 
@@ -43,11 +44,11 @@
             <pathelement path="svnkit/bin" />
         </path>
 
-        <javac debug="true" destdir="contrib/javahl/bin" srcdir="contrib/javahl/src">
+        
         <javac debug="true" destdir="contrib/sequence/bin" srcdir="contrib/sequence/src" />
         <javac debug="true" destdir="svnkit/bin" srcdir="svnkit/src" classpathref="library.classpath">
             <exclude name="org/tmatesoft/svn/util/SVNTest.java"/>
@@ -304,11 +305,11 @@
         <zip destfile="build/lib/svnkitsrc.zip">
             <fileset dir="svnkit/src" />
             <fileset dir="svnkit-eclipse/org.tmatesoft.svnkit/src" />
-            <fileset dir="contrib/javahl/src">
+
             <fileset dir="contrib/sequence/src" />
             <fileset dir="${basedir}" >
                 <include name="COPYING" />
--- svnkit-eclipse/com.sun.jna/MANIFEST.MF.orig	2009-11-13 21:05:48.000000000 +0200
+++ svnkit-eclipse/com.sun.jna/MANIFEST.MF	2009-12-03 13:06:12.934956961 +0200
@@ -4,7 +4,7 @@ Bundle-Name: JNA Library Plug-in
 Bundle-SymbolicName: com.sun.jna
 Bundle-Version: %jna.version%
 Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ClassPath: .
+Bundle-ClassPath: jna.jar
 Export-Package: com.sun.jna,
  com.sun.jna.win32,
  com.sun.jna.ptr

svnkit-1.3.3-ISVNStatusFileProvider.patch:
 internal/wc/SVNStatusEditor.java |   66 +++++++++++++++++++++++++++------------
 wc/ISVNStatusFileProvider.java   |   12 +++++++
 wc/SVNStatusClient.java          |    9 ++++-
 3 files changed, 66 insertions(+), 21 deletions(-)

--- NEW FILE svnkit-1.3.3-ISVNStatusFileProvider.patch ---
Merged into trunk in r6418.

------------------------------------------------------------------------
r5680 | semen | 2009-04-08 13:08:05 +0200 (Wed, 08 Apr 2009) | 1 line

Applied patch contributed by Irina Chernoushina
(Irina.Chernushina at jetbrains.com) - added callback for fetching
directory's children during the local status
---
 .../svn/core/internal/wc/SVNStatusEditor.java      |   66 ++++++++++++++------
 .../svn/core/wc/ISVNStatusFileProvider.java        |   12 ++++
 .../org/tmatesoft/svn/core/wc/SVNStatusClient.java |    8 +++
 3 files changed, 66 insertions(+), 20 deletions(-)
 create mode 100644 svnkit/src/org/tmatesoft/svn/core/wc/ISVNStatusFileProvider.java

diff --git a/svnkit/src/org/tmatesoft/svn/core/internal/wc/SVNStatusEditor.java b/svnkit/src/org/tmatesoft/svn/core/internal/wc/SVNStatusEditor.java
index a7b6626..3757752 100644
--- a/svnkit/src/org/tmatesoft/svn/core/internal/wc/SVNStatusEditor.java
+++ b/svnkit/src/org/tmatesoft/svn/core/internal/wc/SVNStatusEditor.java
@@ -11,14 +11,6 @@
  */
 package org.tmatesoft.svn.core.internal.wc;
 
-import java.io.File;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.StringTokenizer;
-import java.util.TreeMap;
-
 import org.tmatesoft.svn.core.SVNCommitInfo;
 import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNException;
@@ -34,11 +26,20 @@ import org.tmatesoft.svn.core.internal.wc.admin.SVNAdminAreaInfo;
 import org.tmatesoft.svn.core.internal.wc.admin.SVNEntry;
 import org.tmatesoft.svn.core.internal.wc.admin.SVNWCAccess;
 import org.tmatesoft.svn.core.wc.ISVNOptions;
+import org.tmatesoft.svn.core.wc.ISVNStatusFileProvider;
 import org.tmatesoft.svn.core.wc.ISVNStatusHandler;
 import org.tmatesoft.svn.core.wc.SVNStatus;
 import org.tmatesoft.svn.core.wc.SVNStatusType;
 import org.tmatesoft.svn.core.wc.SVNTreeConflictDescription;
 
+import java.io.File;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.StringTokenizer;
+import java.util.TreeMap;
+
 
 /**
  * @version 1.3
@@ -61,7 +62,9 @@ public class SVNStatusEditor {
     private SVNURL myRepositoryRoot;
     private Map myRepositoryLocks;
     private long myTargetRevision;
-    
+    private ISVNStatusFileProvider myFileProvider;
+    private ISVNStatusFileProvider myDefaultFileProvider;
+
     public SVNStatusEditor(ISVNOptions options, SVNWCAccess wcAccess, SVNAdminAreaInfo info, boolean noIgnore, boolean reportAll, SVNDepth depth,
             ISVNStatusHandler handler) {
         myWCAccess = wcAccess;
@@ -73,6 +76,8 @@ public class SVNStatusEditor {
         myExternalsMap = new SVNHashMap();
         myGlobalIgnores = getGlobalIgnores(options);
         myTargetRevision = -1;
+        myDefaultFileProvider = new DefaultSVNStatusFileProvider();
+        myFileProvider = myDefaultFileProvider;
     }
     
     public long getTargetRevision() {
@@ -121,7 +126,7 @@ public class SVNStatusEditor {
             ISVNStatusHandler handler) throws SVNException {
         myWCAccess.checkCancelled();
         depth = depth == SVNDepth.UNKNOWN ? SVNDepth.INFINITY : depth;
-        Map childrenFiles = getChildrenFiles(dir.getRoot());
+        Map childrenFiles = myFileProvider.getChildrenFiles(dir.getRoot());
         SVNEntry dirEntry = myWCAccess.getEntry(dir.getRoot(), false);
 
         String externals = dir.getProperties(dir.getThisDirName()).getStringPropertyValue(SVNProperty.EXTERNALS);
@@ -397,17 +402,38 @@ public class SVNStatusEditor {
         }
         return false;
     }
-    
-    private static Map getChildrenFiles(File parent) {
-        File[] children = SVNFileListUtil.listFiles(parent);
-        if (children != null) {
-            Map map = new SVNHashMap();
-            for (int i = 0; i < children.length; i++) {
-                map.put(children[i].getName(), children[i]);
+
+    public void setFileProvider(ISVNStatusFileProvider fileProvider) {
+        myFileProvider = new WrapperSVNStatusFileProvider(myDefaultFileProvider, fileProvider);
+    }
+
+    private static class WrapperSVNStatusFileProvider implements ISVNStatusFileProvider {
+        private final ISVNStatusFileProvider myDefault;
+        private final ISVNStatusFileProvider myDelegate;
+
+        private WrapperSVNStatusFileProvider(ISVNStatusFileProvider defaultProvider, ISVNStatusFileProvider delegate) {
+            myDefault = defaultProvider;
+            myDelegate = delegate;
+        }
+
+        public Map getChildrenFiles(File parent) {
+            final Map result = myDelegate.getChildrenFiles(parent);
+            if (result != null) return result;
+            return myDefault.getChildrenFiles(parent);
+        }
+    }
+
+    private static class DefaultSVNStatusFileProvider implements ISVNStatusFileProvider {
+        public Map getChildrenFiles(File parent) {
+            File[] children = SVNFileListUtil.listFiles(parent);
+            if (children != null) {
+                Map map = new SVNHashMap();
+                for (int i = 0; i < children.length; i++) {
+                    map.put(children[i].getName(), children[i]);
+                }
+                return map;
             }
-            return map;
+            return Collections.EMPTY_MAP;
         }
-        return Collections.EMPTY_MAP;
     }
-    
 }
diff --git a/svnkit/src/org/tmatesoft/svn/core/wc/ISVNStatusFileProvider.java b/svnkit/src/org/tmatesoft/svn/core/wc/ISVNStatusFileProvider.java
new file mode 100644
index 0000000..d7a83f0
--- /dev/null
+++ b/svnkit/src/org/tmatesoft/svn/core/wc/ISVNStatusFileProvider.java
@@ -0,0 +1,12 @@
+package org.tmatesoft.svn.core.wc;
+
+import java.util.Map;
+import java.io.File;
+
+public interface ISVNStatusFileProvider {
+    /**
+     * Returns Map (key = file name, value = java.io.File) of files under dir that client is interested in
+     * @return should return null for the case when file list should be calculated outside
+     */
+    Map getChildrenFiles(File parent);
+}
diff --git a/svnkit/src/org/tmatesoft/svn/core/wc/SVNStatusClient.java b/svnkit/src/org/tmatesoft/svn/core/wc/SVNStatusClient.java
index 9e955d8..d8bb72e 100644
--- a/svnkit/src/org/tmatesoft/svn/core/wc/SVNStatusClient.java
+++ b/svnkit/src/org/tmatesoft/svn/core/wc/SVNStatusClient.java
@@ -77,6 +77,7 @@ import org.tmatesoft.svn.util.SVNLogType;
  * @see     <a target="_top" href="http://svnkit.com/kb/examples/">Examples</a>
  */
 public class SVNStatusClient extends SVNBasicClient {
+    private ISVNStatusFileProvider myFilesProvider;
 
     /**
      * Constructs and initializes an <b>SVNStatusClient</b> object
@@ -373,6 +374,9 @@ public class SVNStatusClient extends SVNBasicClient {
                 }
             } else {
                 editor = new SVNStatusEditor(getOptions(), wcAccess, info, includeIgnored, reportAll, depth, handler);
+                if (myFilesProvider != null) {
+                    editor.setFileProvider(myFilesProvider);
+                }
                 editor.closeEdit();
             }         
             if (!isIgnoreExternals() && (depth == SVNDepth.INFINITY || depth == SVNDepth.UNKNOWN)) {
@@ -472,4 +476,8 @@ public class SVNStatusClient extends SVNBasicClient {
         doStatus(absPath, SVNRevision.HEAD, SVNDepth.EMPTY, remote, true, true, collectParentExternals, handler, null);
         return result[0];
     }
+
+    public void setFilesProvider(ISVNStatusFileProvider filesProvider) {
+        myFilesProvider = filesProvider;
+    }
 }
-- 
1.6.6



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	3 Dec 2009 11:35:15 -0000	1.7
+++ .cvsignore	13 Jul 2010 10:16:54 -0000	1.8
@@ -1,3 +1,4 @@
 org.tmatesoft.svn_1.2.3.src-CLEAN.zip
 org.tmatesoft.svn_1.3.0.src-CLEAN.zip
 org.tmatesoft.svn_1.3.2.src-CLEAN.zip
+org.tmatesoft.svn_1.3.3.src-CLEAN.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	3 Dec 2009 11:35:15 -0000	1.7
+++ sources	13 Jul 2010 10:16:54 -0000	1.8
@@ -1 +1 @@
-3bcbbda3423b41e892224dea85b80e6a  org.tmatesoft.svn_1.3.2.src-CLEAN.zip
+bc39edbe8d84a307b4e12dd62641f259  org.tmatesoft.svn_1.3.3.src-CLEAN.zip


Index: svnkit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/svnkit/devel/svnkit.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- svnkit.spec	5 Mar 2010 10:28:48 -0000	1.15
+++ svnkit.spec	13 Jul 2010 10:16:54 -0000	1.16
@@ -1,19 +1,19 @@
-%define svn_revision     6267
+%define svn_revision     6648
 
 %define eclipse_name     eclipse
 %define eclipse_base     %{_libdir}/%{eclipse_name}
 %define install_loc      %{_datadir}/eclipse/dropins
-%define local_dropins    %{install_loc}/svnkit/eclipse
-%define local_plugins    %{local_dropins}/plugins
-%define local_features   %{local_dropins}/features
-%define core_plugin_name org.tmatesoft.svnkit_%{version}
-%define core_plugin_dir  %{local_plugins}/%{core_plugin_name}
-%define jna_plugin_name  com.sun.jna_3.2.3
-%define jna_plugin_dir   %{local_plugins}/%{jna_plugin_name}
+%global local_dropins    %{install_loc}/svnkit/eclipse
+%global local_plugins    %{local_dropins}/plugins
+%global local_features   %{local_dropins}/features
+%global core_plugin_name org.tmatesoft.svnkit_%{version}
+%global core_plugin_dir  %{local_plugins}/%{core_plugin_name}
+%global jna_plugin_name  com.sun.jna_3.2.3
+%global jna_plugin_dir   %{local_plugins}/%{jna_plugin_name}
 
 Name:           svnkit
-Version:        1.3.2
-Release:        2%{?dist}
+Version:        1.3.3
+Release:        1%{?dist}
 Summary:        Pure Java Subversion client library
 
 Group:          Development/Tools
@@ -24,8 +24,8 @@ URL:            http://www.svnkit.com/
 # repackaged removing binary dependencies using:
 # zip $FILE -d \*.jar
 Source0:        org.tmatesoft.svn_%{version}.src-CLEAN.zip
-Patch0:         svnkit-1.3.2-dependencies.patch
-Patch1:         svnkit-1.3.2-ISVNStatusFileProvider.patch
+Patch0:         svnkit-1.3.3-dependencies.patch
+Patch1:         svnkit-1.3.3-ISVNStatusFileProvider.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -73,7 +73,6 @@ Eclipse feature for SVNKit - Java Subver
 %prep
 %setup -q -n %{name}-src-%{version}.%{svn_revision}
 %patch0 
-%patch1 -p1
 
 # delete the jars that are in the archive
 JAR_files=""
@@ -169,6 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jul 13 2010 Alexander Kurtakov <akurtako at redhat.com> 1.3.3-1
+- Update to 1.3.3.
+- Patch1 is not applied it looks like fixed upstream in different way.
+
 * Fri Mar 05 2010 Lubomir Rintel <lkundrak at v3.sk> 1.3.2-2
 - Cherry-pick r6418 from upstream
 


--- svnkit-1.3.2-ISVNStatusFileProvider.patch DELETED ---


--- svnkit-1.3.2-dependencies.patch DELETED ---

