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 2014/02/25 08:52:44 UTC
svn commit: r1571597 - in
/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl: ./
native/ src/org/apache/subversion/javahl/
Author: brane
Date: Tue Feb 25 07:52:44 2014
New Revision: 1571597
URL: http://svn.apache.org/r1571597
Log:
On the javahl-1.8-extensions branch: Sync JavaHL from trunk up to r1571594.
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/ (props changed)
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
Propchange: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/bindings/javahl:r1569632-1571594
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp?rev=1571597&r1=1571596&r2=1571597&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp Tue Feb 25 07:52:44 2014
@@ -337,21 +337,18 @@ void SVNClient::remove(Targets &targets,
ctx, subPool.getPool()), );
}
-void SVNClient::revert(const char *path, svn_depth_t depth,
+void SVNClient::revert(StringArray &paths, svn_depth_t depth,
StringArray &changelists)
{
SVN::Pool subPool(pool);
- SVN_JNI_NULL_PTR_EX(path, "path", );
-
svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
if (ctx == NULL)
return;
- Targets target(path, subPool);
- const apr_array_header_t *targets = target.array(subPool);
- SVN_JNI_ERR(target.error_occurred(), );
- SVN_JNI_ERR(svn_client_revert2(targets, depth,
+ Targets targets(paths, subPool);
+ SVN_JNI_ERR(targets.error_occurred(), );
+ SVN_JNI_ERR(svn_client_revert2(targets.array(subPool), depth,
changelists.array(subPool), ctx,
subPool.getPool()), );
}
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.h?rev=1571597&r1=1571596&r2=1571597&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.h Tue Feb 25 07:52:44 2014
@@ -148,7 +148,7 @@ class SVNClient :public SVNBase
bool allowUnverObstructions);
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 revert(StringArray &paths, svn_depth_t depth, StringArray &changelists);
void remove(Targets &targets, CommitMessage *message, bool force,
bool keep_local, PropertyTable &revprops,
CommitCallback *callback);
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1571597&r1=1571596&r2=1571597&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Tue Feb 25 07:52:44 2014
@@ -395,7 +395,7 @@ Java_org_apache_subversion_javahl_SVNCli
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_revert
-(JNIEnv *env, jobject jthis, jstring jpath, jobject jdepth,
+(JNIEnv *env, jobject jthis, jobject jpaths, jobject jdepth,
jobject jchangelists)
{
JNIEntry(SVNClient, revert);
@@ -405,7 +405,9 @@ Java_org_apache_subversion_javahl_SVNCli
JNIUtil::throwError(_("bad C++ this"));
return;
}
- JNIStringHolder path(jpath);
+
+ SVN_JNI_NULL_PTR_EX(jpaths, "paths", );
+ StringArray paths(jpaths);
if (JNIUtil::isExceptionThrown())
return;
@@ -413,7 +415,7 @@ Java_org_apache_subversion_javahl_SVNCli
if (JNIUtil::isExceptionThrown())
return;
- cl->revert(path, EnumMapper::toDepth(jdepth), changelists);
+ cl->revert(paths, EnumMapper::toDepth(jdepth), changelists);
}
JNIEXPORT void JNICALL
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1571597&r1=1571596&r2=1571597&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Tue Feb 25 07:52:44 2014
@@ -222,6 +222,17 @@ public interface ISVNClient
throws ClientException;
/**
+ * Reverts set of files or directories to a pristine state.
+ * @param path A set of paths to revert.
+ * @param depth the depth to recurse into subdirectories
+ * @param changelists changelists to filter by
+ * @throws ClientException
+ * @since 1.9
+ */
+ void revert(Set<String> paths, Depth depth, Collection<String> changelists)
+ throws ClientException;
+
+ /**
* Reverts a file to a pristine state.
* @param path path of the file.
* @param depth the depth to recurse into subdirectories
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1571597&r1=1571596&r2=1571597&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Feb 25 07:52:44 2014
@@ -32,6 +32,7 @@ import java.io.FileNotFoundException;
import java.io.ByteArrayOutputStream;
import java.util.Collection;
+import java.util.Collections;
import java.util.Set;
import java.util.List;
import java.util.Map;
@@ -178,10 +179,17 @@ public class SVNClient implements ISVNCl
CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
- public native void revert(String path, Depth depth,
+ public native void revert(Set<String> paths, Depth depth,
Collection<String> changelists)
throws ClientException;
+ public void revert(String path, Depth depth,
+ Collection<String> changelists)
+ throws ClientException
+ {
+ revert(Collections.singleton(path), depth, changelists);
+ }
+
public native void add(String path, Depth depth, boolean force,
boolean noIgnores, boolean noAutoProps,
boolean addParents)