Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #77 from daniel-beck/JENKINS-18099
[FIXED JENKINS-18099] Fix global revprop exclusion option
  • Loading branch information
kutzi committed May 11, 2014
2 parents 29d25bd + 73a3c62 commit 7ad38ec
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 10 deletions.
15 changes: 14 additions & 1 deletion src/main/java/hudson/scm/SubversionSCM.java
Expand Up @@ -163,6 +163,8 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.Chmod;
import org.kohsuke.accmod.Restricted;
import org.kohsuke.accmod.restrictions.NoExternalUse;
import org.kohsuke.stapler.AncestorInPath;
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.QueryParameter;
Expand Down Expand Up @@ -636,6 +638,12 @@ public String getExcludedRevprop() {
return excludedRevprop;
}

private String getExcludedRevpropNormalized() {
String s = fixEmptyAndTrim(getExcludedRevprop());
if (s!=null) return s;
return getDescriptor().getGlobalExcludedRevprop();
}

@Exported
public String getExcludedCommitMessages() {
return excludedCommitMessages;
Expand Down Expand Up @@ -1409,7 +1417,7 @@ else if (project.getLastBuild()!=null) {

public SVNLogFilter createSVNLogFilter() {
return new DefaultSVNLogFilter(getExcludedRegionsPatterns(), getIncludedRegionsPatterns(),
getExcludedUsersNormalized(), getExcludedRevprop(), getExcludedCommitMessagesPatterns(), isIgnoreDirPropChanges());
getExcludedUsersNormalized(), getExcludedRevpropNormalized(), getExcludedCommitMessagesPatterns(), isIgnoreDirPropChanges());
}

/**
Expand Down Expand Up @@ -2098,6 +2106,11 @@ public String getDisplayName() {
return "Subversion";
}

@Restricted(NoExternalUse.class)
void setGlobalExcludedRevprop(String revprop) {
globalExcludedRevprop = revprop;
}

public String getGlobalExcludedRevprop() {
return globalExcludedRevprop;
}
Expand Down
32 changes: 23 additions & 9 deletions src/test/java/hudson/scm/DefaultSVNLogFilterTest.java
@@ -1,18 +1,13 @@
package hudson.scm;

import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.regex.Pattern;

import hudson.scm.subversion.UpdateUpdater;
import org.jvnet.hudson.test.Bug;
import org.jvnet.hudson.test.HudsonHomeLoader.CopyExisting;
import org.tmatesoft.svn.core.ISVNLogEntryHandler;
import org.tmatesoft.svn.core.SVNException;
import org.tmatesoft.svn.core.SVNLogEntry;
import org.tmatesoft.svn.core.SVNURL;
import org.tmatesoft.svn.core.*;
import org.tmatesoft.svn.core.io.SVNRepository;
import org.tmatesoft.svn.core.wc.SVNClientManager;

Expand Down Expand Up @@ -153,4 +148,23 @@ public void testExcludedDirPropChanges() throws Exception {
List<SVNLogEntry> entries = doFilter(filter);
assertTrue(containsRevs(entries, 1, 2, 3));
}

@Bug(18099)
public void testGlobalExclusionRevprop() throws Exception {
SubversionSCM scm = new SubversionSCM(
Arrays.asList(new SubversionSCM.ModuleLocation("file://some/repo", ".")),
new UpdateUpdater(), null, null, null, null, null, null, false);
scm.getDescriptor().setGlobalExcludedRevprop("ignoreme");

SVNProperties p = new SVNProperties();
p.put("ignoreme", "*");

Map<String, SVNLogEntryPath> paths = new HashMap<String, SVNLogEntryPath>();
paths.put("/foo", new SVNLogEntryPath("/foo", SVNLogEntryPath.TYPE_MODIFIED, null, -1));
SVNLogEntry e = new SVNLogEntry(paths, 1234L, p, false);

SVNLogFilter filter = scm.createSVNLogFilter();
assertFalse(filter.isIncluded(e));
}

}

0 comments on commit 7ad38ec

Please sign in to comment.