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/17 04:01:22 UTC
svn commit: r1568878 - in
/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl: ./
native/ src/org/apache/subversion/javahl/ tests/org/apache/subversion/javahl/
Author: brane
Date: Mon Feb 17 03:01:22 2014
New Revision: 1568878
URL: http://svn.apache.org/r1568878
Log:
On the javahl-1.8-extensions branch: Sync JavaHL from trunk up to r1568877.
Modified:
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/ (props changed)
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/ClientContext.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/EditorProxy.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/OperationContext.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
Propchange: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/bindings/javahl:r1567604-1568877
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/ClientContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/ClientContext.cpp?rev=1568878&r1=1568877&r2=1568878&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/ClientContext.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/ClientContext.cpp Mon Feb 17 03:01:22 2014
@@ -26,7 +26,6 @@
#include "svn_client.h"
#include "private/svn_wc_private.h"
-#include "svn_private_config.h"
#include "ClientContext.h"
#include "JNIUtil.h"
@@ -37,6 +36,7 @@
#include "EnumMapper.h"
#include "CommitMessage.h"
+#include "svn_private_config.h"
ClientContext::ClientContext(jobject jsvnclient, SVN::Pool &pool)
: OperationContext(pool)
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/EditorProxy.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/EditorProxy.cpp?rev=1568878&r1=1568877&r2=1568878&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/EditorProxy.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/EditorProxy.cpp Mon Feb 17 03:01:22 2014
@@ -23,6 +23,7 @@
* @file EditorProxy.h
* @brief Interface of all editor proxy classes
*/
+#include <apr_pools.h>
#include "JNIUtil.h"
#include "JNIStackElement.h"
@@ -30,15 +31,13 @@
#include "CreateJ.h"
#include "EnumMapper.h"
-#include <apr_pools.h>
-#include "svn_error.h"
-#include "svn_private_config.h"
-
// Newstyle: stream wrapper
#include <memory>
#include "NativeStream.hpp"
#include "jniwrapper/jni_stack.hpp"
+#include "svn_error.h"
+#include "svn_private_config.h"
EditorProxy::EditorProxy(jobject jeditor, apr_pool_t* edit_pool,
const char* repos_root_url, const char* base_relpath,
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/OperationContext.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/OperationContext.cpp?rev=1568878&r1=1568877&r2=1568878&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/OperationContext.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/OperationContext.cpp Mon Feb 17 03:01:22 2014
@@ -24,10 +24,6 @@
* @brief Implementation of the class OperationContext
*/
-#include "svn_client.h"
-#include "private/svn_wc_private.h"
-#include "svn_private_config.h"
-
#include "GlobalConfig.h"
#include "OperationContext.h"
#include "JNIUtil.h"
@@ -38,6 +34,11 @@
#include "EnumMapper.h"
#include "CommitMessage.h"
+#include "svn_client.h"
+#include "private/svn_wc_private.h"
+#include "private/svn_dep_compat.h"
+#include "svn_private_config.h"
+
OperationContext::OperationContext(SVN::Pool &pool)
: m_config(NULL),
m_prompter(NULL),
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=1568878&r1=1568877&r2=1568878&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 Mon Feb 17 03:01:22 2014
@@ -24,6 +24,11 @@
* @brief: Implementation of the SVNClient class
*/
+#include <vector>
+#include <iostream>
+#include <sstream>
+#include <string>
+
#include "SVNClient.h"
#include "JNIUtil.h"
#include "CopySources.h"
@@ -54,6 +59,8 @@
#include "PropertyTable.h"
#include "DiffOptions.h"
#include "CreateJ.h"
+#include "JNIStringHolder.h"
+
#include "svn_auth.h"
#include "svn_dso.h"
#include "svn_types.h"
@@ -67,12 +74,6 @@
#include "svn_path.h"
#include "svn_utf.h"
#include "svn_private_config.h"
-#include "JNIStringHolder.h"
-#include <vector>
-#include <iostream>
-#include <sstream>
-#include <string>
-
SVNClient::SVNClient(jobject jthis_in)
: m_lastPath("", pool), context(jthis_in, pool)
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp?rev=1568878&r1=1568877&r2=1568878&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp Mon Feb 17 03:01:22 2014
@@ -25,6 +25,9 @@
* util.ConfigImpl.Category.
*/
+#include <string>
+#include <vector>
+
#include "../include/org_apache_subversion_javahl_util_ConfigImpl_Category.h"
#include "JNIUtil.h"
#include "JNIStackElement.h"
@@ -33,12 +36,9 @@
#include "CreateJ.h"
#include "EnumMapper.h"
-#include "svn_private_config.h"
#include "svn_config.h"
#include "svn_hash.h"
-
-#include <string>
-#include <vector>
+#include "svn_private_config.h"
namespace {
struct ImplContext
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java?rev=1568878&r1=1568877&r2=1568878&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRemote.java Mon Feb 17 03:01:22 2014
@@ -397,11 +397,13 @@ public interface ISVNRemote
/**
* Invoke <code>callback</code> for each log message from
- * <code>start</code> to <code>end</code>. <code>start</code> may be greater or less than <code>end</code>;
- * this just controls whether the log messages are processed in descending
- * or ascending revision number order.
+ * <code>startRevision</code> to <code>endRevision</code>.
+ * <code>startRevision</code> may be greater or less than
+ * <code>endRevision</code>; this just controls whether the log
+ * messages are processed in descending or ascending revision
+ * number order.
* <p>
- * If <code>start</code> or <code>end</code> is
+ * If <code>startRevision</code> or <code>endRevision</code> is
* {@link org.apache.subversion.javahl.types.Revision#SVN_INVALID_REVNUM},
* the HEAD revision is uses for that argument. If eiter is an
* invaild non-existent revision, an error will be returned.
@@ -416,7 +418,7 @@ public interface ISVNRemote
* the first code>limit</code> logs.
* <p>
* If <code>discoverPath</code> is set, then each call to
- * <code>callback</code> the list of changed paths in that
+ * <code>callback</code> contains the list of changed paths in that
* revision.
* <p>
* If <code>strictNodeHistory</code> is set, copy history will not be
Modified: subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1568878&r1=1568877&r2=1568878&view=diff
==============================================================================
--- subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original)
+++ subversion/branches/javahl-1.8-extensions/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Mon Feb 17 03:01:22 2014
@@ -914,8 +914,15 @@ public class SVNRemoteTests extends SVNT
Revision.SVN_INVALID_REVNUM,
0, false, false, false, null,
receiver);
-
assertEquals(1, receiver.logs.size());
+
+ receiver.logs.clear();
+ session.reparent(getTestRepoUrl() + "/A");
+ session.getLog(null,
+ Revision.SVN_INVALID_REVNUM,
+ 0, 0, false, false, false, null,
+ receiver);
+ assertEquals(2, receiver.logs.size());
}
public void testGetLogMissing() throws Exception