You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/03/12 16:54:43 UTC
svn commit: r1455589 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/
Author: brane
Date: Tue Mar 12 15:54:43 2013
New Revision: 1455589
URL: http://svn.apache.org/r1455589
Log:
Working on isue #4326 (update javahl with new 1.8 APIs).
Update ISVNCLient.add to expose the no_autoprops option.
[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* ISVNClient.java (ISVNClient.add): Add new overload for this method
with noAutoProps parameter. Update docstring on old version.
* SVNClient.java (SVNClient.add): Native method grows the noAutoProps parameter.
Implement the old interface as a wrapper around the new interface.
[in subversion/bindings/javahl/native]
* SVNClient.h (SVNClient.add): Add no_autoprops parameter to prototype.
* SVNClient.cpp (SVNCLient.add): Update implementation and call
svn_client_add5 instead of svn_client_add4.
* org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_add): Update native 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
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp?rev=1455589&r1=1455588&r2=1455589&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue Mar 12 15:54:43 2013
@@ -352,7 +352,8 @@ void SVNClient::revert(const char *path,
}
void SVNClient::add(const char *path,
- svn_depth_t depth, bool force, bool no_ignore,
+ svn_depth_t depth, bool force,
+ bool no_ignore, bool no_autoprops,
bool add_parents)
{
SVN::Pool subPool(pool);
@@ -365,8 +366,8 @@ void SVNClient::add(const char *path,
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_add4(intPath.c_str(), depth, force,
- no_ignore, add_parents, ctx,
+ SVN_JNI_ERR(svn_client_add5(intPath.c_str(), depth, force,
+ no_ignore, no_autoprops, add_parents, 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=1455589&r1=1455588&r2=1455589&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Mar 12 15:54:43 2013
@@ -137,8 +137,8 @@ class SVNClient :public SVNBase
jlongArray update(Targets &targets, Revision &revision, svn_depth_t depth,
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);
+ void add(const char *path, svn_depth_t depth, bool force,
+ bool no_ignore, bool no_autoprops, bool add_parents);
void revert(const char *path, svn_depth_t depth, StringArray &changelists);
void remove(Targets &targets, CommitMessage *message, bool force,
bool keep_local, RevpropTable &revprops,
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=1455589&r1=1455588&r2=1455589&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 Mar 12 15:54:43 2013
@@ -418,7 +418,8 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_add
(JNIEnv *env, jobject jthis, jstring jpath, jobject jdepth,
- jboolean jforce, jboolean jnoIgnore, jboolean jaddParents)
+ jboolean jforce, jboolean jnoIgnore, jboolean jnoAutoProps,
+ jboolean jaddParents)
{
JNIEntry(SVNClient, add);
SVNClient *cl = SVNClient::getCppObject(jthis);
@@ -431,8 +432,11 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- cl->add(path, EnumMapper::toDepth(jdepth), jforce ? true : false,
- jnoIgnore ? true : false, jaddParents ? true : false);
+ cl->add(path, EnumMapper::toDepth(jdepth),
+ jforce ? true : false,
+ jnoIgnore ? true : false,
+ jnoAutoProps ? true : false,
+ jaddParents ? true : false);
}
JNIEXPORT jlongArray 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=1455589&r1=1455588&r2=1455589&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 Mar 12 15:54:43 2013
@@ -229,12 +229,30 @@ public interface ISVNClient
* ignore patterns
* @param addParents add any intermediate parents to the working copy
* @throws ClientException
+ * @note this method behaves like the 1.8 version with noAutoProps=false
*/
void add(String path, Depth depth, boolean force, boolean noIgnores,
boolean addParents)
throws ClientException;
/**
+ * Adds a file to the repository.
+ * @param path path to be added.
+ * @param depth the depth to recurse into subdirectories
+ * @param force if adding a directory and recurse true and path is a
+ * directory, all not already managed files are added.
+ * @param noIgnores if false, don't add files or directories matching
+ * ignore patterns
+ * @param noAutoProps if true, ignore any auto-props configuration
+ * @param addParents add any intermediate parents to the working copy
+ * @throws ClientException
+ * @since 1.8
+ */
+ void add(String path, Depth depth, boolean force,
+ boolean noIgnores, boolean noAutoProps, boolean addParents)
+ throws ClientException;
+
+ /**
* Updates the directories or files from repository
* @param path array of target files.
* @param revision the revision number to update.
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=1455589&r1=1455588&r2=1455589&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 Mar 12 15:54:43 2013
@@ -172,9 +172,17 @@ public class SVNClient implements ISVNCl
throws ClientException;
public native void add(String path, Depth depth, boolean force,
- boolean noIgnores, boolean addParents)
+ boolean noIgnores, boolean noAutoProps,
+ boolean addParents)
throws ClientException;
+ public void add(String path, Depth depth, boolean force,
+ boolean noIgnores, boolean addParents)
+ throws ClientException
+ {
+ add(path, depth, force, noIgnores, false, addParents);
+ }
+
public native long[] update(Set<String> paths, Revision revision,
Depth depth, boolean depthIsSticky,
boolean makeParents,