[JENKINS-21916] Use credentials on new branch

jenkinsci · Feb 25, 2014 · bec2aaa · bec2aaa
1 parent d1df604
commit bec2aaa
Showing 1 changed file with 22 additions and 14 deletions.
diff --git a/src/main/java/jenkins/plugins/svnmerge/IntegratableProjectAction.java b/src/main/java/jenkins/plugins/svnmerge/IntegratableProjectAction.java
@@ -2,31 +2,34 @@
 
 import hudson.BulkChange;
 import hudson.Util;
+import hudson.model.Action;
 import hudson.model.AbstractModelObject;
 import hudson.model.AbstractProject;
-import hudson.model.Action;
+import hudson.scm.SvnClientManager;
 import hudson.scm.SCM;
 import hudson.scm.SubversionSCM;
 import hudson.scm.SubversionSCM.ModuleLocation;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.servlet.ServletException;
+
 import jenkins.model.Jenkins;
+
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNNodeKind;
 import org.tmatesoft.svn.core.SVNURL;
-import org.tmatesoft.svn.core.wc.SVNClientManager;
 import org.tmatesoft.svn.core.wc.SVNInfo;
 import org.tmatesoft.svn.core.wc.SVNRevision;
 
-import javax.servlet.ServletException;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 /**
  * Project-level {@link Action} that shows the feature branches.
  *
@@ -109,7 +112,8 @@ public void doNewBranch(StaplerRequest req, StaplerResponse rsp, @QueryParameter
         url = url.substring(0,m.start())+"/branches/"+name;
 
         if(!attach) {
-            SVNClientManager svnm = SubversionSCM.createSvnClientManager(project);
+            SvnClientManager svnm = SubversionSCM.createClientManager(
+            		svn.createAuthenticationProvider(project, firstLocation));
             try {
                 SVNURL dst = SVNURL.parseURIEncoded(url);
 
@@ -149,13 +153,17 @@ public void doNewBranch(StaplerRequest req, StaplerResponse rsp, @QueryParameter
             SubversionSCM svnScm = (SubversionSCM)copy.getScm();
             copy.setScm(
                     new SubversionSCM(
-                            Arrays.asList(new ModuleLocation(url,firstLocation.getLocalDir())),
-                                svnScm.getWorkspaceUpdater(), svnScm.getBrowser(),
+                            Arrays.asList(firstLocation.withRemote(url)),
+                                svnScm.getWorkspaceUpdater(),
+                                svnScm.getBrowser(),
                                 svnScm.getExcludedRegions(),
                                 svnScm.getExcludedUsers(),
                                 svnScm.getExcludedRevprop(),
                                 svnScm.getExcludedCommitMessages(),
-                                svnScm.getIncludedRegions()
+                                svnScm.getIncludedRegions(),
+                                svnScm.isIgnoreDirPropChanges(),
+                                svnScm.isFilterChangelog(),
+                                svnScm.getAdditionalCredentials()
                             ));
         } finally {
             bc.commit();