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/08/13 22:09:35 UTC
svn commit: r985339 - 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: Fri Aug 13 20:09:35 2010
New Revision: 985339
URL: http://svn.apache.org/viewvc?rev=985339&view=rev
Log:
JavaHL: Extend the commit callback to all commit-y APIs.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/BasicTests.java:
Update tests to use the updated API.
* tests/org/apache/subversion/javahl/SVNTests.java:
Same.
* subversion/bindings/javahl/native/SVNClient.h
(propertySet, doImport, mkdir, move, copy, remove): Add commit callback param.
* subversion/bindings/javahl/native/SVNClient.cpp
(propertySet, doImport, mkdir, move, copy, remove): Add commit callback param,
and set it in the client context.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_remove,
Java_org_apache_subversion_javahl_SVNClient_copy,
Java_org_apache_subversion_javahl_SVNClient_move,
Java_org_apache_subversion_javahl_SVNClient_mkdir,
Java_org_apache_subversion_javahl_SVNClient_doImport,
Java_org_apache_subversion_javahl_SVNClient_propertySet):
Add commit callback param, and pass it to the C++ object.
* src/org/apache/subversion/javahl/SVNClient.java
(remove, copy, move, mkdir, doImport, propertySet): Add CommitCallback
param.
(propertyRemove, propertyCreate): Add param and update callers.
* src/org/apache/subversion/javahl/ISVNClient.java
(remove, copy, move, mkdir, doImport, propertySet, propertyRemove,
propertyCreate): Update wrappers.
* src/org/tigris/subversion/javahl/SVNClient.java
(remove, copy, move, mkdir, doImport, propertySet, propertyRemove,
propertyCreate): Add CommitCallback
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
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.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=985339&r1=985338&r2=985339&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Fri Aug 13 20:09:35 2010
@@ -314,7 +314,8 @@ void SVNClient::setProgressListener(Prog
}
void SVNClient::remove(Targets &targets, const char *message, bool force,
- bool keep_local, RevpropTable &revprops)
+ bool keep_local, RevpropTable &revprops,
+ CommitCallback *callback)
{
SVN::Pool requestPool;
svn_client_ctx_t *ctx = getContext(message);
@@ -324,6 +325,9 @@ void SVNClient::remove(Targets &targets,
const apr_array_header_t *targets2 = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), );
+ ctx->commit_callback2 = CommitCallback::callback;
+ ctx->commit_baton = callback;
+
SVN_JNI_ERR(svn_client_delete4(targets2, force, keep_local,
revprops.hash(requestPool), ctx,
requestPool.pool()), );
@@ -432,7 +436,8 @@ void SVNClient::commit(Targets &targets,
void SVNClient::copy(CopySources ©Sources, const char *destPath,
const char *message, bool copyAsChild, bool makeParents,
- bool ignoreExternals, RevpropTable &revprops)
+ bool ignoreExternals, RevpropTable &revprops,
+ CommitCallback *callback)
{
SVN::Pool requestPool;
@@ -451,6 +456,9 @@ void SVNClient::copy(CopySources ©So
if (ctx == NULL)
return;
+ ctx->commit_callback2 = CommitCallback::callback;
+ ctx->commit_baton = callback;
+
SVN_JNI_ERR(svn_client_copy6(srcs, destinationPath.c_str(),
copyAsChild, makeParents, ignoreExternals,
revprops.hash(requestPool), ctx,
@@ -459,7 +467,8 @@ void SVNClient::copy(CopySources ©So
void SVNClient::move(Targets &srcPaths, const char *destPath,
const char *message, bool force, bool moveAsChild,
- bool makeParents, RevpropTable &revprops)
+ bool makeParents, RevpropTable &revprops,
+ CommitCallback *callback)
{
SVN::Pool requestPool;
@@ -473,6 +482,9 @@ void SVNClient::move(Targets &srcPaths,
if (ctx == NULL)
return;
+ ctx->commit_callback2 = CommitCallback::callback;
+ ctx->commit_baton = callback;
+
SVN_JNI_ERR(svn_client_move6((apr_array_header_t *) srcs,
destinationPath.c_str(), force, moveAsChild,
makeParents, revprops.hash(requestPool), ctx,
@@ -480,13 +492,16 @@ void SVNClient::move(Targets &srcPaths,
}
void SVNClient::mkdir(Targets &targets, const char *message, bool makeParents,
- RevpropTable &revprops)
+ RevpropTable &revprops, CommitCallback *callback)
{
SVN::Pool requestPool;
svn_client_ctx_t *ctx = getContext(message);
if (ctx == NULL)
return;
+ ctx->commit_callback2 = CommitCallback::callback;
+ ctx->commit_baton = callback;
+
const apr_array_header_t *targets2 = targets.array(requestPool);
SVN_JNI_ERR(targets.error_occured(), );
@@ -592,7 +607,7 @@ jlong SVNClient::doSwitch(const char *pa
void SVNClient::doImport(const char *path, const char *url,
const char *message, svn_depth_t depth,
bool noIgnore, bool ignoreUnknownNodeTypes,
- RevpropTable &revprops)
+ RevpropTable &revprops, CommitCallback *callback)
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -606,6 +621,9 @@ void SVNClient::doImport(const char *pat
if (ctx == NULL)
return;
+ ctx->commit_callback2 = CommitCallback::callback;
+ ctx->commit_baton = callback;
+
SVN_JNI_ERR(svn_client_import4(intPath.c_str(), intUrl.c_str(), depth,
noIgnore, ignoreUnknownNodeTypes,
revprops.hash(requestPool), ctx,
@@ -914,7 +932,7 @@ void SVNClient::properties(const char *p
void SVNClient::propertySet(const char *path, const char *name,
const char *value, svn_depth_t depth,
StringArray &changelists, bool force,
- RevpropTable &revprops)
+ RevpropTable &revprops, CommitCallback *callback)
{
SVN::Pool requestPool;
SVN_JNI_NULL_PTR_EX(path, "path", );
@@ -933,6 +951,9 @@ void SVNClient::propertySet(const char *
if (ctx == NULL)
return;
+ ctx->commit_callback2 = CommitCallback::callback;
+ ctx->commit_baton = callback;
+
SVN_JNI_ERR(svn_client_propset4(name, val, intPath.c_str(),
depth, force, SVN_INVALID_REVNUM,
changelists.array(requestPool),
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=985339&r1=985338&r2=985339&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Fri Aug 13 20:09:35 2010
@@ -94,7 +94,7 @@ class SVNClient :public SVNBase
size_t bufSize);
void propertySet(const char *path, const char *name, const char *value,
svn_depth_t depth, StringArray &changelists, bool force,
- RevpropTable &revprops);
+ RevpropTable &revprops, CommitCallback *callback);
void properties(const char *path, Revision &revision,
Revision &pegRevision, svn_depth_t depth,
StringArray &changelists, ProplistCallback *callback);
@@ -117,7 +117,7 @@ class SVNClient :public SVNBase
const char *localPath, bool dryRun);
void doImport(const char *path, const char *url, const char *message,
svn_depth_t depth, bool noIgnore, bool ignoreUnknownNodeTypes,
- RevpropTable &revprops);
+ RevpropTable &revprops, CommitCallback *callback);
jlong doSwitch(const char *path, const char *url, Revision &revision,
Revision &pegRevision, svn_depth_t depth,
bool depthIsSticky, bool ignoreExternals,
@@ -130,13 +130,14 @@ class SVNClient :public SVNBase
svn_wc_conflict_choice_t choice);
void cleanup(const char *path);
void mkdir(Targets &targets, const char *message, bool makeParents,
- RevpropTable &revprops);
+ RevpropTable &revprops, CommitCallback *callback);
void move(Targets &srcPaths, const char *destPath,
const char *message, bool force, bool moveAsChild,
- bool makeParents, RevpropTable &revprops);
+ bool makeParents, RevpropTable &revprops, CommitCallback *callback);
void copy(CopySources ©Sources, const char *destPath,
const char *message, bool copyAsChild, bool makeParents,
- bool ignoreExternals, RevpropTable &revprops);
+ bool ignoreExternals, RevpropTable &revprops,
+ CommitCallback *callback);
void commit(Targets &targets, const char *message, svn_depth_t depth,
bool noUnlock, bool keepChangelist,
StringArray &changelists, RevpropTable &revprops,
@@ -148,7 +149,8 @@ class SVNClient :public SVNBase
bool add_parents);
void revert(const char *path, svn_depth_t depth, StringArray &changelists);
void remove(Targets &targets, const char *message, bool force,
- bool keep_local, RevpropTable &revprops);
+ bool keep_local, RevpropTable &revprops,
+ CommitCallback *callback);
void notification2(ClientNotifyCallback *notify2);
void setConflictResolver(ConflictResolverCallback *conflictResolver);
void setProgressListener(ProgressListener *progressListener);
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=985339&r1=985338&r2=985339&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 Fri Aug 13 20:09:35 2010
@@ -423,7 +423,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_remove
(JNIEnv *env, jobject jthis, jobject jtargets, jstring jmessage,
- jboolean jforce, jboolean keepLocal, jobject jrevpropTable)
+ jboolean jforce, jboolean keepLocal, jobject jrevpropTable, jobject jcallback)
{
JNIEntry(SVNClient, remove);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -442,8 +442,9 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
+ CommitCallback callback(jcallback);
cl->remove(targets, message, jforce ? true : false,
- keepLocal ? true : false, revprops);
+ keepLocal ? true : false, revprops, jcallback ? &callback : NULL);
}
JNIEXPORT void JNICALL
@@ -556,7 +557,7 @@ JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_copy
(JNIEnv *env, jobject jthis, jobject jcopySources, jstring jdestPath,
jstring jmessage, jboolean jcopyAsChild, jboolean jmakeParents,
- jboolean jignoreExternals, jobject jrevpropTable)
+ jboolean jignoreExternals, jobject jrevpropTable, jobject jcallback)
{
JNIEntry(SVNClient, copy);
@@ -586,16 +587,17 @@ JNIStringHolder message(jmessage);
if (JNIUtil::isExceptionThrown())
return;
+ CommitCallback callback(jcallback);
cl->copy(copySources, destPath, message, jcopyAsChild ? true : false,
jmakeParents ? true : false, jignoreExternals ? true : false,
- revprops);
+ revprops, jcallback ? &callback : NULL);
}
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_move
(JNIEnv *env, jobject jthis, jobject jsrcPaths, jstring jdestPath,
jstring jmessage, jboolean jforce, jboolean jmoveAsChild,
- jboolean jmakeParents, jobject jrevpropTable)
+ jboolean jmakeParents, jobject jrevpropTable, jobject jcallback)
{
JNIEntry(SVNClient, move);
@@ -620,15 +622,16 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
+ CommitCallback callback(jcallback);
cl->move(srcPaths, destPath, message, jforce ? true : false,
jmoveAsChild ? true : false, jmakeParents ? true : false,
- revprops);
+ revprops, jcallback ? &callback : NULL);
}
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_mkdir
(JNIEnv *env, jobject jthis, jobject jtargets, jstring jmessage,
- jboolean jmakeParents, jobject jrevpropTable)
+ jboolean jmakeParents, jobject jrevpropTable, jobject jcallback)
{
JNIEntry(SVNClient, mkdir);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -647,7 +650,9 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- cl->mkdir(targets, message, jmakeParents ? true : false, revprops);
+ CommitCallback callback(jcallback);
+ cl->mkdir(targets, message, jmakeParents ? true : false, revprops,
+ jcallback ? &callback : NULL);
}
JNIEXPORT void JNICALL
@@ -765,7 +770,7 @@ JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_doImport
(JNIEnv *env, jobject jthis, jstring jpath, jstring jurl, jstring jmessage,
jobject jdepth, jboolean jnoIgnore, jboolean jignoreUnknownNodeTypes,
- jobject jrevpropTable)
+ jobject jrevpropTable, jobject jcallback)
{
JNIEntry(SVNClient, doImport);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -790,9 +795,11 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
+ CommitCallback callback(jcallback);
cl->doImport(path, url, message, EnumMapper::toDepth(jdepth),
jnoIgnore ? true : false,
- jignoreUnknownNodeTypes ? true : false, revprops);
+ jignoreUnknownNodeTypes ? true : false, revprops,
+ jcallback ? &callback : NULL);
}
JNIEXPORT jobject JNICALL
@@ -974,7 +981,8 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_propertySet
(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jstring jvalue,
- jobject jdepth, jobject jchangelists, jboolean jforce, jobject jrevpropTable)
+ jobject jdepth, jobject jchangelists, jboolean jforce, jobject jrevpropTable,
+ jobject jcallback)
{
JNIEntry(SVNClient, propertySet);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -1003,8 +1011,9 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
+ CommitCallback callback(jcallback);
cl->propertySet(path, name, value, EnumMapper::toDepth(jdepth), changelists,
- jforce ? true:false, revprops);
+ jforce ? true:false, revprops, jcallback ? &callback : NULL);
}
JNIEXPORT jbyteArray JNICALL
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=985339&r1=985338&r2=985339&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 Fri Aug 13 20:09:35 2010
@@ -219,7 +219,8 @@ public interface ISVNClient
* @since 1.5
*/
void remove(Set<String> path, String message, boolean force,
- boolean keepLocal, Map<String, String> revpropTable)
+ boolean keepLocal, Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -311,7 +312,8 @@ public interface ISVNClient
*/
void copy(List<CopySource> sources, String destPath, String message,
boolean copyAsChild, boolean makeParents,
- boolean ignoreExternals, Map<String, String> revpropTable)
+ boolean ignoreExternals, Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -334,7 +336,7 @@ public interface ISVNClient
*/
void move(Set<String> srcPaths, String destPath, String message,
boolean force, boolean moveAsChild, boolean makeParents,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable, CommitCallback callback)
throws ClientException;
/**
@@ -350,7 +352,7 @@ public interface ISVNClient
* @since 1.5
*/
void mkdir(Set<String> path, String message, boolean makeParents,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable, CommitCallback callback)
throws ClientException;
/**
@@ -432,7 +434,7 @@ public interface ISVNClient
*/
void doImport(String path, String url, String message, Depth depth,
boolean noIgnore, boolean ignoreUnknownNodeTypes,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable, CommitCallback callback)
throws ClientException;
/**
@@ -683,7 +685,7 @@ public interface ISVNClient
*/
void propertySet(String path, String name, String value, Depth depth,
Collection<String> changelists, boolean force,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable, CommitCallback callback)
throws ClientException;
/**
@@ -696,7 +698,7 @@ public interface ISVNClient
* @since 1.5
*/
void propertyRemove(String path, String name, Depth depth,
- Collection<String> changelists)
+ Collection<String> changelists, CommitCallback callback)
throws ClientException;
/**
@@ -712,7 +714,8 @@ public interface ISVNClient
* @since 1.5
*/
void propertyCreate(String path, String name, String value, Depth depth,
- Collection<String> changelists, boolean force)
+ Collection<String> changelists, boolean force,
+ CommitCallback callback)
throws ClientException;
/**
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=985339&r1=985338&r2=985339&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 Fri Aug 13 20:09:35 2010
@@ -196,7 +196,8 @@ public class SVNClient implements ISVNCl
*/
public native void remove(Set<String> paths, String message, boolean force,
boolean keepLocal,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -238,7 +239,8 @@ public class SVNClient implements ISVNCl
public native void copy(List<CopySource> sources, String destPath,
String message, boolean copyAsChild,
boolean makeParents, boolean ignoreExternals,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -247,7 +249,8 @@ public class SVNClient implements ISVNCl
public native void move(Set<String> srcPaths, String destPath,
String message, boolean force, boolean moveAsChild,
boolean makeParents,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -255,7 +258,8 @@ public class SVNClient implements ISVNCl
*/
public native void mkdir(Set<String> paths, String message,
boolean makeParents,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -295,7 +299,8 @@ public class SVNClient implements ISVNCl
public native void doImport(String path, String url, String message,
Depth depth, boolean noIgnore,
boolean ignoreUnknownNodeTypes,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
@@ -407,17 +412,20 @@ public class SVNClient implements ISVNCl
public native void propertySet(String path, String name, String value,
Depth depth, Collection<String> changelists,
boolean force,
- Map<String, String> revpropTable)
+ Map<String, String> revpropTable,
+ CommitCallback callback)
throws ClientException;
/**
* @since 1.5
*/
public void propertyRemove(String path, String name, Depth depth,
- Collection<String> changelists)
+ Collection<String> changelists,
+ CommitCallback callback)
throws ClientException
{
- propertySet(path, name, null, depth, changelists, false, null);
+ propertySet(path, name, null, depth, changelists, false, null,
+ callback);
}
/**
@@ -425,10 +433,11 @@ public class SVNClient implements ISVNCl
*/
public void propertyCreate(String path, String name, String value,
Depth depth, Collection<String> changelists,
- boolean force)
+ boolean force, CommitCallback callback)
throws ClientException
{
- propertySet(path, name, value, depth, changelists, force, null);
+ propertySet(path, name, value, depth, changelists, force, null,
+ callback);
}
/**
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=985339&r1=985338&r2=985339&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 Fri Aug 13 20:09:35 2010
@@ -766,7 +766,8 @@ public class SVNClient implements SVNCli
try
{
aSVNClient.remove(new HashSet<String>(Arrays.asList(paths)),
- message, force, keepLocal, revpropTable);
+ message, force, keepLocal, revpropTable,
+ null);
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -973,7 +974,7 @@ public class SVNClient implements SVNCli
}
aSVNClient.copy(aCopySources, destPath, message, copyAsChild,
- makeParents, ignoreExternals, revpropTable);
+ makeParents, ignoreExternals, revpropTable, null);
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -1021,7 +1022,7 @@ public class SVNClient implements SVNCli
{
aSVNClient.move(new HashSet<String>(Arrays.asList(srcPaths)),
destPath, message, force, moveAsChild,
- makeParents, revpropTable);
+ makeParents, revpropTable, null);
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -1065,7 +1066,7 @@ public class SVNClient implements SVNCli
try
{
aSVNClient.mkdir(new HashSet<String>(Arrays.asList(paths)),
- message, makeParents, revpropTable);
+ message, makeParents, revpropTable, null);
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -1246,7 +1247,8 @@ public class SVNClient implements SVNCli
try
{
aSVNClient.doImport(path, url, message, Depth.toADepth(depth),
- noIgnore, ignoreUnknownNodeTypes, revpropTable);
+ noIgnore, ignoreUnknownNodeTypes, revpropTable,
+ null);
}
catch (org.apache.subversion.javahl.ClientException ex)
{
@@ -1827,7 +1829,7 @@ public class SVNClient implements SVNCli
aSVNClient.propertySet(path, name, value, Depth.toADepth(depth),
changelists == null ? null
: Arrays.asList(changelists),
- force, revpropTable);
+ force, revpropTable, null);
}
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=985339&r1=985338&r2=985339&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 Fri Aug 13 20:09:35 2010
@@ -252,7 +252,7 @@ public class BasicTests extends SVNTests
// ----- r3: delete file A/D/G/pi ---------------------------
client.remove(thisTest.getWCPathSet("/A/D/G/pi"), null,
- false, false, null);
+ false, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(),
"A/D/G/pi", NodeKind.file,
CommitItemStateFlags.Delete);
@@ -295,7 +295,7 @@ public class BasicTests extends SVNTests
// ----- r5: delete dir with no children A/C ---------------
client.remove(thisTest.getWCPathSet("/A/C"), null,
- false, false, null);
+ false, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(),
"A/C", NodeKind.dir,
CommitItemStateFlags.Delete);
@@ -333,7 +333,7 @@ public class BasicTests extends SVNTests
Depth.unknown, false, false, false)[0], rev);
thisTest.checkStatus();
client.propertySet(thisTest.getWCPath(), "propname", "propval",
- Depth.empty, null, false, null);
+ Depth.empty, null, false, null, null);
thisTest.getWc().setItemPropStatus("", Status.Kind.modified);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(), null,
NodeKind.dir, CommitItemStateFlags.PropMods);
@@ -369,7 +369,7 @@ public class BasicTests extends SVNTests
// ----- r9: Prop change on A/B/F ---------------------------
client.propertySet(thisTest.getWCPath() + "/A/B/F", "propname",
- "propval", Depth.empty, null, false, null);
+ "propval", Depth.empty, null, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(),
"A/B/F", NodeKind.dir,
CommitItemStateFlags.PropMods);
@@ -389,7 +389,7 @@ public class BasicTests extends SVNTests
// ----- r10-11: Replace file A/D/H/chi with file -----------
client.remove(thisTest.getWCPathSet("/A/D/H/chi"),
- null, false, false, null);
+ null, false, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(),
"A/D/H/chi", NodeKind.file,
CommitItemStateFlags.Delete);
@@ -424,7 +424,7 @@ public class BasicTests extends SVNTests
// ----- r12: Delete dir A/B/E with children ----------------
client.remove(thisTest.getWCPathSet("/A/B/E"), null,
- false, false, null);
+ false, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(),
"A/B/E", NodeKind.dir,
CommitItemStateFlags.Delete);
@@ -450,7 +450,7 @@ public class BasicTests extends SVNTests
// ----- r13-14: Replace file A/D/H/psi with dir ------------
client.remove(thisTest.getWCPathSet("/A/D/H/psi"), null,
- false, false, null);
+ false, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(), thisTest.getUrl(),
"A/D/H/psi", NodeKind.file,
CommitItemStateFlags.Delete);
@@ -599,7 +599,7 @@ public class BasicTests extends SVNTests
// remove A/D/G
client.remove(thisTest.getWCPathSet("/A/D/G"), null,
- false, false, null);
+ false, false, null, null);
thisTest.getWc().setItemTextStatus("A/D/G", Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/G/pi", Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/G/rho", Status.Kind.deleted);
@@ -678,7 +678,7 @@ public class BasicTests extends SVNTests
false);
client.propertySet(itemPath, "abc", "def", Depth.empty, null, false,
- null);
+ null, null);
Map<String, byte[]> properties = collectProperties(itemPath, null,
null, Depth.empty, null);
@@ -692,7 +692,7 @@ public class BasicTests extends SVNTests
"/A/B/E/alpha"),
false);
client.propertyCreate(itemPath, "cqcq", "qrz", Depth.empty, null,
- false);
+ false, null);
final Map<String, Map<String, byte[]>> propMaps =
new HashMap<String, Map<String, byte[]>>();
@@ -794,7 +794,7 @@ public class BasicTests extends SVNTests
Set<String> urls = new HashSet<String>(2);
urls.add(thisTest.getUrl() + "/Y");
urls.add(thisTest.getUrl() + "/Y/Z");
- client.mkdir(urls, "log_msg", false, null);
+ client.mkdir(urls, "log_msg", false, null, null);
// add the new directories the expected working copy layout
thisTest.getWc().addItem("Y", null);
@@ -844,7 +844,7 @@ public class BasicTests extends SVNTests
}
client.copy(sources,
new File(thisTest.getWorkingCopy(), "A/B/F").getPath(),
- null, true, false, false, null);
+ null, true, false, false, null, null);
// Commit the changes, and check the state of the WC.
checkCommitRevision(thisTest,
@@ -863,7 +863,7 @@ public class BasicTests extends SVNTests
client.commitMessageHandler(null);
client.copy(wcSource,
thisTest.getUrl() + "/parent/A/B",
- "Copy WC to URL", true, true, false, null);
+ "Copy WC to URL", true, true, false, null, null);
// update the WC to get new folder and confirm the copy
assertEquals("wrong revision number from update",
@@ -907,7 +907,7 @@ public class BasicTests extends SVNTests
}
client.move(srcPaths,
new File(thisTest.getWorkingCopy(), "A/B/F").getPath(),
- null, false, true, false, null);
+ null, false, true, false, null, null);
// Commit the changes, and check the state of the WC.
checkCommitRevision(thisTest,
@@ -1320,7 +1320,7 @@ public class BasicTests extends SVNTests
thisTest.checkStatus();
// create & add the directory X
- client.mkdir(thisTest.getWCPathSet("/X"), null, false, null);
+ client.mkdir(thisTest.getWCPathSet("/X"), null, false, null, null);
thisTest.getWc().addItem("X", null);
thisTest.getWc().setItemTextStatus("X", Status.Kind.added);
@@ -1337,7 +1337,7 @@ public class BasicTests extends SVNTests
// delete the directory A/B/E
client.remove(thisTest.getWCPathSet("/A/B/E"), null, true,
- false, null);
+ false, null, null);
removeDirOrFile(new File(thisTest.getWorkingCopy(), "A/B/E"));
thisTest.getWc().setItemTextStatus("A/B/E", Status.Kind.deleted);
thisTest.getWc().removeItem("A/B/E/alpha");
@@ -1413,12 +1413,12 @@ public class BasicTests extends SVNTests
// set a property on A/D/G/rho file
client.propertySet(thisTest.getWCPath()+"/A/D/G/rho", "abc", "def",
- Depth.infinity, null, false, null);
+ Depth.infinity, null, false, null, null);
thisTest.getWc().setItemPropStatus("A/D/G/rho", Status.Kind.modified);
// set a property on A/B/F directory
client.propertySet(thisTest.getWCPath()+"/A/B/F", "abc", "def",
- Depth.empty, null, false, null);
+ Depth.empty, null, false, null, null);
thisTest.getWc().setItemPropStatus("A/B/F", Status.Kind.modified);
// create a unversioned A/C/sigma file
@@ -1441,7 +1441,7 @@ public class BasicTests extends SVNTests
file = new File(thisTest.getWCPath(), "A/B/X");
pathSet.clear();
pathSet.add(file.getAbsolutePath());
- client.mkdir(pathSet, null, false, null);
+ client.mkdir(pathSet, null, false, null, null);
thisTest.getWc().addItem("A/B/X", null);
thisTest.getWc().setItemTextStatus("A/B/X", Status.Kind.added);
@@ -1458,7 +1458,7 @@ public class BasicTests extends SVNTests
file = new File(thisTest.getWCPath(), "A/B/Y");
pathSet.clear();
pathSet.add(file.getAbsolutePath());
- client.mkdir(pathSet, null, false, null);
+ client.mkdir(pathSet, null, false, null, null);
thisTest.getWc().addItem("A/B/Y", null);
thisTest.getWc().setItemTextStatus("A/B/Y", Status.Kind.added);
@@ -1472,7 +1472,7 @@ public class BasicTests extends SVNTests
// remove of A/D/H/chi without force should fail, because it is
// modified
client.remove(thisTest.getWCPathSet("/A/D/H/chi"),
- null, false, false, null);
+ null, false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1484,7 +1484,7 @@ public class BasicTests extends SVNTests
// remove of A/D/H without force should fail, because A/D/H/chi is
// modified
client.remove(thisTest.getWCPathSet("/A/D/H"), null,
- false, false, null);
+ false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1496,7 +1496,7 @@ public class BasicTests extends SVNTests
// remove of A/D/G/rho without force should fail, because it has
// a new property
client.remove(thisTest.getWCPathSet("/A/D/G/rho"),
- null, false, false, null);
+ null, false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1508,7 +1508,7 @@ public class BasicTests extends SVNTests
// remove of A/D/G without force should fail, because A/D/G/rho has
// a new property
client.remove(thisTest.getWCPathSet("/A/D/G"), null,
- false, false, null);
+ false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1520,7 +1520,7 @@ public class BasicTests extends SVNTests
// remove of A/B/F without force should fail, because it has
// a new property
client.remove(thisTest.getWCPathSet("/A/B/F"), null,
- false, false, null);
+ false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1532,7 +1532,7 @@ public class BasicTests extends SVNTests
// remove of A/B without force should fail, because A/B/F has
// a new property
client.remove(thisTest.getWCPathSet("/A/B"), null,
- false, false, null);
+ false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1544,7 +1544,7 @@ public class BasicTests extends SVNTests
// remove of A/C/sigma without force should fail, because it is
// unversioned
client.remove(thisTest.getWCPathSet("/A/C/sigma"),
- null, false, false, null);
+ null, false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1556,7 +1556,7 @@ public class BasicTests extends SVNTests
// remove of A/C without force should fail, because A/C/sigma is
// unversioned
client.remove(thisTest.getWCPathSet("/A/C"), null,
- false, false, null);
+ false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1567,7 +1567,7 @@ public class BasicTests extends SVNTests
{
// remove of A/B/X without force should fail, because it is new
client.remove(thisTest.getWCPathSet("/A/B/X"), null,
- false, false, null);
+ false, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1579,56 +1579,56 @@ public class BasicTests extends SVNTests
// the following removes should all work
client.remove(thisTest.getWCPathSet("/A/B/E"), null,
- false, false, null);
+ false, false, null, null);
thisTest.getWc().setItemTextStatus("A/B/E",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/B/E/alpha",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/B/E/beta",Status.Kind.deleted);
client.remove(thisTest.getWCPathSet("/A/D/H"), null, true,
- false, null);
+ false, null, null);
thisTest.getWc().setItemTextStatus("A/D/H",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/H/chi",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/H/omega",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/H/psi",Status.Kind.deleted);
client.remove(thisTest.getWCPathSet("/A/D/G"), null, true,
- false, null);
+ false, null, null);
thisTest.getWc().setItemTextStatus("A/D/G",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/G/rho",Status.Kind.deleted);
thisTest.getWc().setItemPropStatus("A/D/G/rho", Status.Kind.none);
thisTest.getWc().setItemTextStatus("A/D/G/pi",Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/G/tau",Status.Kind.deleted);
client.remove(thisTest.getWCPathSet("/A/B/F"), null, true,
- false, null);
+ false, null, null);
thisTest.getWc().setItemTextStatus("A/B/F",Status.Kind.deleted);
thisTest.getWc().setItemPropStatus("A/B/F", Status.Kind.none);
client.remove(thisTest.getWCPathSet("/A/C"), null, true,
- false, null);
+ false, null, null);
thisTest.getWc().setItemTextStatus("A/C",Status.Kind.deleted);
client.remove(thisTest.getWCPathSet("/A/B/X"), null, true,
- false, null);
+ false, null, null);
file = new File(thisTest.getWorkingCopy(), "iota");
file.delete();
pathSet.clear();
pathSet.add(file.getAbsolutePath());
- client.remove(pathSet, null, true, false, null);
+ client.remove(pathSet, null, true, false, null, null);
thisTest.getWc().setItemTextStatus("iota",Status.Kind.deleted);
file = new File(thisTest.getWorkingCopy(), "A/D/gamma");
file.delete();
pathSet.clear();
pathSet.add(file.getAbsolutePath());
- client.remove(pathSet, null, false, false, null);
+ client.remove(pathSet, null, false, false, null, null);
thisTest.getWc().setItemTextStatus("A/D/gamma",Status.Kind.deleted);
pathSet.clear();
pathSet.add(file.getAbsolutePath());
- client.remove(pathSet, null, true, false, null);
+ client.remove(pathSet, null, true, false, null, null);
client.remove(thisTest.getWCPathSet("/A/B/E"), null,
- false, false, null);
+ false, false, null, null);
thisTest.getWc().removeItem("A/B/X");
thisTest.getWc().removeItem("A/B/X/xi");
thisTest.getWc().removeItem("A/C/sigma");
thisTest.getWc().removeItem("A/C/Q");
thisTest.checkStatus();
client.remove(thisTest.getWCPathSet("/A/D"),null, true,
- false, null);
+ false, null, null);
thisTest.getWc().setItemTextStatus("A/D", Status.Kind.deleted);
thisTest.getWc().removeItem("A/D/Y");
@@ -1659,7 +1659,7 @@ public class BasicTests extends SVNTests
pw.close();
pathSet.clear();
pathSet.add(file.getAbsolutePath());
- client.remove(pathSet, null, true, false, null);
+ client.remove(pathSet, null, true, false, null, null);
assertFalse("failed to remove unversioned file foo", file.exists());
try
@@ -1667,7 +1667,7 @@ public class BasicTests extends SVNTests
// delete non-existant file foo
Set<String> paths = new HashSet<String>(1);
paths.add(file.getAbsolutePath());
- client.remove(paths, null, true, false, null);
+ client.remove(paths, null, true, false, null, null);
fail("missing exception");
}
catch(ClientException expected)
@@ -1678,7 +1678,7 @@ public class BasicTests extends SVNTests
addExpectedCommitItem(null, thisTest.getUrl(), "iota", NodeKind.none,
CommitItemStateFlags.Delete);
client.remove(thisTest.getUrlSet("/iota"),
- "delete iota URL", false, false, null);
+ "delete iota URL", false, false, null, null);
}
public void testBasicCheckoutDeleted() throws Throwable
@@ -1688,7 +1688,7 @@ public class BasicTests extends SVNTests
// delete A/D and its content
client.remove(thisTest.getWCPathSet("/A/D"), null, true,
- false, null);
+ false, null, null);
thisTest.getWc().setItemTextStatus("A/D", Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/G", Status.Kind.deleted);
thisTest.getWc().setItemTextStatus("A/D/G/rho", Status.Kind.deleted);
@@ -1743,7 +1743,7 @@ public class BasicTests extends SVNTests
gammaSet.add(thisTest.getWCPath() + "/A/D/gamma");
// remove A/D/gamma
- client.remove(gammaSet, null, false, false, null);
+ client.remove(gammaSet, null, false, false, null, null);
thisTest.getWc().setItemTextStatus("A/D/gamma", Status.Kind.deleted);
// check the working copy status
@@ -1753,7 +1753,7 @@ public class BasicTests extends SVNTests
{
// creating a directory in the place of the deleted file should
// fail
- client.mkdir(gammaSet, null, false, null);
+ client.mkdir(gammaSet, null, false, null, null);
fail("can change node kind");
}
catch(ClientException e)
@@ -1780,7 +1780,7 @@ public class BasicTests extends SVNTests
{
// creating a directory in the place of the deleted file should
// still fail
- client.mkdir(gammaSet, null, false, null);
+ client.mkdir(gammaSet, null, false, null, null);
fail("can change node kind");
}
catch(ClientException e)
@@ -1799,7 +1799,7 @@ public class BasicTests extends SVNTests
thisTest.checkStatus();
// now creating the directory should succeed
- client.mkdir(gammaSet, null, false, null);
+ client.mkdir(gammaSet, null, false, null, null);
thisTest.getWc().addItem("A/D/gamma", null);
thisTest.getWc().setItemTextStatus("A/D/gamma", Status.Kind.added);
@@ -1828,7 +1828,7 @@ public class BasicTests extends SVNTests
client.doImport(file.getAbsolutePath(),
thisTest.getUrl()+"/dirA/dirB/new_file",
"log message for new import", Depth.infinity,
- false, false, null);
+ false, false, null, null);
// delete new_file
file.delete();
@@ -1994,7 +1994,7 @@ public class BasicTests extends SVNTests
null, "dir", NodeKind.none, CommitItemStateFlags.Add);
client.doImport(dir.getAbsolutePath(), thisTest.getUrl()+"/dir",
"log message for import", Depth.infinity,
- false, false, null);
+ false, false, null, null);
// remove dir
removeDirOrFile(dir);
@@ -2100,7 +2100,7 @@ public class BasicTests extends SVNTests
client.propertySet(thisTest.getWCPath()+"/A/mu",
Property.NEEDS_LOCK, "*", Depth.empty,
- null, false, null);
+ null, false, null, null);
addExpectedCommitItem(thisTest.getWCPath(),
thisTest.getUrl(), "A/mu",NodeKind.file,
@@ -2676,7 +2676,7 @@ public class BasicTests extends SVNTests
NodeKind.none, CommitItemStateFlags.Add);
Set<String> paths = new HashSet<String>(1);
paths.add(thisTest.getUrl() + "/branches");
- client.mkdir(paths, "log_msg", false, null);
+ client.mkdir(paths, "log_msg", false, null, null);
// copy A to branches (r3)
addExpectedCommitItem(null, thisTest.getUrl(), "branches/A",
@@ -2685,7 +2685,7 @@ public class BasicTests extends SVNTests
srcs.add(new CopySource(thisTest.getUrl() + "/A", Revision.HEAD,
Revision.HEAD));
client.copy(srcs, thisTest.getUrl() + "/branches/A",
- "create A branch", true, false, false, null);
+ "create A branch", true, false, false, null, null);
// update the WC (to r3) so that it has the branches folder
client.update(thisTest.getWCPathSet(), Revision.HEAD,
@@ -2825,7 +2825,7 @@ public class BasicTests extends SVNTests
"+Test property value." + NL;
client.propertySet(aPath, "testprop", "Test property value.",
- Depth.empty, null, false, null);
+ Depth.empty, null, false, null, null);
client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, wcPath,
diffOutput.getPath(), Depth.infinity, null, true, true,
false, false);
@@ -2844,7 +2844,7 @@ public class BasicTests extends SVNTests
"+Test property value." + NL;
client.propertySet(aPath, "testprop", "Test property value.",
- Depth.empty, null, false, null);
+ Depth.empty, null, false, null, null);
client.diff(aPath, Revision.BASE, aPath, Revision.WORKING, aPath,
diffOutput.getPath(), Depth.infinity, null, true, true,
false, false);
@@ -2872,7 +2872,7 @@ public class BasicTests extends SVNTests
if (operativeRevision == 2) {
// Set svn:eol-style=native on iota
client.propertyCreate(iotaPath, "svn:eol-style", "native",
- Depth.empty, null, false);
+ Depth.empty, null, false, null);
Set<String> paths = new HashSet<String>(1);
paths.add(iotaPath);
addExpectedCommitItem(thisTest.getWCPath(),
@@ -3149,7 +3149,7 @@ public class BasicTests extends SVNTests
}
client.move(srcPaths,
new File(thisTest.getWorkingCopy(), "A/B/F").getPath(),
- null, false, true, false, null);
+ null, false, true, false, null, null);
// Commit the changes, and check the state of the WC.
checkCommitRevision(thisTest,
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=985339&r1=985338&r2=985339&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Fri Aug 13 20:09:35 2010
@@ -237,7 +237,7 @@ class SVNTests extends TestCase
addExpectedCommitItem(greekFiles.getAbsolutePath(), null, null,
NodeKind.none, CommitItemStateFlags.Add);
client.doImport(greekFiles.getAbsolutePath(), makeReposUrl(greekRepos),
- null, Depth.infinity, false, false, null);
+ null, Depth.infinity, false, false, null, null);
admin.dump(greekRepos, new FileOutputStream(greekDump),
null, null, false, false, null);
}