Author: chatellier Date: 2011-06-09 10:01:12 +0000 (Thu, 09 Jun 2011) New Revision: 3371 Log: Remove svnkit 1.1 commented code Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-08 13:03:49 UTC (rev 3370) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2011-06-09 10:01:12 UTC (rev 3371) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2008 - 2010 Ifremer, CodeLutin + * Copyright (C) 2008 - 2011 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -521,10 +521,6 @@ File destDir = getLocalRepository(); destDir.mkdirs(); - // getSVNManager().getUpdateClient().doCheckout(source, destDir, null, - // SVNRevision.HEAD, recurse); - - // since svnkit 1.2 SVNUpdateClient updateClient = getSVNManager() .getUpdateClient(); long newRevision = updateClient.doCheckout(source, // SVNURL url @@ -640,12 +636,6 @@ } } }; - // getSVNManager().getStatusClient().doStatus(file, - // recurse, - // false, // on remote - // !acceptedStatusType.contains(SVNStatusType.STATUS_NORMAL), // report only change file, - // acceptedStatusType.contains(SVNStatusType.STATUS_IGNORED), // includeIgnored, - // handler); SVNStatusClient statusClient = getSVNManager().getStatusClient(); statusClient.doStatus(localFile, // File @@ -706,13 +696,6 @@ } }; - // getSVNManager().getStatusClient().doStatus(localFile, - // recurse, - // true, // on remote - // !acceptedStatusType.contains(SVNStatusType.STATUS_NORMAL), // report only change file, - // acceptedStatusType.contains(SVNStatusType.STATUS_IGNORED), // includeIgnored, - // handler); - SVNStatusClient statusClient = getSVNManager().getStatusClient(); statusClient.doStatus(localFile, // File path, SVNRevision.HEAD, // SVNRevision revision, @@ -1071,8 +1054,6 @@ update(localFile.getParentFile(), false); } - //getSVNManager().getUpdateClient().doUpdate(file, SVNRevision.HEAD, recurse); - SVNUpdateClient updateClient = getSVNManager() .getUpdateClient(); long newRevision = updateClient.doUpdate(localFile, // File file @@ -1093,8 +1074,6 @@ result.addAll(status.keySet()); // on supprime les conflits pour pouvoir commiter convenablement // les fichiers - //getSVNManager().getWCClient().doResolve(localFile, recurse); - // FIXME use conflit resolution choice ? SVNWCClient wcClient = getSVNManager().getWCClient(); wcClient.doResolve(localFile, // File file @@ -1212,10 +1191,7 @@ log.info(_("isisfish.vcs.vcssvn.settag.switchfromto", currentTag, tag)); } - //getSVNManager().getUpdateClient().doSwitch( - // localRoot, newUrl, SVNRevision.HEAD, true); - // svnkit 1.2 code SVNUpdateClient updateClient = getSVNManager() .getUpdateClient(); long newRevision = updateClient.doSwitch(localRoot, // File path @@ -1243,7 +1219,6 @@ filesInConflict.addAll(status.keySet()); // on supprime les conflits pour pouvoir commiter convenablement // les fichiers - //getSVNManager().getWCClient().doResolve(localFile, recurse); // FIXME use conflit resolution choice ? SVNWCClient wcClient = getSVNManager().getWCClient();