You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2013/11/27 12:52:46 UTC
svn commit: r1546002 [7/39] - in /subversion/branches/verify-keep-going: ./
build/ build/ac-macros/ build/generator/ build/generator/swig/
build/generator/templates/ build/win32/ contrib/client-side/emacs/
contrib/server-side/ contrib/server-side/svncu...
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ProgressEvent.java Wed Nov 27 11:52:35 2013
@@ -31,13 +31,9 @@ import org.apache.subversion.javahl.call
*/
public class ProgressEvent implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java Wed Nov 27 11:52:35 2013
@@ -32,13 +32,9 @@ import org.apache.subversion.javahl.call
*/
public class ReposNotifyInformation extends EventObject
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java Wed Nov 27 11:52:35 2013
@@ -103,6 +103,11 @@ public class SVNClient implements ISVNCl
return NativeResources.getVersion();
}
+ public RuntimeVersion getRuntimeVersion()
+ {
+ return NativeResources.getRuntimeVersion();
+ }
+
public native VersionExtended getVersionExtended(boolean verbose);
public native String getAdminDirectoryName();
@@ -112,6 +117,7 @@ public class SVNClient implements ISVNCl
/**
* @deprecated
*/
+ @Deprecated
public native String getLastPath();
public native void status(String path, Depth depth, boolean onServer,
@@ -132,6 +138,8 @@ public class SVNClient implements ISVNCl
public native void setPrompt(UserPasswordCallback prompt);
+ public native void setTunnelAgent(TunnelAgent tunnelAgent);
+
public native void logMessages(String path, Revision pegRevision,
List<RevisionRange> revisionRanges,
boolean stopOnCopy, boolean discoverPath,
@@ -213,6 +221,7 @@ public class SVNClient implements ISVNCl
throws ClientException;
/** @deprecated */
+ @Deprecated
public void move(Set<String> srcPaths, String destPath,
boolean force, boolean moveAsChild,
boolean makeParents,
@@ -321,6 +330,7 @@ public class SVNClient implements ISVNCl
/** @deprecated */
+ @Deprecated
public native void mergeReintegrate(String path, Revision pegRevision,
String localPath, boolean dryRun)
throws ClientException;
@@ -573,11 +583,15 @@ public class SVNClient implements ISVNCl
public native void setConfigDirectory(String configDir)
throws ClientException;
- public native void setConfigEventHandler(ConfigEvent configHandler);
-
public native String getConfigDirectory()
throws ClientException;
+ public native void setConfigEventHandler(ConfigEvent configHandler)
+ throws ClientException;
+
+ public native ConfigEvent getConfigEventHandler()
+ throws ClientException;
+
public native void cancelOperation()
throws ClientException;
@@ -664,10 +678,21 @@ public class SVNClient implements ISVNCl
public native void info2(String pathOrUrl, Revision revision,
Revision pegRevision, Depth depth,
+ boolean fetchExcluded, boolean fetchActualOnly,
Collection<String> changelists,
InfoCallback callback)
throws ClientException;
+ public void info2(String pathOrUrl, Revision revision,
+ Revision pegRevision, Depth depth,
+ Collection<String> changelists,
+ InfoCallback callback)
+ throws ClientException
+ {
+ info2(pathOrUrl, revision, pegRevision, depth,
+ false, true, changelists, callback);
+ }
+
public native void patch(String patchPath, String targetPath,
boolean dryRun, int stripCount, boolean reverse,
boolean ignoreWhitespace, boolean removeTempfiles,
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/SubversionException.java Wed Nov 27 11:52:35 2013
@@ -47,4 +47,16 @@ public class SubversionException extends
{
super(message);
}
+
+ /**
+ * This constructor is only used by sub-classes and the native
+ * implementation.
+ *
+ * @param message A description of the problem.
+ * @param cause The root cause of the exception.
+ */
+ protected SubversionException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
}
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/CommitEditor.java Wed Nov 27 11:52:35 2013
@@ -29,6 +29,7 @@ import org.apache.subversion.javahl.call
import org.apache.subversion.javahl.ISVNEditor;
import org.apache.subversion.javahl.JNIObject;
import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
import java.io.InputStream;
import java.util.Map;
@@ -40,6 +41,14 @@ import java.util.Set;
*/
public class CommitEditor extends JNIObject implements ISVNEditor
{
+ /**
+ * Load the required native library.
+ */
+ static
+ {
+ NativeResources.loadNativeLibrary();
+ }
+
public void dispose()
{
session.disposeEditor(this);
@@ -111,9 +120,6 @@ public class CommitEditor extends JNIObj
long replacesRevision)
throws ClientException;
-// public native void rotate(Iterable<RotatePair> elements)
-// throws ClientException;
-
public native void complete() throws ClientException;
public native void abort() throws ClientException;
@@ -125,12 +131,15 @@ public class CommitEditor extends JNIObj
CommitEditor createInstance(RemoteSession session,
Map<String, byte[]> revisionProperties,
CommitCallback commitCallback,
- Set<Lock> lockTokens,
- boolean keepLocks)
+ Set<Lock> lockTokens, boolean keepLocks,
+ ISVNEditor.ProvideBaseCallback baseCB,
+ ISVNEditor.ProvidePropsCallback propsCB,
+ ISVNEditor.GetNodeKindCallback kindCB)
throws ClientException
{
- long cppAddr = nativeCreateInstance(session, revisionProperties,
- commitCallback, lockTokens, keepLocks);
+ long cppAddr = nativeCreateInstance(
+ session, revisionProperties, commitCallback,
+ lockTokens, keepLocks, baseCB, propsCB, kindCB);
return new CommitEditor(cppAddr, session);
}
@@ -157,7 +166,9 @@ public class CommitEditor extends JNIObj
long nativeCreateInstance(RemoteSession session,
Map<String, byte[]> revisionProperties,
CommitCallback commitCallback,
- Set<Lock> lockTokens,
- boolean keepLocks)
+ Set<Lock> lockTokens, boolean keepLocks,
+ ISVNEditor.ProvideBaseCallback baseCB,
+ ISVNEditor.ProvidePropsCallback propsCB,
+ ISVNEditor.GetNodeKindCallback kindCB)
throws ClientException;
}
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteFactory.java Wed Nov 27 11:52:35 2013
@@ -41,6 +41,14 @@ import java.util.HashSet;
public class RemoteFactory
{
/**
+ * Load the required native library.
+ */
+ static
+ {
+ NativeResources.loadNativeLibrary();
+ }
+
+ /**
* Default constructor.
*/
public RemoteFactory() {}
@@ -49,17 +57,19 @@ public class RemoteFactory
* Initializing constructor. Any or all of its arguments may be null.
*/
public RemoteFactory(String configDirectory,
- ConfigEvent configHandler,
String username, String password,
UserPasswordCallback prompt,
- ProgressCallback progress)
+ ProgressCallback progress,
+ ConfigEvent configHandler,
+ TunnelAgent tunnelAgent)
{
setConfigDirectory(configDirectory);
- setConfigEventHandler(configHandler);
setUsername(username);
setPassword(password);
setPrompt(prompt);
setProgressCallback(progress);
+ setConfigEventHandler(configHandler);
+ setTunnelAgent(tunnelAgent);
}
/**
@@ -120,13 +130,21 @@ public class RemoteFactory
/**
* Set an event handler that will be called every time the
- * configuration is loaded.
+ * configuration is loaded by the ISVNRemote objects created by
+ * this factory.
*/
public void setConfigEventHandler(ConfigEvent configHandler)
{
this.configHandler = configHandler;
}
+ /**
+ * Set callbacks for ra_svn tunnel handling.
+ */
+ public void setTunnelAgent(TunnelAgent tunnelAgent)
+ {
+ this.tunnelAgent = tunnelAgent;
+ }
/**
* Open a persistent session to a repository.
@@ -144,9 +162,9 @@ public class RemoteFactory
public ISVNRemote openRemoteSession(String url)
throws ClientException, SubversionException
{
- return open(1, url, null,
- configDirectory, configHandler,
- username, password, prompt, progress);
+ return open(1, url, null, configDirectory,
+ username, password, prompt, progress,
+ configHandler, tunnelAgent);
}
/**
@@ -172,9 +190,9 @@ public class RemoteFactory
if (retryAttempts <= 0)
throw new IllegalArgumentException(
"retryAttempts must be positive");
- return open(retryAttempts, url, null,
- configDirectory, configHandler,
- username, password, prompt, progress);
+ return open(retryAttempts, url, null, configDirectory,
+ username, password, prompt, progress,
+ configHandler, tunnelAgent);
}
/**
@@ -200,9 +218,9 @@ public class RemoteFactory
{
if (reposUUID == null)
throw new IllegalArgumentException("reposUUID may not be null");
- return open(1, url, reposUUID,
- configDirectory, configHandler,
- username, password, prompt, progress);
+ return open(1, url, reposUUID, configDirectory,
+ username, password, prompt, progress,
+ configHandler, tunnelAgent);
}
/**
@@ -235,25 +253,27 @@ public class RemoteFactory
if (retryAttempts <= 0)
throw new IllegalArgumentException(
"retryAttempts must be positive");
- return open(retryAttempts, url, reposUUID,
- configDirectory, configHandler,
- username, password, prompt, progress);
+ return open(retryAttempts, url, reposUUID, configDirectory,
+ username, password, prompt, progress,
+ configHandler, tunnelAgent);
}
private String configDirectory;
- private ConfigEvent configHandler;
private String username;
private String password;
private UserPasswordCallback prompt;
private ProgressCallback progress;
+ private ConfigEvent configHandler;
+ private TunnelAgent tunnelAgent;
/* Native factory implementation. */
private static native ISVNRemote open(int retryAttempts,
String url, String reposUUID,
String configDirectory,
- ConfigEvent configHandler,
String username, String password,
UserPasswordCallback prompt,
- ProgressCallback progress)
+ ProgressCallback progress,
+ ConfigEvent configHandler,
+ TunnelAgent tunnelAgent)
throws ClientException, SubversionException;
}
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/RemoteSession.java Wed Nov 27 11:52:35 2013
@@ -32,9 +32,12 @@ import org.apache.subversion.javahl.ISVN
import org.apache.subversion.javahl.JNIObject;
import org.apache.subversion.javahl.OperationContext;
import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
import java.lang.ref.WeakReference;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.io.OutputStream;
@@ -44,6 +47,14 @@ import static java.util.concurrent.TimeU
public class RemoteSession extends JNIObject implements ISVNRemote
{
+ /**
+ * Load the required native library.
+ */
+ static
+ {
+ NativeResources.loadNativeLibrary();
+ }
+
public void dispose()
{
if (editorReference != null)
@@ -121,20 +132,32 @@ public class RemoteSession extends JNIOb
public ISVNEditor getCommitEditor(Map<String, byte[]> revisionProperties,
CommitCallback commitCallback,
- Set<Lock> lockTokens,
- boolean keepLocks)
+ Set<Lock> lockTokens, boolean keepLocks,
+ ISVNEditor.ProvideBaseCallback getBase,
+ ISVNEditor.ProvidePropsCallback getProps,
+ ISVNEditor.GetNodeKindCallback getCopyfromKind)
throws ClientException
{
check_inactive(editorReference, reporterReference);
ISVNEditor ed =
CommitEditor.createInstance(this, revisionProperties,
- commitCallback, lockTokens, keepLocks);
+ commitCallback, lockTokens, keepLocks,
+ getBase, getProps, getCopyfromKind);
if (editorReference != null)
editorReference.clear();
editorReference = new WeakReference<ISVNEditor>(ed);
return ed;
}
+ public ISVNEditor getCommitEditor(Map<String, byte[]> revisionProperties,
+ CommitCallback commitCallback,
+ Set<Lock> lockTokens, boolean keepLocks)
+ throws ClientException
+ {
+ return getCommitEditor(revisionProperties, commitCallback,
+ lockTokens, keepLocks, null, null, null);
+ }
+
public long getFile(long revision, String path,
OutputStream contents,
Map<String, byte[]> properties)
@@ -197,10 +220,77 @@ public class RemoteSession extends JNIOb
public native NodeKind checkPath(String path, long revision)
throws ClientException;
- // TODO: stat
- // TODO: getLocations
- // TODO: getLocationSegments
- // TODO: getFileRevisions
+ public native DirEntry stat(String path, long revision)
+ throws ClientException;
+
+ public native Map<Long, String>
+ getLocations(String path, long pegRevision,
+ Iterable<Long> locationRevisions)
+ throws ClientException;
+
+ public native
+ void getLocationSegments(String path,
+ long pegRevision,
+ long startRevision,
+ long endRevision,
+ RemoteLocationSegmentsCallback handler)
+ throws ClientException;
+
+ private static class GetLocationSegmentsHandler
+ implements RemoteLocationSegmentsCallback
+ {
+ public List<LocationSegment> locationSegments = null;
+ public void doSegment(LocationSegment locationSegment)
+ {
+ if (locationSegments == null)
+ locationSegments = new ArrayList<LocationSegment>();
+ locationSegments.add(locationSegment);
+ }
+ }
+
+ public List<LocationSegment> getLocationSegments(String path,
+ long pegRevision,
+ long startRevision,
+ long endRevision)
+ throws ClientException
+ {
+ final GetLocationSegmentsHandler handler = new GetLocationSegmentsHandler();
+ getLocationSegments(path, pegRevision, startRevision, endRevision, handler);
+ return handler.locationSegments;
+ }
+
+ public native
+ void getFileRevisions(String path,
+ long startRevision,
+ long endRevision,
+ boolean includeMergedRevisions,
+ RemoteFileRevisionsCallback handler)
+ throws ClientException;
+
+ private static class GetFileRevisionsHandler
+ implements RemoteFileRevisionsCallback
+ {
+ public List<FileRevision> fileRevisions = null;
+ public void doRevision(FileRevision fileRevision)
+ {
+ if (fileRevisions == null)
+ fileRevisions = new ArrayList<FileRevision>();
+ fileRevisions.add(fileRevision);
+ }
+ }
+
+ public List<FileRevision> getFileRevisions(String path,
+ long startRevision,
+ long endRevision,
+ boolean includeMergedRevisions)
+ throws ClientException
+ {
+ final GetFileRevisionsHandler handler = new GetFileRevisionsHandler();
+ getFileRevisions(path, startRevision, endRevision,
+ includeMergedRevisions, handler);
+ return handler.fileRevisions;
+ }
+
// TODO: lock
// TODO: unlock
// TODO: getLock
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/remote/StateReporter.java Wed Nov 27 11:52:35 2013
@@ -29,6 +29,7 @@ import org.apache.subversion.javahl.call
import org.apache.subversion.javahl.JNIObject;
import org.apache.subversion.javahl.ISVNReporter;
import org.apache.subversion.javahl.ClientException;
+import org.apache.subversion.javahl.NativeResources;
/**
* Implementation of ISVNReporter.
@@ -36,6 +37,14 @@ import org.apache.subversion.javahl.Clie
*/
public class StateReporter extends JNIObject implements ISVNReporter
{
+ /**
+ * Load the required native library.
+ */
+ static
+ {
+ NativeResources.loadNativeLibrary();
+ }
+
public void dispose()
{
session.disposeReporter(this);
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/ChangePath.java Wed Nov 27 11:52:35 2013
@@ -25,13 +25,9 @@ package org.apache.subversion.javahl.typ
public class ChangePath implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 2L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Checksum.java Wed Nov 27 11:52:35 2013
@@ -25,13 +25,9 @@ package org.apache.subversion.javahl.typ
public class Checksum implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/CopySource.java Wed Nov 27 11:52:35 2013
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl.typ
*/
public class CopySource implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/DirEntry.java Wed Nov 27 11:52:35 2013
@@ -32,13 +32,9 @@ import org.apache.subversion.javahl.ISVN
*/
public class DirEntry implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Info.java Wed Nov 27 11:52:35 2013
@@ -35,13 +35,9 @@ import org.apache.subversion.javahl.ISVN
*/
public class Info implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Lock.java Wed Nov 27 11:52:35 2013
@@ -31,13 +31,9 @@ import java.util.Date;
*/
public class Lock implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Mergeinfo.java Wed Nov 27 11:52:35 2013
@@ -37,13 +37,9 @@ import org.apache.subversion.javahl.Subv
*/
public class Mergeinfo implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
@@ -108,6 +104,11 @@ public class Mergeinfo implements java.i
addRevisionRange(mergeSrc, range);
}
+ public void addRevisions(String mergeSrc, RevisionRangeList ranges)
+ {
+ addRevisions(mergeSrc, ranges.getRanges());
+ }
+
/**
* Add a revision range to the merged revisions for a path. If
* the merge source already has associated revision ranges, add
@@ -156,6 +157,14 @@ public class Mergeinfo implements java.i
}
/**
+ * Like {@link #getReivsionRange}, but returns a {@link RevisionRangeList}.
+ */
+ public RevisionRangeList getRevisionRangeList(String mergeSrc)
+ {
+ return new RevisionRangeList(getRevisionRange(mergeSrc));
+ }
+
+ /**
* Parse the <code>svn:mergeinfo</code> property to populate the
* merge source URLs and revision ranges of this instance.
* @param mergeinfo <code>svn:mergeinfo</code> property value.
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Revision.java Wed Nov 27 11:52:35 2013
@@ -32,13 +32,9 @@ import java.util.Locale;
*/
public class Revision implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 1L;
/**
@@ -81,6 +77,7 @@ public class Revision implements java.io
case head : return "HEAD";
case previous : return "PREV";
case working : return "WORKING";
+ case unspecified: return "UNSPECIFIED";
}
return super.toString();
}
@@ -155,6 +152,11 @@ public class Revision implements java.io
public static final Revision START = new Revision(Kind.unspecified);
/**
+ * unspecified revision
+ */
+ public static final Revision UNSPECIFIED = START;
+
+ /**
* last committed revision, needs working copy
*/
public static final Revision COMMITTED = new Revision(Kind.committed);
@@ -271,6 +273,16 @@ public class Revision implements java.io
throw new IllegalArgumentException("a date must be specified");
revDate = date;
}
+
+ /**
+ * Create a revision from a timestamp in milliseconds.
+ * Used by the native implementaiton.
+ */
+ private DateSpec(long milliseconds)
+ {
+ this(new Date(milliseconds));
+ }
+
/**
* Returns the date of the revision
* @return the date
@@ -310,7 +322,6 @@ public class Revision implements java.io
{
return revDate.hashCode();
}
-
}
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java Wed Nov 27 11:52:35 2013
@@ -29,13 +29,9 @@ package org.apache.subversion.javahl.typ
*/
public class RevisionRange implements Comparable<RevisionRange>, java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 2L;
private Revision from;
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Status.java Wed Nov 27 11:52:35 2013
@@ -35,13 +35,9 @@ import org.apache.subversion.javahl.Conf
*/
public class Status implements java.io.Serializable
{
- // Update the serialVersionUID when there is a incompatible change
- // made to this class. See any of the following, depending upon
- // the Java release.
- // http://java.sun.com/j2se/1.3/docs/guide/serialization/spec/version.doc7.html
- // http://java.sun.com/j2se/1.4/pdf/serial-spec.pdf
- // http://java.sun.com/j2se/1.5.0/docs/guide/serialization/spec/version.html#6678
- // http://java.sun.com/javase/6/docs/platform/serialization/spec/version.html#6678
+ // Update the serialVersionUID when there is a incompatible change made to
+ // this class. See the java documentation for when a change is incompatible.
+ // http://java.sun.com/javase/7/docs/platform/serialization/spec/version.html#6678
private static final long serialVersionUID = 2L;
/**
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/Version.java Wed Nov 27 11:52:35 2013
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl.types;
+import org.apache.subversion.javahl.NativeResources;
+
/**
* Encapsulates version information about the underlying native
* libraries. Basically a wrapper for <a
@@ -31,6 +33,14 @@ package org.apache.subversion.javahl.typ
public class Version
{
/**
+ * Load the required native library.
+ */
+ static
+ {
+ NativeResources.loadNativeLibrary();
+ }
+
+ /**
* @return The full version string for the loaded JavaHL library,
* as defined by <code>MAJOR.MINOR.PATCH INFO</code>.
*/
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/VersionExtended.java Wed Nov 27 11:52:35 2013
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl.types;
+import org.apache.subversion.javahl.NativeResources;
+
/**
* Encapsulates information about the compile-time and run-time
* properties of the Subversion libraries.
@@ -31,6 +33,14 @@ package org.apache.subversion.javahl.typ
public class VersionExtended
{
/**
+ * Load the required native library.
+ */
+ static
+ {
+ NativeResources.loadNativeLibrary();
+ }
+
+ /**
* @return The date when the libsvn_subr library was compiled, in
* the format defined by the C standard macro #__DATE__.
*/
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/src/org/tigris/subversion/javahl/Path.java Wed Nov 27 11:52:35 2013
@@ -31,14 +31,6 @@ package org.tigris.subversion.javahl;
public class Path
{
/**
- * Load the required native library.
- */
- static
- {
- org.apache.subversion.javahl.NativeResources.loadNativeLibrary();
- }
-
- /**
* A valid path is a UTF-8 string without any control characters.
*
* @return Whether Subversion can store the path in a repository.
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java Wed Nov 27 11:52:35 2013
@@ -33,6 +33,9 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.nio.channels.ReadableByteChannel;
+import java.nio.channels.WritableByteChannel;
import java.text.ParseException;
import java.util.Collection;
import java.util.Arrays;
@@ -216,6 +219,33 @@ public class BasicTests extends SVNTests
}
/**
+ * Test RuntimeVersion
+ */
+ public void testRuntimeVersion() throws Throwable
+ {
+ try
+ {
+ RuntimeVersion runtimeVersion = client.getRuntimeVersion();
+ String versionString = runtimeVersion.toString();
+ if (versionString == null || versionString.trim().length() == 0)
+ {
+ throw new Exception("Version string empty");
+ }
+ }
+ catch (Exception e)
+ {
+ fail("RuntimeVersion should always be available unless the " +
+ "native libraries failed to initialize: " + e);
+ }
+
+ RuntimeVersion runtimeVersion = client.getRuntimeVersion();
+ Version version = client.getVersion();
+ assertTrue(runtimeVersion.getMajor() > version.getMajor()
+ || (runtimeVersion.getMajor() == version.getMajor()
+ && runtimeVersion.getMinor() >= version.getMinor()));
+ }
+
+ /**
* Test the JNIError class functionality
* @throws Throwable
*/
@@ -1055,6 +1085,37 @@ public class BasicTests extends SVNTests
}
/**
+ * Check that half a move cannot be committed.
+ * @since 1.9
+ */
+ public void testCommitPartialMove() throws Throwable
+ {
+ OneTest thisTest = new OneTest();
+ String root = thisTest.getWorkingCopy().getAbsolutePath();
+ ClientException caught = null;
+
+ Set<String> srcPaths = new HashSet<String>(1);
+ srcPaths.add(root + "/A/B/E/alpha");
+ client.move(srcPaths, root + "/moved-alpha",
+ false, false, false, false, false, null, null, null);
+
+ try {
+ client.commit(srcPaths, Depth.infinity, false, false, null, null,
+ new ConstMsg("Commit half of a move"), null);
+ } catch (ClientException ex) {
+ caught = ex;
+ }
+
+ assertNotNull("Commit of partial move did not fail", caught);
+
+ List<ClientException.ErrorMessage> msgs = caught.getAllMessages();
+ assertTrue(msgs.size() >= 3);
+ assertTrue(msgs.get(0).getMessage().startsWith("Illegal target"));
+ assertTrue(msgs.get(1).getMessage().startsWith("Commit failed"));
+ assertTrue(msgs.get(2).getMessage().startsWith("Cannot commit"));
+ }
+
+ /**
* Assert that the first merge source suggested for
* <code>destPath</code> at {@link Revision#WORKING} and {@link
* Revision#HEAD} is equivalent to <code>expectedSrc</code>.
@@ -2316,7 +2377,7 @@ public class BasicTests extends SVNTests
List<RevisionRange> ranges = mergeInfo.getRevisions(mergeSrc);
assertTrue("Missing merge info for source '" + mergeSrc + "' on '" +
targetPath + '\'', ranges != null && !ranges.isEmpty());
- RevisionRange range = (RevisionRange) ranges.get(0);
+ RevisionRange range = ranges.get(0);
String expectedMergedRevs = expectedMergeStart + "-" + expectedMergeEnd;
assertEquals("Unexpected first merged revision range for '" +
mergeSrc + "' on '" + targetPath + '\'',
@@ -2579,6 +2640,7 @@ public class BasicTests extends SVNTests
* @throws Throwable
* @since 1.5
*/
+ @SuppressWarnings("deprecation")
public void testMergeReintegrate() throws Throwable
{
OneTest thisTest = setupAndPerformMerge();
@@ -3235,7 +3297,7 @@ public class BasicTests extends SVNTests
// Rigorously inspect one of our DiffSummary notifications.
final String BETA_PATH = "A/B/E/beta";
- DiffSummary betaDiff = (DiffSummary) summaries.get(BETA_PATH);
+ DiffSummary betaDiff = summaries.get(BETA_PATH);
assertNotNull("No diff summary for " + BETA_PATH, betaDiff);
assertEquals("Incorrect path for " + BETA_PATH, BETA_PATH,
betaDiff.getPath());
@@ -3744,6 +3806,139 @@ public class BasicTests extends SVNTests
}
/**
+ * Test RevisionRangeList.remove
+ */
+ public void testRevisionRangeListRemove() throws Throwable
+ {
+ RevisionRangeList ranges =
+ new RevisionRangeList(new ArrayList<RevisionRange>());
+ ranges.getRanges()
+ .add(new RevisionRange(Revision.getInstance(1),
+ Revision.getInstance(5),
+ true));
+ ranges.getRanges()
+ .add(new RevisionRange(Revision.getInstance(7),
+ Revision.getInstance(9),
+ false));
+ RevisionRangeList eraser =
+ new RevisionRangeList(new ArrayList<RevisionRange>());
+ eraser.getRanges()
+ .add(new RevisionRange(Revision.getInstance(7),
+ Revision.getInstance(9),
+ true));
+
+ List<RevisionRange> result = ranges.remove(eraser, true).getRanges();
+ assertEquals(2, ranges.getRanges().size());
+ assertEquals(1, eraser.getRanges().size());
+ assertEquals(2, result.size());
+
+ result = ranges.remove(eraser.getRanges(), false);
+ assertEquals(2, ranges.getRanges().size());
+ assertEquals(1, eraser.getRanges().size());
+ assertEquals(1, result.size());
+ }
+
+ private class Tunnel extends Thread implements TunnelAgent
+ {
+ public boolean checkTunnel(String name)
+ {
+ return name.equals("test");
+ }
+
+ public void openTunnel(ReadableByteChannel request,
+ WritableByteChannel response,
+ String name, String user,
+ String hostname, int port)
+ {
+ this.request = request;
+ this.response = response;
+ start();
+ }
+
+ public void closeTunnel(String name, String user,
+ String hostname, int port)
+ throws Throwable
+ {
+ request.close();
+ join();
+ response.close();
+ }
+
+ private ReadableByteChannel request;
+ private WritableByteChannel response;
+
+ public void run()
+ {
+
+ int index = 0;
+ byte[] raw_data = new byte[1024];
+ ByteBuffer data = ByteBuffer.wrap(raw_data);
+ while(index < commands.length && request.isOpen()) {
+ try {
+ byte[] command = commands[index++];
+ response.write(ByteBuffer.wrap(command));
+ } catch (IOException ex) {
+ break;
+ }
+
+ try {
+ data.clear();
+ request.read(data);
+ } catch (Throwable ex) {}
+ }
+
+ try {
+ response.close();
+ request.close();
+ } catch (Throwable t) {}
+ }
+
+ private final byte[][] commands = new byte[][]{
+ // Initial capabilities negotiation
+ ("( success ( 2 2 ( ) " +
+ "( edit-pipeline svndiff1 absent-entries commit-revprops " +
+ "depth log-revprops atomic-revprops partial-replay " +
+ "inherited-props ephemeral-txnprops file-revs-reverse " +
+ ") ) ) ").getBytes(),
+
+ // Response for successful connection
+ ("( success ( ( ANONYMOUS EXTERNAL ) " +
+ "36:e3c8c113-03ba-4ec5-a8e6-8fc555e57b91 ) ) ").getBytes(),
+
+ // Response to authentication request
+ ("( success ( ) ) ( success ( " +
+ "36:e3c8c113-03ba-4ec5-a8e6-8fc555e57b91 " +
+ "24:svn+test://localhost/foo ( mergeinfo ) ) ) ").getBytes(),
+
+ // Response to revprop request
+ ("( success ( ( ) 0: ) ) ( success ( ( 4:fake ) ) ) ").getBytes()
+ };
+ }
+
+ /**
+ * Test tunnel handling.
+ */
+ public void testTunnelAgent() throws Throwable
+ {
+ byte[] revprop;
+ SVNClient cl = new SVNClient();
+ try {
+ cl.notification2(new MyNotifier());
+ cl.setPrompt(new DefaultPromptUserPassword());
+ cl.username(USERNAME);
+ cl.setProgressCallback(new DefaultProgressListener());
+ cl.setConfigDirectory(conf.getAbsolutePath());
+
+ cl.setTunnelAgent(new Tunnel());
+ revprop = cl.revProperty("svn+test://localhost/foo", "svn:log",
+ Revision.getInstance(0L));
+ } finally {
+ cl.dispose();
+ }
+ assertEquals("fake", new String(revprop));
+ }
+
+ /**
* @return <code>file</code> converted into a -- possibly
* <code>canonical</code>-ized -- Subversion-internal path
* representation.
@@ -3796,8 +3991,11 @@ public class BasicTests extends SVNTests
extends HashMap<String, Collection<String>>
implements ChangelistCallback
{
+ private static final long serialVersionUID = 1L;
+
public void doChangelist(String path, String changelist)
{
+ path = fileToSVNPath(new File(path), true);
if (super.containsKey(path))
{
// Append the changelist to the existing list
@@ -3969,8 +4167,8 @@ public class BasicTests extends SVNTests
{
final List<Info> infos = new ArrayList<Info>();
- client.info2(pathOrUrl, revision, pegRevision, depth, changelists,
- new InfoCallback () {
+ client.info2(pathOrUrl, revision, pegRevision, depth, true, true,
+ changelists, new InfoCallback () {
public void singleInfo(Info info)
{ infos.add(info); }
});
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/RunTests.java Wed Nov 27 11:52:35 2013
@@ -91,9 +91,10 @@ public class RunTests
if (testCases == null || testCases.length == 0)
{
// Add default test suites.
- suite.addTestSuite(SVNReposTests.class);
- suite.addTestSuite(SVNRemoteTests.class);
suite.addTestSuite(BasicTests.class);
+ suite.addTestSuite(UtilTests.class);
+ suite.addTestSuite(SVNRemoteTests.class);
+ suite.addTestSuite(SVNReposTests.class);
}
else
{
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java Wed Nov 27 11:52:35 2013
@@ -38,6 +38,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
import java.security.MessageDigest;
@@ -68,14 +69,12 @@ public class SVNRemoteTests extends SVNT
thisTest = new OneTest();
}
- public static ISVNRemote getSession(String url, String configDirectory,
- ConfigEvent configHandler)
+ public static ISVNRemote getSession(String url, String configDirectory)
{
try
{
RemoteFactory factory = new RemoteFactory();
factory.setConfigDirectory(configDirectory);
- factory.setConfigEventHandler(configHandler);
factory.setUsername(USERNAME);
factory.setPassword(PASSWORD);
factory.setPrompt(new DefaultPromptUserPassword());
@@ -92,7 +91,7 @@ public class SVNRemoteTests extends SVNT
private ISVNRemote getSession()
{
- return getSession(getTestRepoUrl(), super.conf.getAbsolutePath(), null);
+ return getSession(getTestRepoUrl(), super.conf.getAbsolutePath());
}
/**
@@ -111,9 +110,10 @@ public class SVNRemoteTests extends SVNT
try
{
session = new RemoteFactory(
- super.conf.getAbsolutePath(), null,
+ super.conf.getAbsolutePath(),
USERNAME, PASSWORD,
- new DefaultPromptUserPassword(), null)
+ new DefaultPromptUserPassword(),
+ null, null, null)
.openRemoteSession(getTestRepoUrl());
}
catch (ClientException ex)
@@ -130,6 +130,48 @@ public class SVNRemoteTests extends SVNT
session.dispose();
}
+ public void testSessionGC() throws Exception
+ {
+ int svnErrorCode = 0;
+ try {
+ try {
+ String prefix = getTestRepoUrl().substring(
+ 0, 1 + getTestRepoUrl().lastIndexOf("/"));
+ new RemoteFactory(
+ super.conf.getAbsolutePath(),
+ USERNAME, PASSWORD,
+ new DefaultPromptUserPassword(),
+ null, null, null)
+ .openRemoteSession(prefix + "repositorydoesnotexisthere");
+ }
+ finally
+ {
+ for(int i = 0; i < 100; i++)
+ {
+ Runtime.getRuntime().gc(); // GC should run finalize
+
+ // Do something
+ byte[] memEater = new byte[1024 * 1024];
+ Arrays.fill(memEater, (byte) i);
+
+ // Do some more javahl activity (this url is OK)
+ final ISVNRemote session = getSession();
+ session.getLatestRevision();
+ session.dispose();
+ }
+ }
+ }
+ catch (ClientException ex)
+ {
+ List<ClientException.ErrorMessage> msgs = ex.getAllMessages();
+ svnErrorCode = msgs.get(msgs.size() - 1).getCode();
+ }
+
+ assertTrue(svnErrorCode == 180001 // file:
+ || svnErrorCode == 210005 // svn:
+ || svnErrorCode == 2); // http:
+ }
+
public void testDatedRev() throws Exception
{
ISVNRemote session = getSession();
@@ -170,6 +212,20 @@ public class SVNRemoteTests extends SVNT
assertEquals(NodeKind.dir, kind);
}
+ public void testStat() throws Exception
+ {
+ ISVNRemote session = getSession();
+
+ DirEntry dirent = session.stat("iota", 1);
+ assertEquals(NodeKind.file, dirent.getNodeKind());
+
+ dirent = session.stat("iota", 0);
+ assertNull(dirent);
+
+ dirent = session.stat("A", 1);
+ assertEquals(NodeKind.dir, dirent.getNodeKind());
+ }
+
private String getTestRepoUrl()
{
return thisTest.getUrl().toASCIIString();
@@ -396,10 +452,13 @@ public class SVNRemoteTests extends SVNT
}
}
- private final class CommitContext implements CommitCallback
+ private static final class CommitContext implements CommitCallback
{
public final ISVNEditor editor;
- public CommitContext(ISVNRemote session, String logstr)
+ public CommitContext(ISVNRemote session, String logstr,
+ ISVNEditor.ProvideBaseCallback getBase,
+ ISVNEditor.ProvidePropsCallback getProps,
+ ISVNEditor.GetNodeKindCallback getKind)
throws ClientException
{
Charset UTF8 = Charset.forName("UTF-8");
@@ -408,7 +467,19 @@ public class SVNRemoteTests extends SVNT
: logstr.getBytes(UTF8));
HashMap<String, byte[]> revprops = new HashMap<String, byte[]>();
revprops.put("svn:log", log);
- editor = session.getCommitEditor(revprops, this, null, false);
+
+ // Run the getCommitEditor overloads through their paces, too.
+ if (getBase == null && getProps == null && getKind == null)
+ editor = session.getCommitEditor(revprops, this, null, false);
+ else
+ editor = session.getCommitEditor(revprops, this, null, false,
+ getBase, getProps, getKind);
+ }
+
+ public CommitContext(ISVNRemote session, String logstr)
+ throws ClientException
+ {
+ this(session, logstr, null, null, null);
}
public void commitInfo(CommitInfo info) { this.info = info; }
@@ -417,11 +488,67 @@ public class SVNRemoteTests extends SVNT
private CommitInfo info;
}
- public void testEditorCopy() throws Exception
+ private static final class EditorCallbacks
+ {
+ private final String wcpath;
+ private final long revision;
+ private final Map<String, byte[]> props;
+ private final NodeKind kind;
+
+ public EditorCallbacks(String wcpath, long revision,
+ Map<String, byte[]> props,
+ NodeKind kind)
+ {
+ this.wcpath = wcpath;
+ this.revision = revision;
+ this.props = props;
+ this.kind = kind;
+ }
+
+ public final ISVNEditor.ProvideBaseCallback getBase =
+ new ISVNEditor.ProvideBaseCallback()
+ {
+ public ISVNEditor.ProvideBaseCallback.ReturnValue
+ getContents(String relpath)
+ {
+ try {
+ return new ISVNEditor.ProvideBaseCallback.ReturnValue(
+ new FileInputStream(wcpath + relpath), revision);
+ } catch (java.io.FileNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ };
+
+ public final ISVNEditor.ProvidePropsCallback getProps =
+ new ISVNEditor.ProvidePropsCallback()
+ {
+ public ISVNEditor.ProvidePropsCallback.ReturnValue
+ getProperties(String relpath)
+ {
+ return new ISVNEditor.ProvidePropsCallback.ReturnValue(
+ props, revision);
+ }
+ };
+
+ public final ISVNEditor.GetNodeKindCallback getKind =
+ new ISVNEditor.GetNodeKindCallback()
+ {
+ public NodeKind getKind(String relpath, long revision)
+ {
+ return kind;
+ }
+ };
+ };
+
+ private void testEditorCopy(EditorCallbacks cb) throws Exception
{
ISVNRemote session = getSession();
CommitContext cc =
- new CommitContext(session, "Copy A/B/lambda -> A/B/omega");
+ (cb != null
+ ? new CommitContext(session, "Copy A/B/lambda -> A/B/omega",
+ cb.getBase, cb.getProps, cb.getKind)
+ : new CommitContext(session, "Copy A/B/lambda -> A/B/omega"));
try {
// FIXME: alter dir A/B first
@@ -442,6 +569,18 @@ public class SVNRemoteTests extends SVNT
Revision.SVN_INVALID_REVNUM));
}
+ public void testEditorCopy() throws Exception
+ {
+ testEditorCopy(null);
+ }
+
+ public void testEditorCopy_WithCallbacks() throws Exception
+ {
+ testEditorCopy(new EditorCallbacks(thisTest.getWCPath(), 1L,
+ new HashMap<String, byte[]>(),
+ NodeKind.file));
+ }
+
public void testEditorMove() throws Exception
{
ISVNRemote session = getSession();
@@ -525,7 +664,7 @@ public class SVNRemoteTests extends SVNT
Revision.SVN_INVALID_REVNUM));
}
- public void testEditorSetDirProps() throws Exception
+ private void testEditorSetDirProps(EditorCallbacks cb) throws Exception
{
Charset UTF8 = Charset.forName("UTF-8");
ISVNRemote session = getSession();
@@ -534,7 +673,11 @@ public class SVNRemoteTests extends SVNT
HashMap<String, byte[]> props = new HashMap<String, byte[]>();
props.put("svn:ignore", ignoreval);
- CommitContext cc = new CommitContext(session, "Add svn:ignore");
+ CommitContext cc =
+ (cb != null
+ ? new CommitContext(session, "Add svn:ignore",
+ cb.getBase, cb.getProps, cb.getKind)
+ : new CommitContext(session, "Add svn:ignore"));
try {
cc.editor.alterDirectory("", 1, null, props);
cc.editor.complete();
@@ -551,6 +694,18 @@ public class SVNRemoteTests extends SVNT
Revision.HEAD)));
}
+ public void testEditorSetDirProps() throws Exception
+ {
+ testEditorSetDirProps(null);
+ }
+
+ public void testEditorSetDirProps_WithCallbacks() throws Exception
+ {
+ testEditorSetDirProps(new EditorCallbacks(thisTest.getWCPath(), 1L,
+ new HashMap<String, byte[]>(),
+ NodeKind.dir));
+ }
+
private static byte[] SHA1(byte[] text) throws NoSuchAlgorithmException
{
MessageDigest md = MessageDigest.getInstance("SHA-1");
@@ -593,7 +748,54 @@ public class SVNRemoteTests extends SVNT
assertTrue(Arrays.equals(eolstyle, propval));
}
- public void testEditorSetFileContents() throws Exception
+ public void testEditorDeleteFileProps() throws Exception
+ {
+ Charset UTF8 = Charset.forName("UTF-8");
+ client.propertySetRemote(
+ thisTest.getUrl() + "/iota", 1L,
+ "name", "value".getBytes(UTF8),
+ new CommitMessageCallback() {
+ public String getLogMessage(Set<CommitItem> elements) {
+ return "Set property 'name' to 'value'";
+ }
+ }, false, null, null);
+
+ ISVNRemote session = getSession();
+ HashMap<String, byte[]> props = new HashMap<String, byte[]>();
+ assertEquals(2L, session.getFile(Revision.SVN_INVALID_REVNUM, "iota",
+ null, props));
+
+ int propcount = 0;
+ for (Map.Entry<String, byte[]> e : props.entrySet()) {
+ final String key = e.getKey();
+ if (key.startsWith("svn:entry:") || key.startsWith("svn:wc:"))
+ continue;
+ ++propcount;
+ }
+ assertEquals(1, propcount);
+
+ CommitContext cc = new CommitContext(session, "Remove all props");
+ try {
+ props.clear();
+ cc.editor.alterFile("iota", 2L, null, null, props);
+ cc.editor.complete();
+ } finally {
+ cc.editor.dispose();
+ }
+
+ assertEquals(3L, session.getFile(Revision.SVN_INVALID_REVNUM, "iota",
+ null, props));
+ propcount = 0;
+ for (Map.Entry<String, byte[]> e : props.entrySet()) {
+ final String key = e.getKey();
+ if (key.startsWith("svn:entry:") || key.startsWith("svn:wc:"))
+ continue;
+ ++propcount;
+ }
+ assertEquals(0, propcount);
+ }
+
+ private void testEditorSetFileContents(EditorCallbacks cb) throws Exception
{
Charset UTF8 = Charset.forName("UTF-8");
ISVNRemote session = getSession();
@@ -603,7 +805,10 @@ public class SVNRemoteTests extends SVNT
ByteArrayInputStream stream = new ByteArrayInputStream(contents);
CommitContext cc =
- new CommitContext(session, "Change contents of A/B/E/alpha");
+ (cb != null
+ ? new CommitContext(session, "Change contents of A/B/E/alpha",
+ cb.getBase, cb.getProps, cb.getKind)
+ : new CommitContext(session, "Change contents of A/B/E/alpha"));
try {
cc.editor.alterFile("A/B/E/alpha", 1, hash, stream, null);
cc.editor.complete();
@@ -619,47 +824,17 @@ public class SVNRemoteTests extends SVNT
assertTrue(Arrays.equals(contents, checkcontents.toByteArray()));
}
- // public void testEditorRotate() throws Exception
- // {
- // ISVNRemote session = getSession();
- //
- // ArrayList<ISVNEditor.RotatePair> rotation =
- // new ArrayList<ISVNEditor.RotatePair>(3);
- // rotation.add(new ISVNEditor.RotatePair("A/B", 1));
- // rotation.add(new ISVNEditor.RotatePair("A/C", 1));
- // rotation.add(new ISVNEditor.RotatePair("A/D", 1));
- //
- // CommitContext cc =
- // new CommitContext(session, "Rotate A/B -> A/C -> A/D");
- // try {
- // // No alter-dir of A is needed, children remain the same.
- // cc.editor.rotate(rotation);
- // cc.editor.complete();
- // } finally {
- // cc.editor.dispose();
- // }
- //
- // assertEquals(2, cc.getRevision());
- // assertEquals(2, session.getLatestRevision());
- //
- // HashMap<String, DirEntry> dirents = new HashMap<String, DirEntry>();
- // HashMap<String, byte[]> properties = new HashMap<String, byte[]>();
- //
- // // A/B is now what used to be A/D, so A/B/H must exist
- // session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/B",
- // DirEntry.Fields.all, dirents, properties);
- // assertEquals(dirents.get("H").getPath(), "H");
- //
- // // A/C is now what used to be A/B, so A/C/F must exist
- // session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/C",
- // DirEntry.Fields.all, dirents, properties);
- // assertEquals(dirents.get("F").getPath(), "F");
- //
- // // A/D is now what used to be A/C and must be empty
- // session.getDirectory(Revision.SVN_INVALID_REVNUM, "A/D",
- // DirEntry.Fields.all, dirents, properties);
- // assertTrue(dirents.isEmpty());
- // }
+ public void testEditorSetFileContents() throws Exception
+ {
+ testEditorSetFileContents(null);
+ }
+
+ public void testEditorSetFileContents_WithCallbacks() throws Exception
+ {
+ testEditorSetFileContents(new EditorCallbacks(thisTest.getWCPath(), 1L,
+ new HashMap<String, byte[]>(),
+ NodeKind.file));
+ }
// Sanity check so that we don't forget about unimplemented methods.
public void testEditorNotImplemented() throws Exception
@@ -690,13 +865,6 @@ public class SVNRemoteTests extends SVNT
}
assertEquals("Not implemented: CommitEditor.alterSymlink", exmsg);
- // try {
- // exmsg = "";
- // cc.editor.rotate(rotation);
- // } catch (RuntimeException ex) {
- // exmsg = ex.getMessage();
- // }
- // assertEquals("Not implemented: CommitEditor.rotate", exmsg);
} finally {
cc.editor.dispose();
}
@@ -794,12 +962,24 @@ public class SVNRemoteTests extends SVNT
cat.enumerate(sec, en);
}
}
+
};
- ISVNRemote session = getSession(getTestRepoUrl(),
- super.conf.getAbsolutePath(),
- handler);
- session.getLatestRevision(); // Make sure the configuration gets loaded
+ ISVNRemote session;
+ try
+ {
+ session = new RemoteFactory(
+ super.conf.getAbsolutePath(),
+ USERNAME, PASSWORD,
+ new DefaultPromptUserPassword(),
+ null, handler, null)
+ .openRemoteSession(getTestRepoUrl());
+ }
+ catch (ClientException ex)
+ {
+ throw new RuntimeException(ex);
+ }
+ session.getLatestRevision();
}
private static class RemoteStatusReceiver implements RemoteStatus
@@ -1083,4 +1263,47 @@ public class SVNRemoteTests extends SVNT
assertEquals(1, ranges.size());
assertEquals("1-3", ranges.get(0).toString());
}
+
+ public void testGetLocations() throws Exception
+ {
+ ISVNRemote session = getSession();
+
+ Long expected = new Long(1L);
+ ArrayList<Long> revs = new ArrayList<Long>(3);
+ revs.add(new Long(0L));
+ revs.add(expected);
+
+ Map<Long, String> locs = session.getLocations("A", 1, revs);
+
+ assertEquals(1, locs.size());
+ assertTrue(locs.containsKey(expected));
+ assertEquals("/A", locs.get(expected));
+ }
+
+ public void testGetLocationSegments() throws Exception
+ {
+ ISVNRemote session = getSession();
+
+ List<ISVNRemote.LocationSegment> result =
+ session.getLocationSegments("A", 1,
+ Revision.SVN_INVALID_REVNUM,
+ Revision.SVN_INVALID_REVNUM);
+ assertEquals(1, result.size());
+ ISVNRemote.LocationSegment seg = result.get(0);
+ assertEquals("A", seg.getPath());
+ assertEquals(1, seg.getStartRevision());
+ assertEquals(1, seg.getEndRevision());
+ }
+
+ public void testGetFileRevisions() throws Exception
+ {
+ ISVNRemote session = getSession();
+
+ List<ISVNRemote.FileRevision> result =
+ session.getFileRevisions("iota", 0, 1, true);
+ assertEquals(1, result.size());
+ ISVNRemote.FileRevision rev = result.get(0);
+ assertEquals("/iota", rev.getPath());
+ assertFalse(rev.isResultOfMerge());
+ }
}
Modified: subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1546002&r1=1546001&r2=1546002&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/verify-keep-going/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Wed Nov 27 11:52:35 2013
@@ -173,6 +173,17 @@ class SVNTests extends TestCase
private void init()
{
+ String disableCredStore = System.getProperty("test.disablecredstore");
+ if (disableCredStore != null)
+ {
+ try {
+ SVNUtil.disableNativeCredentialsStore();
+ } catch(Throwable ex) {
+ System.err.println("*** ERROR: Could not disable" +
+ " the native credentials store");
+ }
+ }
+
// if not already set, get a usefull value for rootDir
if (rootDirectoryName == null)
rootDirectoryName = System.getProperty("test.rootdir");
@@ -344,7 +355,7 @@ class SVNTests extends TestCase
}
}
- private static class DefaultProgressListener implements ProgressCallback
+ protected static class DefaultProgressListener implements ProgressCallback
{
public void onProgress(ProgressEvent event)
@@ -916,7 +927,7 @@ class SVNTests extends TestCase
public Status[] getStatusArray()
{
- return (Status[]) statuses.toArray(new Status[statuses.size()]);
+ return statuses.toArray(new Status[statuses.size()]);
}
}
}