You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2010/12/30 18:00:43 UTC
svn commit: r1053941 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
tests/org/apache/subversion/javahl/
Author: hwright
Date: Thu Dec 30 17:00:42 2010
New Revision: 1053941
URL: http://svn.apache.org/viewvc?rev=1053941&view=rev
Log:
JavaHL: Push the new make_parents arg to update() up to the Java API.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/BasicTests.java:
Update callers.
* native/SVNClient.h,
native/SVNClient.cpp
(update): Add makeParents argument, and pass it to the C API.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_update): Add makeParents arg,
and pass it on down the stack.
* src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/ISVNClient.java
(update): Add makeParents param.
* src/org/tigris/subversion/javahl/SVNClient.java
(update): Update wrapper.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Thu Dec 30 17:00:42 2010
@@ -322,7 +322,7 @@ void SVNClient::add(const char *path,
jlongArray SVNClient::update(Targets &targets, Revision &revision,
svn_depth_t depth, bool depthIsSticky,
- bool ignoreExternals,
+ bool makeParents, bool ignoreExternals,
bool allowUnverObstructions)
{
SVN::Pool requestPool;
@@ -334,12 +334,13 @@ jlongArray SVNClient::update(Targets &ta
const apr_array_header_t *array = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), NULL);
- SVN_JNI_ERR(svn_client_update3(&revs, array,
+ SVN_JNI_ERR(svn_client_update4(&revs, array,
revision.revision(),
depth,
depthIsSticky,
ignoreExternals,
allowUnverObstructions,
+ makeParents,
ctx, requestPool.pool()),
NULL);
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Thu Dec 30 17:00:42 2010
@@ -129,7 +129,7 @@ class SVNClient :public SVNBase
StringArray &changelists, RevpropTable &revprops,
CommitCallback *callback);
jlongArray update(Targets &targets, Revision &revision, svn_depth_t depth,
- bool depthIsSticky, bool ignoreExternals,
+ bool depthIsSticky, bool makeParents, bool ignoreExternals,
bool allowUnverObstructions);
void add(const char *path, svn_depth_t depth, bool force, bool no_ignore,
bool add_parents);
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Thu Dec 30 17:00:42 2010
@@ -420,8 +420,8 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT jlongArray JNICALL
Java_org_apache_subversion_javahl_SVNClient_update
(JNIEnv *env, jobject jthis, jobject jtargets, jobject jrevision,
- jobject jdepth, jboolean jdepthIsSticky, jboolean jignoreExternals,
- jboolean jallowUnverObstructions)
+ jobject jdepth, jboolean jdepthIsSticky, jboolean jmakeParents,
+ jboolean jignoreExternals, jboolean jallowUnverObstructions)
{
JNIEntry(SVNClient, update);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -441,6 +441,7 @@ Java_org_apache_subversion_javahl_SVNCli
return cl->update(targets, revision, EnumMapper::toDepth(jdepth),
jdepthIsSticky ? true : false,
+ jmakeParents ? true : false,
jignoreExternals ? true : false,
jallowUnverObstructions ? true : false);
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Thu Dec 30 17:00:42 2010
@@ -257,8 +257,9 @@ public interface ISVNClient
* @since 1.5
*/
long[] update(Set<String> path, Revision revision, Depth depth,
- boolean depthIsSticky, boolean ignoreExternals,
- boolean allowUnverObstructions) throws ClientException;
+ boolean depthIsSticky, boolean makeParents,
+ boolean ignoreExternals, boolean allowUnverObstructions)
+ throws ClientException;
/**
* Commits changes to the repository.
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Thu Dec 30 17:00:42 2010
@@ -225,6 +225,7 @@ public class SVNClient implements ISVNCl
*/
public native long[] update(Set<String> paths, Revision revision,
Depth depth, boolean depthIsSticky,
+ boolean makeParents,
boolean ignoreExternals,
boolean allowUnverObstructions)
throws ClientException;
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Thu Dec 30 17:00:42 2010
@@ -903,7 +903,7 @@ public class SVNClient implements SVNCli
{
return aSVNClient.update(new HashSet<String>(Arrays.asList(paths)),
revision == null ? null : revision.toApache(),
- Depth.toADepth(depth), depthIsSticky,
+ Depth.toADepth(depth), depthIsSticky, false,
ignoreExternals, allowUnverObstructions);
}
catch (org.apache.subversion.javahl.ClientException ex)
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1053941&r1=1053940&r2=1053941&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Thu Dec 30 17:00:42 2010
@@ -497,7 +497,7 @@ public class BasicTests extends SVNTests
assertEquals("wrong revision from update",
client.update(thisTest.getWCPathSet(),
Revision.getInstance(1), Depth.unknown,
- false, false, false)[0],
+ false, false, false, false)[0],
1);
thisTest.getWc().setRevision(1);
@@ -2508,7 +2508,7 @@ public class BasicTests extends SVNTests
// Backdate the WC to the previous revision (r1).
client.update(thisTest.getWCPathSet(), Revision.getInstance(1),
- Depth.unknown, false, false, false);
+ Depth.unknown, false, false, false, false);
// Prep for a merge conflict by changing A/mu in a different
// way.
@@ -3980,7 +3980,7 @@ public class BasicTests extends SVNTests
throws ClientException
{
return client.update(thisTest.getWCPathSet(), null,
- Depth.unknown, false, false, false)[0];
+ Depth.unknown, false, false, false, false)[0];
}
/** A helper which calls update with a bunch of default args. */
@@ -3988,6 +3988,6 @@ public class BasicTests extends SVNTests
throws ClientException
{
return client.update(thisTest.getWCPathSet(subpath), null,
- Depth.unknown, false, false, false)[0];
+ Depth.unknown, false, false, false, false)[0];
}
}