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 2011/08/16 22:34:28 UTC
svn commit: r1158436 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
Author: hwright
Date: Tue Aug 16 20:34:27 2011
New Revision: 1158436
URL: http://svn.apache.org/viewvc?rev=1158436&view=rev
Log:
JavaHL: Add a base_rev parameter to the remote prop set API, as required by
the underlying C API.
[ in subversion/bindings/javahl/ ]
* native/SVNClient.h
(propertySetRemote): Add a base_rev param.
* native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_propertySetRemote):
Add a base_rev param, and pass it down the stack.
* native/SVNClient.cpp
(propertySetRemote): Add and use the base_rev param.
* src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/ISVNClient.java
(propertySetRemote): Add a base_rev API.
* src/org/tigris/subversion/javahl/SVNClient.java
(propertySet): Fake a valid revision number for the backward compat 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
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1158436&r1=1158435&r2=1158436&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue Aug 16 20:34:27 2011
@@ -898,7 +898,8 @@ void SVNClient::propertySetLocal(Targets
ctx, subPool.getPool()), );
}
-void SVNClient::propertySetRemote(const char *path, const char *name,
+void SVNClient::propertySetRemote(const char *path, long base_rev,
+ const char *name,
CommitMessage *message,
JNIByteArray &value, bool force,
RevpropTable &revprops,
@@ -922,7 +923,7 @@ void SVNClient::propertySetRemote(const
return;
SVN_JNI_ERR(svn_client_propset_remote(name, val, intPath.c_str(),
- force, SVN_INVALID_REVNUM,
+ force, base_rev,
revprops.hash(subPool),
CommitCallback::callback, callback,
ctx, subPool.getPool()), );
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1158436&r1=1158435&r2=1158436&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Aug 16 20:34:27 2011
@@ -81,7 +81,7 @@ class SVNClient :public SVNBase
void propertySetLocal(Targets &targets, const char *name, JNIByteArray &value,
svn_depth_t depth, StringArray &changelists,
bool force);
- void propertySetRemote(const char *path, const char *name,
+ void propertySetRemote(const char *path, long base_rev, const char *name,
CommitMessage *message,
JNIByteArray &value, bool force,
RevpropTable &revprops, CommitCallback *callback);
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=1158436&r1=1158435&r2=1158436&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 Tue Aug 16 20:34:27 2011
@@ -922,8 +922,9 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_propertySetRemote
-(JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jbyteArray jvalue,
- jobject jmessage, jboolean jforce, jobject jrevpropTable, jobject jcallback)
+(JNIEnv *env, jobject jthis, jstring jpath, jlong jbaseRev, jstring jname,
+ jbyteArray jvalue, jobject jmessage, jboolean jforce, jobject jrevpropTable,
+ jobject jcallback)
{
JNIEntry(SVNClient, propertySet);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -953,7 +954,8 @@ Java_org_apache_subversion_javahl_SVNCli
return;
CommitCallback callback(jcallback);
- cl->propertySetRemote(path, name, &message, value, jforce ? true:false,
+ cl->propertySetRemote(path, jbaseRev, name, &message, value,
+ jforce ? true:false,
revprops, jcallback ? &callback : NULL);
}
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=1158436&r1=1158435&r2=1158436&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 Tue Aug 16 20:34:27 2011
@@ -649,8 +649,8 @@ public interface ISVNClient
boolean force)
throws ClientException;
- void propertySetRemote(String path, String name, byte[] value,
- CommitMessageCallback handler,
+ void propertySetRemote(String path, long baseRev, String name,
+ byte[] value, CommitMessageCallback handler,
boolean force, Map<String, String> revpropTable,
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=1158436&r1=1158435&r2=1158436&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 Tue Aug 16 20:34:27 2011
@@ -307,7 +307,8 @@ public class SVNClient implements ISVNCl
boolean force)
throws ClientException;
- public native void propertySetRemote(String path, String name, byte[] value,
+ public native void propertySetRemote(String path, long baseRev,
+ String name, byte[] value,
CommitMessageCallback handler,
boolean force,
Map<String, String> revpropTable,
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=1158436&r1=1158435&r2=1158436&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 Tue Aug 16 20:34:27 2011
@@ -1878,7 +1878,10 @@ public class SVNClient implements SVNCli
{
if (Path.isURL(path))
{
- aSVNClient.propertySetRemote(path, name,
+ Info2[] infos = info2(path, Revision.HEAD, Revision.HEAD,
+ false);
+
+ aSVNClient.propertySetRemote(path, infos[0].getRev(), name,
value == null ? null : value.getBytes(),
cachedHandler,
force, revpropTable, null);