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 2012/10/17 03:53:11 UTC
svn commit: r1399072 - in /subversion/trunk/subversion/bindings/javahl:
native/SVNRepos.cpp native/SVNRepos.h
native/org_apache_subversion_javahl_SVNRepos.cpp
src/org/apache/subversion/javahl/ISVNRepos.java
src/org/apache/subversion/javahl/SVNRepos.java
Author: hwright
Date: Wed Oct 17 01:53:10 2012
New Revision: 1399072
URL: http://svn.apache.org/viewvc?rev=1399072&view=rev
Log:
JavaHL: Update hotcopy interface to use the latest version of the C libraries.
[ in subversion/bindings/javahl/ ]
* native/SVNRepos.h,
native/SVNRepos.cpp
(SVNRepos::hotcopy): Add incremental parameter, use svn_repos_hotcopy2().
* native/org_apache_subversion_javahl_SVNRepos.cpp
(Java_org_apache_subversion_javahl_SVNRepos_hotcopy): Add incremental param,
and pass it down to the C++ layer.
* src/org/apache/subversion/javahl/ISVNRepos.java,
src/org/apache/subversion/javahl/SVNRepos.java
(hotcopy): New overload.
Modified:
subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h
subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1399072&r1=1399071&r2=1399072&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNRepos.cpp Wed Oct 17 01:53:10 2012
@@ -248,7 +248,7 @@ void SVNRepos::dump(File &path, OutputSt
}
void SVNRepos::hotcopy(File &path, File &targetPath,
- bool cleanLogs)
+ bool cleanLogs, bool incremental)
{
SVN::Pool requestPool;
@@ -264,9 +264,12 @@ void SVNRepos::hotcopy(File &path, File
return;
}
- SVN_JNI_ERR(svn_repos_hotcopy(path.getInternalStyle(requestPool),
- targetPath.getInternalStyle(requestPool),
- cleanLogs, requestPool.getPool()), );
+ SVN_JNI_ERR(svn_repos_hotcopy2(path.getInternalStyle(requestPool),
+ targetPath.getInternalStyle(requestPool),
+ cleanLogs, incremental,
+ checkCancel, this /* cancel callback/baton */,
+ requestPool.getPool()),
+ );
}
static void
Modified: subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h?rev=1399072&r1=1399071&r2=1399072&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h (original)
+++ subversion/trunk/subversion/bindings/javahl/native/SVNRepos.h Wed Oct 17 01:53:10 2012
@@ -58,7 +58,7 @@ class SVNRepos : public SVNBase
void listUnusedDBLogs(File &path,
MessageReceiver &messageReceiver);
void listDBLogs(File &path, MessageReceiver &messageReceiver);
- void hotcopy(File &path, File &targetPath, bool cleanLogs);
+ void hotcopy(File &path, File &targetPath, bool cleanLogs, bool incremental);
void dump(File &path, OutputStream &dataOut, Revision &revsionStart,
Revision &RevisionEnd, bool incremental, bool useDeltas,
ReposNotifyCallback *notifyCallback);
Modified: subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp?rev=1399072&r1=1399071&r2=1399072&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp Wed Oct 17 01:53:10 2012
@@ -170,7 +170,7 @@ Java_org_apache_subversion_javahl_SVNRep
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNRepos_hotcopy
(JNIEnv *env, jobject jthis, jobject jpath, jobject jtargetPath,
- jboolean jcleanLogs)
+ jboolean jcleanLogs, jboolean jincremental)
{
JNIEntry(SVNRepos, hotcopy);
SVNRepos *cl = SVNRepos::getCppObject(jthis);
@@ -188,7 +188,8 @@ Java_org_apache_subversion_javahl_SVNRep
if (JNIUtil::isExceptionThrown())
return;
- cl->hotcopy(path, targetPath, jcleanLogs ? true : false);
+ cl->hotcopy(path, targetPath, jcleanLogs ? true : false,
+ jincremental ? true : false);
}
JNIEXPORT void JNICALL
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1399072&r1=1399071&r2=1399072&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java Wed Oct 17 01:53:10 2012
@@ -113,6 +113,9 @@ public interface ISVNRepos {
* @throws ClientException throw in case of problem
*/
public abstract void hotcopy(File path, File targetPath,
+ boolean cleanLogs, boolean incremental) throws ClientException;
+
+ public abstract void hotcopy(File path, File targetPath,
boolean cleanLogs) throws ClientException;
/**
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1399072&r1=1399071&r2=1399072&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Wed Oct 17 01:53:10 2012
@@ -130,7 +130,14 @@ public class SVNRepos implements ISVNRep
* @throws ClientException throw in case of problem
*/
public native void hotcopy(File path, File targetPath,
- boolean cleanLogs) throws ClientException;
+ boolean cleanLogs, boolean incremental)
+ throws ClientException;
+
+ public void hotcopy(File path, File targetPath,
+ boolean cleanLogs) throws ClientException
+ {
+ hotcopy(path, targetPath, cleanLogs, false);
+ }
/**
* list all logfiles (BDB) in use or not)