You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2013/03/15 18:28:31 UTC
svn commit: r1457028 - in
/subversion/trunk/subversion/bindings/javahl/src/org:
apache/subversion/javahl/ISVNClient.java
apache/subversion/javahl/SVNClient.java
tigris/subversion/javahl/SVNClient.java
Author: philip
Date: Fri Mar 15 17:28:31 2013
New Revision: 1457028
URL: http://svn.apache.org/r1457028
Log:
Overload move to allow new parameters in 1.8 while retaining the 1.7 API.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
(ISVNClient.move): Add overload.
* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
(SVNClient.move): Add overload.
* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java
(SVNClient.move): Call backward compatible interface.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.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
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=1457028&r1=1457027&r2=1457028&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 Fri Mar 15 17:28:31 2013
@@ -332,6 +332,7 @@ public interface ISVNClient
* @param handler the commit message callback, may be <code>null</code>
* if <code>destPath</code> is not a URL
* @throws ClientException If the move operation fails.
+ * @since 1.8
*/
void move(Set<String> srcPaths, String destPath, boolean force,
boolean moveAsChild, boolean makeParents, boolean metadataOnly,
@@ -340,6 +341,16 @@ public interface ISVNClient
throws ClientException;
/**
+ * @deprecated Provided for backward compatibility with 1.7. Passes
+ * metadataOnly false and allowMixRev true.
+ */
+ void move(Set<String> srcPaths, String destPath, boolean force,
+ boolean moveAsChild, boolean makeParents,
+ Map<String, String> revpropTable,
+ CommitMessageCallback handler, CommitCallback callback)
+ throws ClientException;
+
+ /**
* Creates a directory directly in a repository or creates a
* directory on disk and schedules it for addition.
* @param path directories to be created
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=1457028&r1=1457027&r2=1457028&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 Fri Mar 15 17:28:31 2013
@@ -212,6 +212,17 @@ public class SVNClient implements ISVNCl
CommitMessageCallback handler, CommitCallback callback)
throws ClientException;
+ public void move(Set<String> srcPaths, String destPath,
+ boolean force, boolean moveAsChild,
+ boolean makeParents,
+ Map<String, String> revpropTable,
+ CommitMessageCallback handler, CommitCallback callback)
+ throws ClientException
+ {
+ move(srcPaths, destPath, force, moveAsChild, makeParents, false, true,
+ revpropTable, handler, callback);
+ }
+
public native void mkdir(Set<String> paths, boolean makeParents,
Map<String, String> revpropTable,
CommitMessageCallback handler, CommitCallback callback)
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=1457028&r1=1457027&r2=1457028&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 Fri Mar 15 17:28:31 2013
@@ -1071,8 +1071,6 @@ public class SVNClient implements SVNCli
{
aSVNClient.move(new HashSet<String>(Arrays.asList(srcPaths)),
destPath, force, moveAsChild, makeParents,
- false /* metadataOnly */,
- true /* allowMixRev */,
revpropTable,
message == null ? cachedHandler
: new ConstMsg(message),