You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/01/28 19:44:18 UTC
svn commit: r1655429 - in
/subversion/branches/pin-externals/subversion/bindings/javahl: native/
src/org/apache/subversion/javahl/
Author: rhuijben
Date: Wed Jan 28 18:44:18 2015
New Revision: 1655429
URL: http://svn.apache.org/r1655429
Log:
On the pin-externals branch: Expose the pin-externals flag of 'svn copy' to
JavaHL.
* subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
(Java_org_apache_subversion_javahl_SVNClient_copy): Add pinExternals argument.
* subversion/bindings/javahl/native/SVNClient.cpp
(SVNClient::copy): Add pinExternals boolean.
* subversion/bindings/javahl/native/SVNClient.h
(SVNClient::copy): Add pinExternals boolean.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
(copy): Add override with added pinExternals boolean argument.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
(copy): Add override with added pinExternals boolean argument.
Suggested by: markphip
Modified:
subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.h
subversion/branches/pin-externals/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
Modified: subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.cpp?rev=1655429&r1=1655428&r2=1655429&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.cpp (original)
+++ subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.cpp Wed Jan 28 18:44:18 2015
@@ -443,7 +443,7 @@ void SVNClient::commit(Targets &targets,
void SVNClient::copy(CopySources ©Sources, const char *destPath,
CommitMessage *message, bool copyAsChild,
- bool makeParents, bool ignoreExternals,
+ bool makeParents, bool ignoreExternals, bool pinExternals,
PropertyTable &revprops, CommitCallback *callback)
{
SVN::Pool subPool(pool);
@@ -458,8 +458,9 @@ void SVNClient::copy(CopySources ©So
if (ctx == NULL)
return;
- SVN_JNI_ERR(svn_client_copy6(srcs, destinationPath.c_str(),
+ SVN_JNI_ERR(svn_client_copy7(srcs, destinationPath.c_str(),
copyAsChild, makeParents, ignoreExternals,
+ pinExternals,
revprops.hash(subPool),
CommitCallback::callback, callback,
ctx, subPool.getPool()), );
Modified: subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.h
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.h?rev=1655429&r1=1655428&r2=1655429&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.h (original)
+++ subversion/branches/pin-externals/subversion/bindings/javahl/native/SVNClient.h Wed Jan 28 18:44:18 2015
@@ -149,8 +149,8 @@ class SVNClient :public SVNBase
PropertyTable &revprops, CommitCallback *callback);
void copy(CopySources ©Sources, const char *destPath,
CommitMessage *message, bool copyAsChild, bool makeParents,
- bool ignoreExternals, PropertyTable &revprops,
- CommitCallback *callback);
+ bool ignoreExternals, bool pinExternals,
+ PropertyTable &revprops, CommitCallback *callback);
void commit(Targets &targets, CommitMessage *message, svn_depth_t depth,
bool noUnlock, bool keepChangelist,
StringArray &changelists, PropertyTable &revprops,
Modified: subversion/branches/pin-externals/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1655429&r1=1655428&r2=1655429&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original)
+++ subversion/branches/pin-externals/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Wed Jan 28 18:44:18 2015
@@ -559,7 +559,8 @@ JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNClient_copy
(JNIEnv *env, jobject jthis, jobject jcopySources, jstring jdestPath,
jboolean jcopyAsChild, jboolean jmakeParents, jboolean jignoreExternals,
- jobject jrevpropTable, jobject jmessage, jobject jcallback)
+ jboolean jpinExternals, jobject jrevpropTable, jobject jmessage,
+ jobject jcallback)
{
JNIEntry(SVNClient, copy);
@@ -592,6 +593,7 @@ Java_org_apache_subversion_javahl_SVNCli
CommitCallback callback(jcallback);
cl->copy(copySources, destPath, &message, jcopyAsChild ? true : false,
jmakeParents ? true : false, jignoreExternals ? true : false,
+ jpinExternals ? true : false,
revprops, jcallback ? &callback : NULL);
}
Modified: subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1655429&r1=1655428&r2=1655429&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Wed Jan 28 18:44:18 2015
@@ -373,6 +373,8 @@ public interface ISVNClient
* @param makeParents Whether to create intermediate parents
* @param ignoreExternals Whether or not to process external definitions
* as part of this operation.
+ * @param pinExternals Whether or not to pin external definitions as part
+ * of this operation.
* @param revpropTable A string-to-string mapping of revision properties
* to values which will be set if this operation
* results in a commit.
@@ -383,6 +385,19 @@ public interface ISVNClient
*/
void copy(List<CopySource> sources, String destPath,
boolean copyAsChild, boolean makeParents,
+ boolean ignoreExternals, boolean pinExternals,
+ Map<String, String> revpropTable,
+ CommitMessageCallback handler, CommitCallback callback)
+ throws ClientException;
+
+ /**
+ * Copy versioned paths with the history preserved.
+ * <p>
+ * Behaves like the 1.9 version with
+ * <code>pinExternals = false</code> and
+ */
+ void copy(List<CopySource> sources, String destPath,
+ boolean copyAsChild, boolean makeParents,
boolean ignoreExternals, Map<String, String> revpropTable,
CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
Modified: subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1655429&r1=1655428&r2=1655429&view=diff
==============================================================================
--- subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/pin-externals/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Wed Jan 28 18:44:18 2015
@@ -239,11 +239,22 @@ public class SVNClient implements ISVNCl
public native void copy(List<CopySource> sources, String destPath,
boolean copyAsChild, boolean makeParents,
- boolean ignoreExternals,
+ boolean ignoreExternals, boolean pinExternals,
Map<String, String> revpropTable,
CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
+ public void copy(List<CopySource> sources, String destPath,
+ boolean copyAsChild, boolean makeParents,
+ boolean ignoreExternals,
+ Map<String, String> revpropTable,
+ CommitMessageCallback handler, CommitCallback callback)
+ throws ClientException
+ {
+ copy(sources, destPath, copyAsChild, markeParents, ignoreExternals,
+ false, revpropTable, handler, callback);
+ }
+
public native void move(Set<String> srcPaths, String destPath,
boolean force, boolean moveAsChild,
boolean makeParents, boolean metadataOnly,
Re: svn commit: r1655429 - in /subversion/branches/pin-externals/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/
Posted by Branko Čibej <br...@wandisco.com>.
On 28.01.2015 19:44, rhuijben@apache.org wrote:
> Author: rhuijben
> Date: Wed Jan 28 18:44:18 2015
> New Revision: 1655429
>
> URL: http://svn.apache.org/r1655429
> Log:
> On the pin-externals branch: Expose the pin-externals flag of 'svn copy' to
> JavaHL.
Thanks! I was going to work on that tomorrow, but you beat me to it.
-- Brane