Skip to content

The Unified and Autonomous Development Platform

Parsed fixed issue numbers even for first build in job

Robin Shenc7e1f83e3297
diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.java
index 1008dbc4b7..3542bd6a8f 100644
--- a/core/src/main/java/io/onedev/server/model/Build.java
+++ b/core/src/main/java/io/onedev/server/model/Build.java
@@ -261,19 +261,17 @@ public class Build extends AbstractEntity {
Collection<ObjectId> prevCommits = OneDev.getInstance(BuildInfoManager.class).getPrevCommits(project, getId());
if (prevCommits != null) {
fixedIssueNumbers = Optional.of(new HashSet<>());
- if (!prevCommits.isEmpty()) {
- Repository repository = project.getRepository();
- try (RevWalk revWalk = new RevWalk(repository)) {
- revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommitHash())));
- for (ObjectId prevCommit: prevCommits)
- revWalk.markUninteresting(revWalk.parseCommit(prevCommit));
-
- RevCommit commit;
- while ((commit = revWalk.next()) != null)
- fixedIssueNumbers.get().addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ Repository repository = project.getRepository();
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getCommitHash())));
+ for (ObjectId prevCommit: prevCommits)
+ revWalk.markUninteresting(revWalk.parseCommit(prevCommit));
+
+ RevCommit commit;
+ while ((commit = revWalk.next()) != null)
+ fixedIssueNumbers.get().addAll(IssueUtils.parseFixedIssues(project, commit.getFullMessage()));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
} else {
fixedIssueNumbers = Optional.absent();
diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java
index 92a000556f..627ab9d6a5 100644
--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java
+++ b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java
@@ -1,5 +1,6 @@
package io.onedev.server.model;
+import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
@@ -10,8 +11,8 @@ import javax.persistence.UniqueConstraint;
@Entity
@Table(
- indexes={@Index(columnList="o_request_id"), @Index(columnList="o_job_name")},
- uniqueConstraints={@UniqueConstraint(columnNames={"o_job_name", "o_request_id"})}
+ indexes={@Index(columnList="o_request_id"), @Index(columnList="jobName")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"jobName", "o_request_id"})}
)
public class PullRequestBuild extends AbstractEntity {
@@ -19,8 +20,7 @@ public class PullRequestBuild extends AbstractEntity {
public static final String ATTR_BUILD = "build";
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(nullable=false)
+ @Column(nullable=false)
private String jobName;
@ManyToOne(fetch=FetchType.LAZY)
diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.java
index 951a991a97..7f1fce40b0 100644
--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -99,24 +99,36 @@ public class IssueUtils {
public static Collection<Long> parseFixedIssues(Project project, String commitMessage) {
Collection<Long> issueNumbers = new HashSet<>();
- /*
- * Transform commit message with defined transformers first in order not to process issue keys pointing
- * to external issue trackers
- */
- commitMessage = CommitMessageTransformer.transform(commitMessage, project.getCommitMessageTransforms());
+ // Skip unmatched commit message quickly
+ boolean found = false;
+ String lowerCaseCommitMessage = commitMessage.toLowerCase();
+ for (String word: FIX_ISSUE_WORDS) {
+ if (lowerCaseCommitMessage.indexOf(word) != -1) {
+ found = true;
+ break;
+ }
+ }
- // Only process top level text node to skip transformed links above
- Element body = Jsoup.parseBodyFragment(commitMessage).body();
- for (int i=0; i<body.childNodeSize(); i++) {
- Node node = body.childNode(i);
- if (node instanceof TextNode) {
- TextNode textNode = (TextNode) body.childNode(i);
- StringTokenizer tokenizer = new StringTokenizer(textNode.getWholeText());
- while (tokenizer.hasMoreTokens()) {
- String token = tokenizer.nextToken();
- if (FIX_ISSUE_WORDS.contains(token.toLowerCase())) {
- while (FIX_ISSUE_WORDS.contains(parseIssueNumbers(tokenizer, issueNumbers)))
- parseIssueNumbers(tokenizer, issueNumbers);
+ if (found) {
+ /*
+ * Transform commit message with defined transformers first in order not to process issue keys pointing
+ * to external issue trackers
+ */
+ commitMessage = CommitMessageTransformer.transform(commitMessage, project.getCommitMessageTransforms());
+
+ // Only process top level text node to skip transformed links above
+ Element body = Jsoup.parseBodyFragment(commitMessage).body();
+ for (int i=0; i<body.childNodeSize(); i++) {
+ Node node = body.childNode(i);
+ if (node instanceof TextNode) {
+ TextNode textNode = (TextNode) body.childNode(i);
+ StringTokenizer tokenizer = new StringTokenizer(textNode.getWholeText());
+ while (tokenizer.hasMoreTokens()) {
+ String token = tokenizer.nextToken();
+ if (FIX_ISSUE_WORDS.contains(token.toLowerCase())) {
+ while (FIX_ISSUE_WORDS.contains(parseIssueNumbers(tokenizer, issueNumbers)))
+ parseIssueNumbers(tokenizer, issueNumbers);
+ }
}
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index e8a32b1e9a..1719b495e0 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 8c5e0b3ff5..4320a12dc8 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -17,6 +18,14 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
}
@Override