From 17151ea2b490b32e8557bffa8525bae1fbf2bd2a Mon Sep 17 00:00:00 2001 From: jglick Date: Wed, 17 Oct 2007 21:55:16 +0000 Subject: [PATCH] Reverting last patch. And penultimate was for issue #917, not #912. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@5305 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/scm/CVSSCM.java | 24 +++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/core/src/main/java/hudson/scm/CVSSCM.java b/core/src/main/java/hudson/scm/CVSSCM.java index d60197d1b2..f4cddf47d3 100644 --- a/core/src/main/java/hudson/scm/CVSSCM.java +++ b/core/src/main/java/hudson/scm/CVSSCM.java @@ -159,19 +159,17 @@ public class CVSSCM extends SCM implements Serializable { return workspace.child(getAllModulesNormalized()[0]); } -// until I understand better why this is causing an IOException in MecurialSCM -// CVSSCM will use the super method (i.e. only one module root) -// public FilePath[] getModuleRoots(FilePath workspace) { -// if (!flatten) { -// final String[] moduleLocations = getAllModulesNormalized(); -// FilePath[] moduleRoots = new FilePath[moduleLocations.length]; -// for (int i = 0; i < moduleLocations.length; i++) { -// moduleRoots[i] = workspace.child(moduleLocations[i]); -// } -// return moduleRoots; -// } -// return new FilePath[]{getModuleRoot(workspace)}; -// } + public FilePath[] getModuleRoots(FilePath workspace) { + if (!flatten) { + final String[] moduleLocations = getAllModulesNormalized(); + FilePath[] moduleRoots = new FilePath[moduleLocations.length]; + for (int i = 0; i < moduleLocations.length; i++) { + moduleRoots[i] = workspace.child(moduleLocations[i]); + } + return moduleRoots; + } + return new FilePath[]{getModuleRoot(workspace)}; + } public ChangeLogParser createChangeLogParser() { return new CVSChangeLogParser();