Skip to content

The Unified and Autonomous Development Platform

Fix various path matching issues

Robin Shena47636fbcf63
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java
index 2f4636a8e7..bc0aea9c7d 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java
@@ -88,7 +88,7 @@ public class ProjectDependency implements Serializable {
@Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve "
+ "into job workspace")
- @Patterns("suggestArtifacts")
+ @Patterns("getArtifactSuggestions")
@NotEmpty
public String getArtifacts() {
return artifacts;
@@ -99,7 +99,7 @@ public class ProjectDependency implements Serializable {
}
@SuppressWarnings("unused")
- private static List<InputSuggestion> suggestArtifacts(String matchWith) {
+ private static List<InputSuggestion> getArtifactSuggestions(String matchWith) {
Project project = getEditingProject();
Long buildNumber = (Long) OneContext.get().getEditContext().getInputValue("buildNumber");
if (project != null && buildNumber != null) {
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java
index 565d10c337..3fa0a5d0d3 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java
@@ -6,8 +6,8 @@ import java.util.List;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.ci.job.Job;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.RefUpdated;
@@ -81,8 +81,10 @@ public class BranchUpdateTrigger extends JobTrigger {
} else {
Collection<String> changedFiles = GitUtils.getChangedFiles(refUpdated.getProject().getRepository(),
refUpdated.getOldCommitId(), refUpdated.getNewCommitId());
+ PatternSet patternSet = PatternSet.fromString(getPaths());
+ Matcher matcher = new PathMatcher();
for (String changedFile: changedFiles) {
- if (PathUtils.matchChildAware(getPaths(), changedFile))
+ if (patternSet.matches(matcher, changedFile))
return true;
}
return false;
@@ -98,7 +100,7 @@ public class BranchUpdateTrigger extends JobTrigger {
RefUpdated refUpdated = (RefUpdated) event;
String branch = GitUtils.ref2branch(refUpdated.getRefName());
if (branch != null) {
- if ((getBranches() == null || PatternSet.fromString(getBranches()).matches(new ChildAwareMatcher(), branch))
+ if ((getBranches() == null || PatternSet.fromString(getBranches()).matches(new PathMatcher(), branch))
&& touchedFile(refUpdated)) {
return true;
}
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java
index 263c6d0369..e083feb481 100644
--- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java
@@ -2,7 +2,7 @@ package io.onedev.server.ci.job.trigger;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.ci.job.Job;
import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.RefUpdated;
@@ -38,7 +38,7 @@ public class TagCreateTrigger extends JobTrigger {
RefUpdated refUpdated = (RefUpdated) event;
String pushedTag = GitUtils.ref2tag(refUpdated.getRefName());
if (pushedTag != null && !refUpdated.getNewCommitId().equals(ObjectId.zeroId())
- && (getTags() == null || PatternSet.fromString(getTags()).matches(new ChildAwareMatcher(), pushedTag))) {
+ && (getTags() == null || PatternSet.fromString(getTags()).matches(new PathMatcher(), pushedTag))) {
return true;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 9da59c8858..cfaef6a069 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -73,8 +73,8 @@ import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.LockUtils;
import io.onedev.commons.utils.MatrixRunner;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
-import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.cache.CommitInfoManager;
@@ -1244,7 +1244,7 @@ public class Project extends AbstractEntity implements Validatable {
for (TagProtection protection: tagProtections) {
if (protection.isEnabled()
&& UserMatcher.fromString(protection.getUser()).matches(this, user)
- && PatternSet.fromString(protection.getTags()).matches(new ChildAwareMatcher(), tagName)) {
+ && PatternSet.fromString(protection.getTags()).matches(new PathMatcher(), tagName)) {
return protection;
}
}
@@ -1256,7 +1256,7 @@ public class Project extends AbstractEntity implements Validatable {
for (BranchProtection protection: branchProtections) {
if (protection.isEnabled()
&& UserMatcher.fromString(protection.getUser()).matches(this, user)
- && PatternSet.fromString(protection.getBranches()).matches(new ChildAwareMatcher(), branchName)) {
+ && PatternSet.fromString(protection.getBranches()).matches(new PathMatcher(), branchName)) {
return protection;
}
}
@@ -1419,7 +1419,7 @@ public class Project extends AbstractEntity implements Validatable {
Collection<ObjectId> descendants = commitInfoManager.getDescendants(this, Sets.newHashSet(commitId));
descendants.add(commitId);
- Matcher matcher = new ChildAwareMatcher();
+ Matcher matcher = new PathMatcher();
PatternSet branchPatterns = PatternSet.fromString(branches);
for (RefInfo ref: getBranches()) {
String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));
@@ -1464,12 +1464,13 @@ public class Project extends AbstractEntity implements Validatable {
try {
CISpec ciSpec = getCISpec(getObjectId(branch, true));
if (ciSpec != null) {
+ Matcher matcher = new PathMatcher();
for (Job job: ciSpec.getJobs()) {
for (JobTrigger trigger: job.getTriggers()) {
if (trigger instanceof BranchUpdateTrigger) {
BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;
if (branchUpdateTrigger.isRejectIfNotSuccessful()
- && (branchUpdateTrigger.getBranches() == null || PatternSet.fromString(branchUpdateTrigger.getBranches()).matches(new ChildAwareMatcher(), branch))) {
+ && (branchUpdateTrigger.getBranches() == null || PatternSet.fromString(branchUpdateTrigger.getBranches()).matches(matcher, branch))) {
return true;
}
}
@@ -1490,12 +1491,13 @@ public class Project extends AbstractEntity implements Validatable {
try {
CISpec ciSpec = getCISpec(oldObjectId);
if (ciSpec != null) {
+ Matcher matcher = new PathMatcher();
for (Job job: ciSpec.getJobs()) {
for (JobTrigger trigger: job.getTriggers()) {
if (trigger instanceof BranchUpdateTrigger) {
BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;
if (branchUpdateTrigger.isRejectIfNotSuccessful()
- && (branchUpdateTrigger.getBranches() == null || PatternSet.fromString(branchUpdateTrigger.getBranches()).matches(new ChildAwareMatcher(), branch))) {
+ && (branchUpdateTrigger.getBranches() == null || PatternSet.fromString(branchUpdateTrigger.getBranches()).matches(matcher, branch))) {
Map<String, List<List<String>>> paramMatrix = new HashMap<>();
Set<String> secretParamNames = new HashSet<>();
for (JobParam param: trigger.getParams()) {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
index db528cc897..1fc6358982 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/AutoDiscoveredJobExecutor.java
@@ -42,7 +42,7 @@ public class AutoDiscoveredJobExecutor extends JobExecutor {
jobExecutor.setBranches(getBranches());
jobExecutor.setCacheTTL(getCacheTTL());
jobExecutor.setEnabled(isEnabled());
- jobExecutor.setJobEnvironments(getJobEnvironments());
+ jobExecutor.setJobImages(getJobImages());
jobExecutor.setJobNames(getJobNames());
jobExecutor.setProjects(getProjects());
jobExecutor.execute(jobToken, context);
diff --git a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
index e28141e197..428bf93220 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/BranchProtection.java
@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
import org.eclipse.jgit.lib.ObjectId;
import org.hibernate.validator.constraints.NotEmpty;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.Usage;
@@ -129,7 +129,7 @@ public class BranchProtection implements Serializable {
@Nullable
public FileProtection getFileProtection(String file) {
for (FileProtection protection: fileProtections) {
- if (PatternSet.fromString(protection.getPaths()).matches(new ChildAwareMatcher(), file))
+ if (PatternSet.fromString(protection.getPaths()).matches(new PathMatcher(), file))
return protection;
}
return null;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index 6599904ee4..421404148a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -5,8 +5,8 @@ import java.io.Serializable;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.commons.launcher.loader.ExtensionPoint;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
-import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.ci.job.JobContext;
import io.onedev.server.model.Project;
import io.onedev.server.util.Usage;
@@ -31,7 +31,7 @@ public abstract class JobExecutor implements Serializable {
private String jobNames;
- private String jobEnvironments;
+ private String jobImages;
private int cacheTTL = 7;
@@ -82,17 +82,17 @@ public abstract class JobExecutor implements Serializable {
this.jobNames = jobNames;
}
- @Editable(order=10300, name="Applicable Job Environments", group="Job Applicability",
- description="Optionally specify space-separated job environments applicable for this executor. "
+ @Editable(order=10300, name="Applicable Job Images", group="Job Applicability",
+ description="Optionally specify space-separated job images applicable for this executor. "
+ "Use * or ? for wildcard match. Leave empty to match all")
@Patterns
@NameOfEmptyValue("All")
- public String getJobEnvironments() {
- return jobEnvironments;
+ public String getJobImages() {
+ return jobImages;
}
- public void setJobEnvironments(String jobEnvironments) {
- this.jobEnvironments = jobEnvironments;
+ public void setJobImages(String jobImages) {
+ this.jobImages = jobImages;
}
@Editable(order=50000, group="More Settings", description="Specify job cache TTL (time to live) by days. "
@@ -110,12 +110,12 @@ public abstract class JobExecutor implements Serializable {
public abstract void execute(String jobToken, JobContext context);
public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String jobEnvironment) {
- Matcher matcher = new ChildAwareMatcher();
+ Matcher matcher = new PathMatcher();
return isEnabled()
&& (getProjects() == null || PatternSet.fromString(getProjects()).matches(matcher, project.getName()))
&& (getJobNames() == null || PatternSet.fromString(getJobNames()).matches(matcher, jobName))
- && (getJobEnvironments() == null || PatternSet.fromString(getJobEnvironments()).matches(matcher, jobEnvironment))
+ && (getJobImages() == null || PatternSet.fromString(getJobImages()).matches(matcher, jobEnvironment))
&& (getBranches() == null || project.isCommitOnBranches(commitId, getBranches()));
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java
index 08aaa1c426..82aff0bd74 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/jobexecutor/ServiceLocator.java
@@ -6,8 +6,8 @@ import java.util.List;
import javax.validation.constraints.Size;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
-import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.ci.job.JobService;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.annotation.Editable;
@@ -62,8 +62,7 @@ public class ServiceLocator implements Serializable {
}
public final boolean isApplicable(JobService service) {
- Matcher matcher = new ChildAwareMatcher();
-
+ Matcher matcher = new PathMatcher();
return (getServiceNames() == null || PatternSet.fromString(getServiceNames()).matches(matcher, service.getName()))
&& (getServiceImages() == null || PatternSet.fromString(getServiceImages()).matches(matcher, service.getImage()));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
index 74e1474666..fd3df69907 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/FileQuery.java
@@ -16,7 +16,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import com.google.common.base.Preconditions;
import io.onedev.commons.utils.LinearRange;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.search.code.hit.FileHit;
import io.onedev.server.search.code.hit.QueryHit;
diff --git a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
index 28b6adfaa3..b4df7b7e9e 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/query/SymbolQuery.java
@@ -18,7 +18,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import io.onedev.commons.jsymbol.Symbol;
import io.onedev.commons.utils.LinearRange;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.search.code.SearchManager;
import io.onedev.server.search.code.hit.QueryHit;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java
index 3553a2fd51..2d7b573a21 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import org.eclipse.jgit.lib.PersonIdent;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java
index a717513161..eb55e1564f 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java
@@ -6,7 +6,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import com.google.common.base.Preconditions;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java
index 3959993688..15dc00674a 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java
@@ -9,7 +9,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
import com.google.common.base.Preconditions;
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
@@ -55,7 +56,7 @@ public class PathCriteria extends CommitCriteria {
else
changedFiles = new HashSet<>();
- ChildAwareMatcher matcher = new ChildAwareMatcher();
+ Matcher matcher = new PathMatcher();
for (String value: values) {
for (String changedFile: changedFiles) {
if (matcher.matches(value, changedFile))
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
index bc8d3e3415..d6567775b7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/PathCriteria.java
@@ -5,7 +5,7 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -33,10 +33,7 @@ public class PathCriteria extends EntityCriteria<CodeComment> {
@Override
public boolean matches(CodeComment comment, User user) {
- String normalized = value.toLowerCase();
- if (normalized.endsWith("/"))
- normalized += "*";
- return WildcardUtils.matchString(normalized, comment.getMarkPos().getPath().toLowerCase());
+ return WildcardUtils.matchPath(value.toLowerCase(), comment.getMarkPos().getPath().toLowerCase());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
index 4be131cb92..68aa89cf4a 100644
--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java
@@ -20,7 +20,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.tools.ant.DirectoryScanner;
import org.unbescape.java.JavaEscape;
-import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.commons.utils.match.Matcher;
import io.onedev.server.OneException;
import io.onedev.server.util.patternset.PatternSetParser.PatternContext;
import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
index 74ce72648d..55a5168bd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
@@ -20,8 +20,8 @@ import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.stringmatch.PatternApplied;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.PatternApplied;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CommitInfoManager;
import io.onedev.server.git.NameAndEmail;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
index 0fc2e797d7..5829f2d441 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java
@@ -44,9 +44,6 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {
String unmatched = terminalExpect.getUnmatchedText();
if (spec.getRuleName().equals("NQuoted")) {
List<InputSuggestion> suggestions = suggest(unmatched);
- int index = "*".indexOf(unmatched);
- if (index != -1)
- suggestions.add(new InputSuggestion("*", "all", new LinearRange(index, unmatched.length())));
return suggestions
.stream()
.filter(it->!matches.contains(it.getContent()))
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
index 495f20bebe..a647cee808 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
@@ -9,6 +9,7 @@
<a wicket:id="showInList" class="show-in-list pull-right" title="Show in build list"><i class="fa fa-list-ul"></i></a>
</div>
<div wicket:id="detail" class="body"></div>
+ <div wicket:id="noBuilds" class="body"><i>No builds</i></div>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
index 39ed0729c3..891152086a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java
@@ -122,7 +122,7 @@ public class CommitStatusPanel extends Panel {
});
- jobItem.add(new SimpleBuildListPanel("detail", new LoadableDetachableModel<List<Build>>() {
+ IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
@Override
protected List<Build> load() {
@@ -132,7 +132,25 @@ public class CommitStatusPanel extends Panel {
return builds;
}
- }));
+ };
+ jobItem.add(new SimpleBuildListPanel("detail", buildsModel) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!buildsModel.getObject().isEmpty());
+ }
+
+ });
+ jobItem.add(new WebMarkupContainer("noBuilds") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(buildsModel.getObject().isEmpty());
+ }
+
+ });
jobItem.setOutputMarkupId(true);
jobsView.add(jobItem);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 58399e6e67..d8ac5be058 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -61,11 +61,11 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.jsymbol.util.NoAntiCacheImage;
-import io.onedev.commons.utils.PathComparator;
import io.onedev.commons.utils.LinearRange;
+import io.onedev.commons.utils.PathComparator;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.stringmatch.Matcher;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.Matcher;
+import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.git.Blob;
@@ -205,17 +205,7 @@ public class RevisionDiffPanel extends Panel {
if (StringUtils.isNotBlank(patternSetString)) {
try {
PatternSet patternSet = PatternSet.fromString(patternSetString);
- Matcher matcher = new Matcher() {
-
- @Override
- public boolean matches(String pattern, String value) {
- pattern = pattern.toLowerCase();
- pattern = StringUtils.stripStart(pattern, "/");
- pattern = StringUtils.stripEnd(pattern, "/");
- return pattern.equals(value) || value.startsWith(pattern + "/") || WildcardUtils.matchString(pattern, value);
- }
-
- };
+ Matcher matcher = new PathMatcher();
for (BlobChange change: changes) {
String oldPath = change.getOldBlobIdent().path;
if (oldPath == null)
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.css b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
index d1fb324ef8..0e35aabe0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.css
@@ -71,7 +71,7 @@
.property-editor>.list>table>tfoot>tr>td.norecords-td>div,
.property-editor>.bean-list>table>tfoot>tr>td.no-elements>div {
border-top: 2px solid #DDD;
- margin-top: -6px;
+ margin-top: -7px;
padding: 8px 0 0 8px;
}
.property-editor>.polymorphic-list>table>tbody>tr>td {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.css b/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.css
index 79818d8371..8091243bda 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.css
+++ b/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.css
@@ -7,7 +7,7 @@
border-color: #a94442;
}
.script-support .CodeMirror {
- height: auto;
+ height: auto;
}
.script-support .CodeMirror-scroll {
min-height: 120px;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.js b/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.js
index af7479e6b7..a420c046dd 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.js
+++ b/server-core/src/main/java/io/onedev/server/web/editable/script/script-support.js
@@ -20,20 +20,8 @@ onedev.server.scriptSupport = {
cm.on("change", function() {
cm.save();
onedev.server.form.markDirty($input.closest("form"));
- });
- onedev.server.scriptSupport.trackWidth(inputId);
- },
- trackWidth: function(inputId) {
- var $cm = $("#" + inputId).next();
- var cm = $cm[0].CodeMirror;
- function setWidth() {
- var $cm = $("#"+inputId).next();
- cm.setSize(1, null); // shrink temporarily in order to get original parent width
- cm.setSize($cm.parent().width(), null);
- cm.refresh();
- }
- setWidth();
- $(window).resize(setWidth);
+ });
+ onedev.server.scriptSupport.trackWidth(inputId);
},
onViewerDomReady: function(inputId, modeName) {
var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {
@@ -55,5 +43,17 @@ onedev.server.scriptSupport = {
onedev.server.codemirror.setModeByName(cm, modeName);
onedev.server.scriptSupport.trackWidth(inputId);
- }
+ },
+ trackWidth: function(inputId) {
+ var $cm = $("#" + inputId).next();
+ var cm = $cm[0].CodeMirror;
+ function setWidth() {
+ var $cm = $("#"+inputId).next();
+ cm.setSize(1, null); // shrink temporarily in order to get original parent width
+ cm.setSize($cm.parent().width(), null);
+ cm.refresh();
+ }
+ setWidth();
+ $(window).resize(setWidth);
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
index 26afd28982..11d75c1374 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.html
@@ -9,7 +9,7 @@
<a wicket:id="link">
<img wicket:id="avatar">
<span wicket:id="name"></span>
- <i class="fa fa-angle-down"></i>
+ <i class="ellipsis"></i>
</a>
</wicket:fragment>
<wicket:fragment wicket:id="navContextFrag">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
index e14a05876d..da0849c81c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
@@ -41,6 +41,7 @@ onedev.server.ciSpec = {
$contents.children().hide();
var $content = $contents.children().eq(index);
$content.show();
+ $(window).resize();
onedev.server.focus.doFocus($content);
},
edit: {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/project.css b/server-core/src/main/java/io/onedev/server/web/page/project/project.css
index be2c4efb22..07cbb5bc1e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/project.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/project.css
@@ -27,9 +27,16 @@
}
#project>.sidebar>.head i {
position: absolute;
- right: 4px;
- top: 16px;
+ right: 12px;
+ top: 12px;
+ font-style: normal;
+ font-size: 20px;
+}
+#project>.sidebar>.head i:before {
+ font-family: "FontAwesome";
+ content: "\f142";
}
+
#project>.sidebar>.tabs {
top: 50px;
}
@@ -40,9 +47,13 @@
display: none;
}
#project>.minimized.sidebar>.head i {
- left: 14px;
- top: 43px;
+ left: 11px;
+ top: 38px;
}
+#project>.minimized.sidebar>.head i:before {
+ content: "\f141";
+}
+
#project>.minimized.sidebar>.tabs {
top: 64px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 4bc181a819..48f602a81a 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -17,8 +17,8 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.LockUtils;
-import io.onedev.commons.utils.stringmatch.PatternApplied;
-import io.onedev.commons.utils.stringmatch.WildcardUtils;
+import io.onedev.commons.utils.match.PatternApplied;
+import io.onedev.commons.utils.match.WildcardUtils;
import io.onedev.server.OneDev;
import io.onedev.server.cache.CacheManager;
import io.onedev.server.cache.CommitInfoManager;
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
index a4c9d704b4..12b94c414c 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
+++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java
@@ -540,17 +540,23 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
Map<String, String> environments = Maps.newHashMap("HOME", tempHome.getAbsolutePath());
Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
git.environments(environments).workingDir(hostWorkspace);
- LineConsumer logger = new LineConsumer() {
+
+ git.addArgs("config", "--global", "credential.modalprompt", "false");
+ git.execute(new LineConsumer() {
@Override
public void consume(String line) {
jobContext.getLogger().log(line);
}
- };
-
- git.addArgs("config", "--global", "credential.modalprompt", "false");
- git.execute(logger, logger).checkReturnCode();
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
// clear credential.helper list to remove possible Windows credential manager
git.clearArgs();
@@ -558,15 +564,57 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
git.addArgs("config", "--global", "credential.helper", "\"\"");
else
git.addArgs("config", "--global", "credential.helper", "");
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
git.clearArgs();
git.addArgs("config", "--global", "--add", "credential.helper", "store");
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
git.clearArgs();
git.addArgs("config", "--global", "credential.useHttpPath", "true");
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
List<String> trustCertContent = new ArrayList<>();
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
@@ -588,7 +636,21 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
FileUtils.writeLines(trustCertFile, trustCertContent, "\n");
git.clearArgs();
git.addArgs("config", "--global", "http.sslCAInfo", trustCertFile.getAbsolutePath());
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
}
if (!jobContext.getSubmoduleCredentials().isEmpty()) {
@@ -611,22 +673,72 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
if (!new File(hostWorkspace, ".git").exists()) {
git.clearArgs();
git.addArgs("init", ".");
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (!line.contains("Initialized empty Git repository"))
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
}
git.clearArgs();
git.addArgs("fetch", jobContext.getProjectGitDir().getAbsolutePath(), "--force", "--quiet",
"--depth=1", jobContext.getCommitId().name());
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
git.clearArgs();
git.addArgs("checkout", "--quiet", jobContext.getCommitId().name());
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
// deinit submodules in case submodule url is changed
git.clearArgs();
git.addArgs("submodule", "deinit", "--all", "--force", "--quiet");
- git.execute(logger, new LineConsumer() {
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
@Override
public void consume(String line) {
@@ -640,7 +752,21 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
git.clearArgs();
git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet", "--depth=1");
- git.execute(logger, logger).checkReturnCode();
+ git.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ jobContext.getLogger().log(line);
+ }
+
+ }).checkReturnCode();
} catch (IOException e) {
throw new RuntimeException(e);
} finally {
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index 8c618d92dc..e32dfd8854 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -871,7 +871,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}).checkReturnCode();
String nodeName = Preconditions.checkNotNull(nodeNameRef.get());
- jobLogger.log("Running job as pod " + podFQN + " on node " + nodeName + "...");
+ jobLogger.log("Running job pod on node " + nodeName + "...");
logger.debug("Collecting init container log (pod: {})...", podFQN);
collectContainerLog(namespace, podName, "init", KubernetesHelper.LOG_END_MESSAGE, jobLogger);