Author: echatellier Date: 2012-06-27 11:58:40 +0200 (Wed, 27 Jun 2012) New Revision: 3706 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3706 Log: Update to svnkit-1.7.5 and remove hack Modified: branches/4.0.1/pom.xml branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2012-06-07 12:54:19 UTC (rev 3705) +++ branches/4.0.1/pom.xml 2012-06-27 09:58:40 UTC (rev 3706) @@ -379,7 +379,7 @@ <dependency> <groupId>org.tmatesoft.svnkit</groupId> <artifactId>svnkit</artifactId> - <version>1.7.4-v1</version> + <version>1.7.5</version> <scope>compile</scope> </dependency> <!-- fin svnkit pour communication subversion --> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2012-06-07 12:54:19 UTC (rev 3705) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2012-06-27 09:58:40 UTC (rev 3706) @@ -965,27 +965,8 @@ try { SVNStatusClient statusClient = getSVNManager().getStatusClient(); - - // TODO echatellier 20120606 broken since 1.7.4, but code is ok - //SVNStatus status = statusClient.doStatus(localFile, true /*remote*/); - final SVNStatus[] result = new SVNStatus[] {null}; - final File absPath = localFile.getAbsoluteFile(); - ISVNStatusHandler handler = new ISVNStatusHandler() { - public void handleStatus(SVNStatus status) { - if (absPath.equals(status.getFile())) { - if (result[0] != null && result[0].getContentsStatus() == SVNStatusType.STATUS_EXTERNAL && absPath.isDirectory()) { - result[0] = status; - result[0].markExternal(); - } else if (result[0] == null) { - result[0] = status; - } - } - } - }; - statusClient.doStatus(absPath, SVNRevision.HEAD, SVNDepth.IMMEDIATES, true, true, true, false, handler, null); - // end svnkit code copy - SVNStatus status = result[0]; + SVNStatus status = statusClient.doStatus(localFile, true /*remote*/); SVNStatusType localStatus = status.getNodeStatus(); SVNStatusType remoteStatus = status.getRemoteNodeStatus(); @@ -1036,27 +1017,7 @@ try { SVNStatusClient statusClient = getSVNManager().getStatusClient(); - // TODO echatellier 20120606 broken since 1.7.4, but code is ok - //SVNStatus status = statusClient.doStatus(localFile, true /*remote*/); - final SVNStatus[] result = new SVNStatus[] {null}; - final File absPath = localFile.getAbsoluteFile(); - ISVNStatusHandler handler = new ISVNStatusHandler() { - public void handleStatus(SVNStatus status) { - if (absPath.equals(status.getFile())) { - if (result[0] != null && result[0].getContentsStatus() == SVNStatusType.STATUS_EXTERNAL && absPath.isDirectory()) { - result[0] = status; - result[0].markExternal(); - } else if (result[0] == null) { - result[0] = status; - } - } - } - }; - statusClient.doStatus(absPath, SVNRevision.HEAD, SVNDepth.IMMEDIATES, true, true, true, false, handler, null); - // end svnkit code copy - - SVNStatus status = result[0]; - + SVNStatus status = statusClient.doStatus(localFile, true /*remote*/); SVNStatusType localStatus = status.getNodeStatus(); SVNStatusType remoteStatus = status.getRemoteNodeStatus();