Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34676DE9E for ; Mon, 24 Dec 2012 03:22:33 +0000 (UTC) Received: (qmail 51589 invoked by uid 500); 24 Dec 2012 03:22:33 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 51456 invoked by uid 500); 24 Dec 2012 03:22:31 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 51420 invoked by uid 99); 24 Dec 2012 03:22:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Dec 2012 03:22:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Dec 2012 03:22:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E6A142388993; Mon, 24 Dec 2012 03:22:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1425580 - in /subversion/branches/javahl-ra: ./ subversion/bindings/javahl/native/ subversion/bindings/javahl/src/org/apache/subversion/javahl/ Date: Mon, 24 Dec 2012 03:22:07 -0000 To: commits@subversion.apache.org From: vmpn@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121224032207.E6A142388993@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vmpn Date: Mon Dec 24 03:22:06 2012 New Revision: 1425580 URL: http://svn.apache.org/viewvc?rev=1425580&view=rev Log: On the javahl-ra branch: Bring up-to-date with JavaHL changes on trunk@1399072 Modified: subversion/branches/javahl-ra/ (props changed) subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.h subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.h subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Propchange: subversion/branches/javahl-ra/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1399064-1399072 Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.cpp Mon Dec 24 03:22:06 2012 @@ -816,7 +816,8 @@ void SVNClient::getMergeinfoLog(int type * Get a property. */ jbyteArray SVNClient::propertyGet(const char *path, const char *name, - Revision &revision, Revision &pegRevision) + Revision &revision, Revision &pegRevision, + StringArray &changelists) { SVN::Pool subPool(pool); SVN_JNI_NULL_PTR_EX(path, "path", NULL); @@ -829,11 +830,11 @@ jbyteArray SVNClient::propertyGet(const return NULL; apr_hash_t *props; - SVN_JNI_ERR(svn_client_propget4(&props, name, + SVN_JNI_ERR(svn_client_propget5(&props, NULL, name, intPath.c_str(), pegRevision.revision(), revision.revision(), NULL, svn_depth_empty, - NULL, ctx, subPool.getPool(), - subPool.getPool()), + changelists.array(subPool), ctx, + subPool.getPool(), subPool.getPool()), NULL); apr_hash_index_t *hi; @@ -1187,7 +1188,6 @@ void SVNClient::blame(const char *path, { SVN::Pool subPool(pool); SVN_JNI_NULL_PTR_EX(path, "path", ); - apr_pool_t *pool = subPool.getPool(); Path intPath(path, subPool); SVN_JNI_ERR(intPath.error_occured(), ); @@ -1195,13 +1195,12 @@ void SVNClient::blame(const char *path, if (ctx == NULL) return; - SVN_JNI_ERR(svn_client_blame5(intPath.c_str(), pegRevision.revision(), - revisionStart.revision(), - revisionEnd.revision(), - svn_diff_file_options_create(pool), - ignoreMimeType, includeMergedRevisions, - BlameCallback::callback, callback, ctx, - pool), + SVN_JNI_ERR(svn_client_blame5( + intPath.c_str(), pegRevision.revision(), revisionStart.revision(), + revisionEnd.revision(), + svn_diff_file_options_create(subPool.getPool()), ignoreMimeType, + includeMergedRevisions, BlameCallback::callback, callback, ctx, + subPool.getPool()), ); } Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.h URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.h?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.h (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNClient.h Mon Dec 24 03:22:06 2012 @@ -171,7 +171,8 @@ class SVNClient :public SVNBase bool lastChanged); void upgrade(const char *path); jbyteArray propertyGet(const char *path, const char *name, - Revision &revision, Revision &pegRevision); + Revision &revision, Revision &pegRevision, + StringArray &changelists); void diff(const char *target1, Revision &revision1, const char *target2, Revision &revision2, const char *relativeToDir, OutputStream &outputStream, Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.cpp Mon Dec 24 03:22:06 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/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.h URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.h?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.h (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/SVNRepos.h Mon Dec 24 03:22:06 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/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp Mon Dec 24 03:22:06 2012 @@ -1080,7 +1080,7 @@ Java_org_apache_subversion_javahl_SVNCli JNIEXPORT jbyteArray JNICALL Java_org_apache_subversion_javahl_SVNClient_propertyGet (JNIEnv *env, jobject jthis, jstring jpath, jstring jname, jobject jrevision, - jobject jpegRevision) + jobject jpegRevision, jobject jchangelists) { JNIEntry(SVNClient, propertyGet); SVNClient *cl = SVNClient::getCppObject(jthis); @@ -1105,7 +1105,11 @@ Java_org_apache_subversion_javahl_SVNCli if (JNIUtil::isExceptionThrown()) return NULL; - return cl->propertyGet(path, name, revision, pegRevision); + StringArray changelists(jchangelists); + if (JNIUtil::isExceptionThrown()) + return NULL; + + return cl->propertyGet(path, name, revision, pegRevision, changelists); } JNIEXPORT jobject JNICALL Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp Mon Dec 24 03:22:06 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/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Mon Dec 24 03:22:06 2012 @@ -719,6 +719,10 @@ public interface ISVNClient * @throws ClientException */ byte[] propertyGet(String path, String name, Revision revision, + Revision pegRevision, Collection changelists) + throws ClientException; + + byte[] propertyGet(String path, String name, Revision revision, Revision pegRevision) throws ClientException; Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java Mon Dec 24 03:22:06 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/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Mon Dec 24 03:22:06 2012 @@ -366,8 +366,16 @@ public class SVNClient implements ISVNCl boolean force) throws ClientException; + public byte[] propertyGet(String path, String name, + Revision revision, Revision pegRevision) + throws ClientException + { + return propertyGet(path, name, revision, pegRevision, null); + } + public native byte[] propertyGet(String path, String name, - Revision revision, Revision pegRevision) + Revision revision, Revision pegRevision, + Collection changelists) throws ClientException; public byte[] fileContent(String path, Revision revision, Modified: subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java URL: http://svn.apache.org/viewvc/subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1425580&r1=1425579&r2=1425580&view=diff ============================================================================== --- subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java (original) +++ subversion/branches/javahl-ra/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java Mon Dec 24 03:22:06 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)