Skip to content

The Unified and Autonomous Development Platform

Improve inline help to mention exclude pattern

Robin Shen218dcd8af349
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
index 5f28d1dfd0..4a04164e40 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java
@@ -31,7 +31,8 @@ public class BranchUpdateTrigger extends JobTrigger {
private String paths;
@Editable(name="Branches", order=100, description="Optionally specify space-separated branches "
- + "to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all branches")
+ + "to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all branches")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("Any branch")
public String getBranches() {
@@ -48,8 +49,8 @@ public class BranchUpdateTrigger extends JobTrigger {
}
@Editable(name="Touched Files", order=200,
- description="Optionally specify space-separated files to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
- + "Leave empty to match all files")
+ description="Optionally specify space-separated files to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all files")
@Patterns(suggester = "getPathSuggestions", path=true)
@NameOfEmptyValue("Any file")
public String getPaths() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
index b8d997c189..a477c398aa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java
@@ -39,8 +39,8 @@ public abstract class JobTrigger implements Serializable {
@Editable(name="Applicable Projects", order=900, description="Optionally specify space-separated projects "
+ "applicable for this trigger. This is useful for instance when you want to prevent "
- + "the job from being triggered in forked projects. Use * or ? for wildcard match. "
- + "Leave empty to match all projects")
+ + "the job from being triggered in forked projects. Use '*' or '?' for wildcard match. "
+ + "Prefix with '-' to exclude. Leave empty to match all projects")
@Patterns(suggester="suggestProjects")
@NameOfEmptyValue("Any project")
public String getProjects() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
index 0e618e83c6..553f50174b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java
@@ -31,8 +31,8 @@ public class PullRequestTrigger extends JobTrigger {
private String paths;
@Editable(name="Target Branches", order=100, description="Optionally specify space-separated "
- + "target branches of the pull requests to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
- + "Leave empty to match all branches")
+ + "target branches of the pull requests to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all branches")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("Any branch")
public String getBranches() {
@@ -49,8 +49,8 @@ public class PullRequestTrigger extends JobTrigger {
}
@Editable(name="Touched Files", order=200,
- description="Optionally specify space-separated files to check. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
- + "Leave empty to match all files")
+ description="Optionally specify space-separated files to check. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all files")
@Patterns(suggester = "getPathSuggestions", path=true)
@NameOfEmptyValue("Any file")
public String getPaths() {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
index f86224dc3e..f791acf311 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java
@@ -29,7 +29,8 @@ public class TagCreateTrigger extends JobTrigger {
private String branches;
@Editable(name="Tags", order=100, description="Optionally specify space-separated tags to check. "
- + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all tags")
+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all tags")
@Patterns(suggester="suggestTags", path=true)
@NameOfEmptyValue("Any tag")
public String getTags() {
@@ -47,8 +48,8 @@ public class TagCreateTrigger extends JobTrigger {
@Editable(name="On Branches", order=200, description="This trigger will only be applicable "
+ "if tagged commit is on branches specified here. Multiple branches should be "
- + "separated with spaces. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all "
- + "branches")
+ + "separated with spaces. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all branches")
@Patterns(suggester="suggestBranches", path=true)
@NameOfEmptyValue("Any branch")
public String getBranches() {
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 7ae0ad0e6f..3b34cd7998 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
@@ -70,7 +70,8 @@ public class BranchProtection implements Serializable {
this.enabled = enabled;
}
- @Editable(order=100, description="Specify space-separated branches to be protected. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ @Editable(order=100, description="Specify space-separated branches to be protected. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude")
@Patterns(suggester = "suggestBranches", path=true)
@NotEmpty
public String getBranches() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java
index 814b9a1d22..8ce88563e9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/FileProtection.java
@@ -33,7 +33,8 @@ public class FileProtection implements Serializable, Validatable {
private List<String> jobNames = new ArrayList<>();
- @Editable(order=100, description="Specify space-separated paths to be protected. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ @Editable(order=100, description="Specify space-separated paths to be protected. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude")
@Patterns(suggester = "suggestPaths", path=true)
@NotEmpty
public String getPaths() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java
index 43322b9013..c8824fe842 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/TagProtection.java
@@ -43,7 +43,8 @@ public class TagProtection implements Serializable {
this.enabled = enabled;
}
- @Editable(order=100, description="Specify space-separated tags to be protected. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ @Editable(order=100, description="Specify space-separated tags to be protected. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude")
@Patterns(suggester = "suggestTags", path=true)
@NotEmpty
public String getTags() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
index 4077fe0d26..4932edd544 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GroovyScript.java
@@ -78,7 +78,8 @@ public class GroovyScript implements Serializable {
}
@Editable(order=400, description="Optionally specify space-separated projects allowed to "
- + "execute this script. Use * or ? for wildcard match. Leave empty to allow all")
+ + "execute this script. Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "
+ + "Leave empty to allow all")
@Patterns(suggester = "suggestProjects")
@ShowCondition("isCanBeUsedByBuildJobsEnabled")
@NameOfEmptyValue("All")
@@ -91,7 +92,8 @@ public class GroovyScript implements Serializable {
}
@Editable(order=500, description="Optionally specify space-separated branches allowed to "
- + "execute this script. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to allow all")
+ + "execute this script. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to allow all")
@Patterns(path=true)
@ShowCondition("isCanBeUsedByBuildJobsEnabled")
@NameOfEmptyValue("All")
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java
index eff40b10cc..04284f51a4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java
@@ -26,8 +26,8 @@ public class ServiceLocator implements Serializable {
private List<NodeSelectorEntry> nodeSelector = new ArrayList<>();
@Editable(order=100, name="Applicable Names", description="Optionally specify space-separated "
- + "service names applicable for this locator. Use * or ? for wildcard match. Leave empty to "
- + "match all")
+ + "service names applicable for this locator. Use '*' or '?' for wildcard match. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns
@NameOfEmptyValue("All")
public String getServiceNames() {
@@ -39,8 +39,8 @@ public class ServiceLocator implements Serializable {
}
@Editable(order=200, name="Applicable Images", description="Optionally specify space-separated "
- + "service images applicable for this locator. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave "
- + "empty to match all")
+ + "service images applicable for this locator. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns(path=true)
@NameOfEmptyValue("All")
public String getServiceImages() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java
index 79b4318423..6fe37889fa 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/JobSecret.java
@@ -51,7 +51,8 @@ public class JobSecret implements Serializable {
@Editable(order=300, description=""
+ "Optionally specify space-separated branches to authorize.\n"
+ "Only builds from authorized branches can access this secret.\n"
- + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to authorize all branches")
+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to authorize all branches")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("All")
public String getAuthorizedBranches() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
index a50fe280df..3e8499ae26 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/ActionAuthorization.java
@@ -21,7 +21,8 @@ public abstract class ActionAuthorization implements Serializable {
@Editable(order=1000, description="Action is allowed only if build runs on "
+ "specified branches. Multiple branches should be separated with space. "
- + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("All")
public String getAuthorizedBranches() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
index 32fc58d09c..3912fdf8ba 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CloseMilestoneAuthorization.java
@@ -20,7 +20,8 @@ public class CloseMilestoneAuthorization extends ActionAuthorization {
private String milestoneNames;
- @Editable(order=100, description="Specify space-separated milestone names. Use * or ? for wildcard match")
+ @Editable(order=100, description="Specify space-separated milestone names. Use '*' or '?' for wildcard match. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns(suggester = "suggestMilestones")
@NameOfEmptyValue("All")
public String getMilestoneNames() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
index 9aadc6efd7..364788680f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/actionauthorization/CreateTagAuthorization.java
@@ -20,7 +20,8 @@ public class CreateTagAuthorization extends ActionAuthorization {
private String tagNames;
- @Editable(order=100, description="Specify space-separated tag names. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ @Editable(order=100, description="Specify space-separated tag names. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns(suggester = "suggestTags", path=true)
@NameOfEmptyValue("All")
public String getTagNames() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
index eb0d00bbef..aa956b7618 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
@@ -25,7 +25,8 @@ public class BranchUpdateTrigger extends TransitionTrigger {
}
@Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "
- + "applicable for this trigger. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ + "applicable for this trigger. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("Any branch")
public String getBranches() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
index 191d5001f9..5bb66fb070 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
@@ -29,7 +29,8 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {
}
@Editable(order=100, name="Applicable Jobs", description="Optionally specify space-separated jobs "
- + "applicable for this trigger. Use * or ? for wildcard match")
+ + "applicable for this trigger. Use '*' or '?' for wildcard match. Prefix with '-' to exclude. "
+ + "Leave empty to match all")
@Patterns(suggester = "suggestJobs")
@NameOfEmptyValue("Any job")
public String getJobNames() {
@@ -41,7 +42,8 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {
}
@Editable(order=200, name="Applicable Branches", description="Optionally specify space-separated branches "
- + "applicable for this trigger. Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>")
+ + "applicable for this trigger. Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("Any branch")
public String getBranches() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
index 36849e580f..ce49b60d26 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
@@ -27,7 +27,8 @@ public abstract class PullRequestTrigger extends TransitionTrigger {
@Editable(name="Target Branches", order=100,
description="Optionally specify space-separated target branches of the pull requests to check. "
- + "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Leave empty to match all branches")
+ + "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. "
+ + "Prefix with '-' to exclude. Leave empty to match all branches")
@Patterns(suggester = "suggestBranches", path=true)
@NameOfEmptyValue("Any branch")
public String getBranches() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
index 329978a0e0..1a83e481af 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java
@@ -14,6 +14,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.util.EditContext;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
import io.onedev.server.web.editable.annotation.ShowCondition;
import io.onedev.server.web.util.SuggestionUtils;
@@ -33,9 +34,9 @@ public class JobPrivilege implements Serializable {
private String accessibleReports;
- @Editable(order=100, description="Specify space-separated jobs. Use * or ? for wildcard match. "
- + "<b class='red'>NOTE: </b> Permission to access build artifacts will be granted "
- + "implicitly in matched jobs even if no other permissions are specified here")
+ @Editable(order=100, description="Specify space-separated jobs. Use '*' or '?' for wildcard match. "
+ + "Prefix with '-' to exclude. <b class='red'>NOTE: </b> Permission to access build artifacts "
+ + "will be granted implicitly in matched jobs even if no other permissions are specified here")
@Patterns(suggester = "suggestJobNames")
@NotEmpty
public String getJobNames() {
@@ -99,9 +100,11 @@ public class JobPrivilege implements Serializable {
return !(boolean) EditContext.get().getInputValue("accessLog");
}
- @Editable(order=400, name="Access Build Reports", description="Optionally specify space-separated reports. Use * or ? for wildcard match")
+ @Editable(order=400, name="Access Build Reports", description="Optionally specify space-separated reports. "
+ + "Use '*' or '?' for wildcard match. Prefix with '-' to exclude. Leave empty to match all")
@ShowCondition("isAccessLogDisabled")
@Patterns
+ @NameOfEmptyValue("All Reports")
@Nullable
public String getAccessibleReports() {
return accessibleReports;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
index 54186816ae..b3744ca9df 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ActionConditionBehavior.java
@@ -117,7 +117,7 @@ public class ActionConditionBehavior extends ANTLRAssistBehavior {
if ("criteriaValue".equals(spec.getLabel())) {
String unmatched = terminalExpect.getUnmatchedText();
if (unmatched.indexOf('"') == unmatched.lastIndexOf('"')) // only when we input criteria value
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
}
}
return hints;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 7fe1076fbc..550290ed03 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -196,7 +196,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (fieldName.equals(Build.NAME_PROJECT)
|| fieldName.equals(Build.NAME_VERSION)
|| fieldName.equals(Build.NAME_JOB)) {
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape quotes");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index 2c575edeec..e9d022bf9a 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -130,7 +130,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
if (!fieldElements.isEmpty()) {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(CodeComment.NAME_CONTENT)) {
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape quotes");
}
}
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 d4b91b727f..3689ed8035 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
@@ -126,7 +126,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
|| tokenType == CommitQueryParser.AUTHOR
|| tokenType == CommitQueryParser.PATH
|| tokenType == CommitQueryParser.MESSAGE) {
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape brackets");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index b96954ca75..ed80a006db 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -282,7 +282,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
|| fieldName.equals(Issue.NAME_DESCRIPTION)
|| fieldName.equals(Issue.NAME_COMMENT)
|| fieldName.equals(Issue.NAME_MILESTONE)) {
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape quotes");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
index 8427f9d250..a2282225a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
@@ -102,7 +102,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {
if ("criteriaValue".equals(spec.getLabel())) {
String unmatched = terminalExpect.getUnmatchedText();
if (unmatched.indexOf('"') == unmatched.lastIndexOf('"')) // only when we input criteria value
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
}
}
return hints;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index 9b31e17e99..5880949e5c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -119,13 +119,13 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
String fieldName = ProjectQuery.getValue(fieldElements.get(0).getMatchedText());
if (fieldName.equals(Project.NAME_NAME)
|| fieldName.equals(Project.NAME_DESCRIPTION)) {
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape quotes");
}
} else {
Element operatorElement = terminalExpect.getState().findMatchedElementsByLabel("operator", true).iterator().next();
if (operatorElement.getMatchedTokens().iterator().next().getType() == ProjectQueryLexer.ForksOf)
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape quotes");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 9f2239efb0..55173fb7fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -169,7 +169,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
|| fieldName.equals(PullRequest.NAME_TITLE)
|| fieldName.equals(PullRequest.NAME_DESCRIPTION)
|| fieldName.equals(PullRequest.NAME_COMMENT)) {
- hints.add("Use * for wildcard match");
+ hints.add("Use '*' for wildcard match");
hints.add("Use '\\' to escape quotes");
}
}
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 fd9abe3fa6..61ff0f096d 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
@@ -580,7 +580,7 @@ public class RevisionDiffPanel extends Panel {
protected List<String> getHints(TerminalExpect terminalExpect) {
return Lists.newArrayList(
"Path containing spaces or starting with dash needs to be quoted",
- "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>"
+ "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude"
);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java
index 827df8d2b4..81b4e93ed0 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java
@@ -71,7 +71,7 @@ public class InterpolativePatternsEditSupport implements EditSupport {
protected List<String> getHints(TerminalExpect terminalExpect) {
return Lists.newArrayList(
"Pattern containing spaces or starting with dash needs to be quoted",
- patterns.path()? "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>": "Use * or ? for wildcard match");
+ patterns.path()? "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude": "Use '*' or '?' for wildcard match. Prefix with '-' to exclude");
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java
index b945f0cd5a..9a730acda5 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/PatternsEditSupport.java
@@ -56,7 +56,7 @@ public class PatternsEditSupport implements EditSupport {
protected List<String> getHints(TerminalExpect terminalExpect) {
return Lists.newArrayList(
"Pattern containing spaces or starting with dash needs to be quoted",
- patterns.path()? "Use **, * or ? for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>": "Use * or ? for wildcard match"
+ patterns.path()? "Use '**', '*' or '?' for <a href='$docRoot/pages/path-wildcard.md' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude": "Use '*' or '?' for wildcard match. Prefix with '-' to exclude"
);
}