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 18:28:43 UTC
svn commit: r1455638 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/
src/org/apache/subversion/javahl/callback/
Author: brane
Date: Tue Mar 12 17:28:43 2013
New Revision: 1455638
URL: http://svn.apache.org/r1455638
Log:
Working on isue #4326 (update javahl with new 1.8 APIs).
Add the no_autoprops option to SVNClient.doImport.
[in subversion/bindings/javahl/src/org/apache/subversion/javahl]
* ISVNClient.java (ISVNClient.doImport): Add the noAutoProps parameter
to the 1.8 overload of this method, and add a docstring.
Update the docstring of the older overload.
* SVNClient.java (SVNClient.doImport): Update the older overloaded
wrapper for the native method, update the native method declaration.
* callback/ImportFilterCallback.java (ImportFilterCallback):
Note in the docstring that this class is new in 1.8.
[in subversion/bindings/javahl/native]
* SVNClient.h, SVNCient.cpp (SVNClient.doImport): Add noAutoProps parameter.
* org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_doImport): Update native method.
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/apache/subversion/javahl/callback/ImportFilterCallback.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=1455638&r1=1455637&r2=1455638&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.cpp Tue Mar 12 17:28:43 2013
@@ -606,7 +606,8 @@ jlong SVNClient::doSwitch(const char *pa
void SVNClient::doImport(const char *path, const char *url,
CommitMessage *message, svn_depth_t depth,
- bool noIgnore, bool ignoreUnknownNodeTypes,
+ bool noIgnore, bool noAutoProps,
+ bool ignoreUnknownNodeTypes,
RevpropTable &revprops,
ImportFilterCallback *ifCallback,
CommitCallback *commitCallback)
@@ -624,7 +625,7 @@ void SVNClient::doImport(const char *pat
return;
SVN_JNI_ERR(svn_client_import5(intPath.c_str(), intUrl.c_str(), depth,
- noIgnore, FALSE, ignoreUnknownNodeTypes,
+ noIgnore, noAutoProps, ignoreUnknownNodeTypes,
revprops.hash(subPool),
ImportFilterCallback::callback, ifCallback,
CommitCallback::callback, commitCallback,
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNClient.h?rev=1455638&r1=1455637&r2=1455638&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNClient.h Tue Mar 12 17:28:43 2013
@@ -107,7 +107,8 @@ class SVNClient :public SVNBase
void mergeReintegrate(const char *path, Revision &pegRevision,
const char *localPath, bool dryRun);
void doImport(const char *path, const char *url, CommitMessage *message,
- svn_depth_t depth, bool noIgnore, bool ignoreUnknownNodeTypes,
+ svn_depth_t depth, bool noIgnore, bool noAutoProps,
+ bool ignoreUnknownNodeTypes,
RevpropTable &revprops, ImportFilterCallback *ifCallback,
CommitCallback *commitCallback);
jlong doSwitch(const char *path, const char *url, Revision &revision,
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=1455638&r1=1455637&r2=1455638&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 17:28:43 2013
@@ -734,7 +734,8 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_doImport
(JNIEnv *env, jobject jthis, jstring jpath, jstring jurl, jobject jdepth,
- jboolean jnoIgnore, jboolean jignoreUnknownNodeTypes, jobject jrevpropTable,
+ jboolean jnoIgnore, jboolean jnoAutoProps,
+ jboolean jignoreUnknownNodeTypes, jobject jrevpropTable,
jobject jimportFilterCallback, jobject jmessage, jobject jcommitCallback)
{
JNIEntry(SVNClient, doImport);
@@ -764,7 +765,7 @@ Java_org_apache_subversion_javahl_SVNCli
CommitCallback commitCallback(jcommitCallback);
cl->doImport(path, url, &message, EnumMapper::toDepth(jdepth),
- jnoIgnore ? true : false,
+ jnoIgnore ? true : false, jnoAutoProps ? true : false,
jignoreUnknownNodeTypes ? true : false, revprops,
jimportFilterCallback ? &importFilterCallback : NULL,
jcommitCallback ? &commitCallback : 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=1455638&r1=1455637&r2=1455638&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 17:28:43 2013
@@ -419,22 +419,45 @@ public interface ISVNClient
* @param url the target url
* @param depth depth to traverse into subdirectories
* @param noIgnore whether to add files matched by ignore patterns
+ * @param noAutoProps if true, ignore any auto-props configuration
* @param ignoreUnknownNodeTypes whether to ignore files which
* the node type is not konwn, just as pipes
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
- * @param handler the commit message callback
+ * @param messageHandler the commit message callback
+ * @param commitCallback the commit status callback
* @throws ClientException
- *
+ * @since 1.8
*/
void doImport(String path, String url, Depth depth,
- boolean noIgnore, boolean ignoreUnknownNodeTypes,
+ boolean noIgnore, boolean noAutoProps,
+ boolean ignoreUnknownNodeTypes,
Map<String, String> revpropTable,
ImportFilterCallback importFilterCallback,
- CommitMessageCallback handler, CommitCallback commitCallback)
+ CommitMessageCallback messageHandler,
+ CommitCallback commitCallback)
throws ClientException;
+
+ /**
+ * Import a file or directory into a repository directory at
+ * head.
+ * @param path the local path
+ * @param url the target url
+ * @param depth depth to traverse into subdirectories
+ * @param noIgnore whether to add files matched by ignore patterns
+ * @param ignoreUnknownNodeTypes whether to ignore files which
+ * the node type is not konwn, just as pipes
+ * @param revpropTable A string-to-string mapping of revision properties
+ * to values which will be set if this operation
+ * results in a commit.
+ * @param handler the commit message callback
+ * @param callback the commit status callback
+ * @throws ClientException
+ * @note this method behaves like the 1.8 version with noAutoProps=false
+ * and without the filtering option.
+ */
void doImport(String path, String url, Depth depth,
boolean noIgnore, boolean ignoreUnknownNodeTypes,
Map<String, String> revpropTable,
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=1455638&r1=1455637&r2=1455638&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 17:28:43 2013
@@ -237,7 +237,7 @@ public class SVNClient implements ISVNCl
throws ClientException;
public native void doImport(String path, String url, Depth depth,
- boolean noIgnore,
+ boolean noIgnore, boolean noAutoProps,
boolean ignoreUnknownNodeTypes,
Map<String, String> revpropTable,
ImportFilterCallback importFilterCallback,
@@ -252,7 +252,7 @@ public class SVNClient implements ISVNCl
CommitCallback callback)
throws ClientException
{
- doImport(path, url, depth, noIgnore, ignoreUnknownNodeTypes,
+ doImport(path, url, depth, noIgnore, false, ignoreUnknownNodeTypes,
revpropTable, null, handler, callback);
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java?rev=1455638&r1=1455637&r2=1455638&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/ImportFilterCallback.java Tue Mar 12 17:28:43 2013
@@ -29,6 +29,7 @@ import org.apache.subversion.javahl.type
/**
* This interface is used to filter imported nodes in the
* {@link ISVNClient#import} call.
+ * @since 1.8
*/
public interface ImportFilterCallback
{