[40559] trunk/hudson/plugins/subversion/src/main/java/hudson/scm/ listtagsparameter/ListSubversionTagsParameterDefinition.java: [ JENKINS-11933] tags and branches are now listed correctly with 1.7

Tue, 08 May 2012 10:21:09 -0700

Title: [40559] trunk/hudson/plugins/subversion/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java: [JENKINS-11933] tags and branches are now listed correctly with 1.7
Revision
40559
Author
kohsuke
Date
2012-05-08 13:21:05 -0400 (Tue, 08 May 2012)

Log Message

[JENKINS-11933] tags and branches are now listed correctly with 1.7

This works around http://issues.tmatesoft.com/issue/SVNKIT-248


Modified Paths

Diff

Modified: trunk/hudson/plugins/subversion/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java (40558 => 40559)


--- trunk/hudson/plugins/subversion/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java	2012-05-08 17:06:39 UTC (rev 40558)
+++ trunk/hudson/plugins/subversion/src/main/java/hudson/scm/listtagsparameter/ListSubversionTagsParameterDefinition.java	2012-05-08 17:21:05 UTC (rev 40559)
@@ -48,6 +48,7 @@
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.QueryParameter;
 import org.kohsuke.stapler.StaplerRequest;
+import org.tmatesoft.svn.core.SVNDepth;
 import org.tmatesoft.svn.core.SVNDirEntry;
 import org.tmatesoft.svn.core.SVNException;
 import org.tmatesoft.svn.core.SVNURL;
@@ -191,7 +192,7 @@
       if (isSVNRepositoryProjectRoot(repo)) {
         dirs = this.getSVNRootRepoDirectories(logClient, repoURL);
       } else {
-        logClient.doList(repoURL, SVNRevision.HEAD, SVNRevision.HEAD, false, false, dirEntryHandler);
+        logClient.doList(repoURL, SVNRevision.HEAD, SVNRevision.HEAD, false, SVNDepth.IMMEDIATES, SVNDirEntry.DIRENT_ALL, dirEntryHandler);
         dirs = dirEntryHandler.getDirs(isReverseByDate(), isReverseByName());
       }
     }
@@ -305,7 +306,7 @@
     List<String> dirs = null;
     SVNURL branchesRepo = repoURL.appendPath(SVN_BRANCHES, true);
     SimpleSVNDirEntryHandler branchesEntryHandler = new SimpleSVNDirEntryHandler(null);
-    logClient.doList(branchesRepo, SVNRevision.HEAD, SVNRevision.HEAD, false, false, branchesEntryHandler);
+    logClient.doList(branchesRepo, SVNRevision.HEAD, SVNRevision.HEAD, false, SVNDepth.IMMEDIATES, SVNDirEntry.DIRENT_ALL, branchesEntryHandler);
     List<String> branches = branchesEntryHandler.getDirs(isReverseByDate(), isReverseByName());
     branches.remove(SVN_BRANCHES);
     appendTargetDir(SVN_BRANCHES, branches);
@@ -313,7 +314,7 @@
     // Get the tags repository contents
     SVNURL tagsRepo = repoURL.appendPath(SVN_TAGS, true);
     SimpleSVNDirEntryHandler tagsEntryHandler = new SimpleSVNDirEntryHandler(null);
-    logClient.doList(tagsRepo, SVNRevision.HEAD, SVNRevision.HEAD, false, false, tagsEntryHandler);
+    logClient.doList(tagsRepo, SVNRevision.HEAD, SVNRevision.HEAD, false, SVNDepth.IMMEDIATES, SVNDirEntry.DIRENT_ALL, tagsEntryHandler);
     List<String> tags = tagsEntryHandler.getDirs(isReverseByDate(), isReverseByName());
     tags.remove(SVN_TAGS);
     appendTargetDir(SVN_TAGS, tags);

Reply via email to