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 2010/11/16 20:52:38 UTC
svn commit: r1035763 - in /subversion/trunk/subversion/bindings/javahl:
native/ src/org/apache/subversion/javahl/ src/org/tigris/subversion/javahl/
tests/org/apache/subversion/javahl/
Author: hwright
Date: Tue Nov 16 19:52:38 2010
New Revision: 1035763
URL: http://svn.apache.org/viewvc?rev=1035763&view=rev
Log:
JavaHL: Fold the MergeinfoLogKind type into the Mergeinfo class.
[ in subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/BasicTests.java,
src/org/apache/subversion/javahl/SVNClient.java,
src/org/apache/subversion/javahl/ISVNClient.java,
src/org/tigris/subversion/javahl/SVNClient.java,
native/EnumMapper.cpp:
Update references.
* src/org/apache/subversion/javahl/MergeinfoLogKind.java:
Move from here...
* src/org/apache/subversion/javahl/Mergeinfo.java:
(LogKind): ...to here.
Removed:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java
Modified:
subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Modified: subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1035763&r1=1035762&r2=1035763&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/trunk/subversion/bindings/javahl/native/EnumMapper.cpp Tue Nov 16 19:52:38 2010
@@ -165,7 +165,7 @@ jobject EnumMapper::mapConflictReason(sv
int EnumMapper::toMergeinfoLogKind(jobject jLogKind)
{
- return getOrdinal(JAVA_PACKAGE"/MergeinfoLogKind", jLogKind);
+ return getOrdinal(JAVA_PACKAGE"/Mergeinfo$LogKind", jLogKind);
}
int EnumMapper::toLogLevel(jobject jLogLevel)
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java?rev=1035763&r1=1035762&r2=1035763&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java Tue Nov 16 19:52:38 2010
@@ -525,7 +525,7 @@ public interface ISVNClient
* @param callback the object to receive the log messages
* @since 1.7
*/
- void getMergeinfoLog(MergeinfoLogKind kind, String pathOrUrl,
+ void getMergeinfoLog(Mergeinfo.LogKind kind, String pathOrUrl,
Revision pegRevision, String mergeSourceUrl,
Revision srcPegRevision, boolean discoverChangedPaths,
Depth depth, Set<String> revProps,
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java?rev=1035763&r1=1035762&r2=1035763&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/Mergeinfo.java Tue Nov 16 19:52:38 2010
@@ -200,4 +200,17 @@ public class Mergeinfo implements java.i
{
mergeSources.put(mergeSrc, range);
}
+
+ /**
+ * Constants to specify which collection of revisions to report in
+ * getMergeinfoLog.
+ */
+ public enum LogKind
+ {
+ /** Revisions eligible for merging from merge-source to merge-target. */
+ eligible,
+
+ /** Revisions already merged from merge-source to merge-target. */
+ merged;
+ }
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1035763&r1=1035762&r2=1035763&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Tue Nov 16 19:52:38 2010
@@ -350,7 +350,7 @@ public class SVNClient implements ISVNCl
/**
* @since 1.7
*/
- public native void getMergeinfoLog(MergeinfoLogKind kind, String pathOrUrl,
+ public native void getMergeinfoLog(Mergeinfo.LogKind kind, String pathOrUrl,
Revision pegRevision,
String mergeSourceUrl,
Revision srcPegRevision,
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1035763&r1=1035762&r2=1035763&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Tue Nov 16 19:52:38 2010
@@ -1489,7 +1489,7 @@ public class SVNClient implements SVNCli
try
{
aSVNClient.getMergeinfoLog(
- org.apache.subversion.javahl.MergeinfoLogKind.values()[kind],
+ org.apache.subversion.javahl.Mergeinfo.LogKind.values()[kind],
pathOrUrl, pegRevision == null ? null : pegRevision.toApache(),
mergeSourceUrl,
srcPegRevision == null ? null : srcPegRevision.toApache(),
Modified: subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1035763&r1=1035762&r2=1035763&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Tue Nov 16 19:52:38 2010
@@ -2205,7 +2205,7 @@ public class BasicTests extends SVNTests
if (expectedAvailableStart > 0)
{
long[] availableRevs =
- getMergeinfoRevisions(MergeinfoLogKind.eligible, targetPath,
+ getMergeinfoRevisions(Mergeinfo.LogKind.eligible, targetPath,
Revision.HEAD, mergeSrc,
Revision.HEAD);
assertNotNull("Missing eligible merge info on '"+targetPath + '\'',
@@ -2221,7 +2221,7 @@ public class BasicTests extends SVNTests
* are no revisions to return.
* @since 1.5
*/
- private long[] getMergeinfoRevisions(MergeinfoLogKind kind,
+ private long[] getMergeinfoRevisions(Mergeinfo.LogKind kind,
String pathOrUrl,
Revision pegRevision,
String mergeSourceUrl,