Skip to content

The Unified and Autonomous Development Platform

Fix issue #242 - Fix project scoped issue via commit message does not work

Robin Shenc0be5e929904
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 592205720f..baa7b412ab 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -477,7 +477,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
}
RevCommit commit;
while ((commit = revWalk.next()) != null) {
- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));
+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(project, commit.getFullMessage()));
if (fixedIssueNumbers.size() > MAX_FIXED_ISSUES)
break;
}
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
index 8e15f07c98..d18afe436e 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
@@ -437,7 +437,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme
if (currentCommit.getBody() != null)
commitMessage += "\n\n" + currentCommit.getBody();
- for (Long issueNumber: IssueUtils.parseFixedIssueNumbers(commitMessage)) {
+ for (Long issueNumber: IssueUtils.parseFixedIssueNumbers(project, commitMessage)) {
ByteIterable issueKey = new LongByteIterable(issueNumber);
Collection<ObjectId> fixingCommits = readCommits(fixCommitsStore, txn, issueKey);
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 8bb21a098c..c85b2ab6c9 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -657,7 +657,7 @@ public class Build extends AbstractEntity implements Referenceable {
RevCommit commit;
while ((commit = revWalk.next()) != null)
- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));
+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(getProject(), commit.getFullMessage()));
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index b123d59553..8ece980fb2 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -914,7 +914,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
fixedIssueNumbers = new HashSet<>();
for (PullRequestUpdate update: getUpdates()) {
for (RevCommit commit: update.getCommits())
- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));
+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(update.getRequest().getProject(), commit.getFullMessage()));
}
}
return fixedIssueNumbers;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
index 113703951f..e17972a9a9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FixedBetweenCriteria.java
@@ -89,7 +89,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
RevCommit commit;
while ((commit = revWalk.next()) != null)
- fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()));
+ fixedIssueNumbers.addAll(IssueUtils.parseFixedIssueNumbers(project, commit.getFullMessage()));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -123,7 +123,7 @@ public class FixedBetweenCriteria extends IssueCriteria {
RevCommit commit;
while ((commit = revWalk.next()) != null) {
- if (IssueUtils.parseFixedIssueNumbers(commit.getFullMessage()).contains(issue.getNumber()))
+ if (IssueUtils.parseFixedIssueNumbers(issue.getProject(), commit.getFullMessage()).contains(issue.getNumber()))
return true;
}
return false;
diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
index a4091bdcac..5a7114a92c 100644
--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -11,6 +11,8 @@ import java.util.regex.Pattern;
import javax.annotation.Nullable;
+import org.unbescape.java.JavaEscape;
+
import com.google.common.collect.Lists;
import io.onedev.commons.utils.StringUtils;
@@ -21,6 +23,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.fieldspec.FieldSpec;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.validation.ProjectNameValidator;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -36,7 +39,9 @@ public class IssueUtils {
static {
StringBuilder builder = new StringBuilder("(^|\\W+)(");
builder.append(StringUtils.join(ISSUE_FIX_WORDS, "|"));
- builder.append(")\\s+issue\\s+#(\\d+)(?=$|\\W+)");
+ builder.append(")\\s+issue\\s+(");
+ builder.append(JavaEscape.unescapeJava(ProjectNameValidator.PATTERN.pattern()));
+ builder.append(")?#(\\d+)(?=$|\\W+)");
ISSUE_FIX_PATTERN = Pattern.compile(builder.toString());
}
@@ -100,7 +105,7 @@ public class IssueUtils {
}
}
- public static Collection<Long> parseFixedIssueNumbers(String commitMessage) {
+ public static Collection<Long> parseFixedIssueNumbers(Project project, String commitMessage) {
Collection<Long> issueNumbers = new HashSet<>();
// Skip unmatched commit message quickly
@@ -117,8 +122,12 @@ public class IssueUtils {
&& lowerCaseCommitMessage.contains("#")
&& lowerCaseCommitMessage.contains("issue")) {
Matcher matcher = ISSUE_FIX_PATTERN.matcher(lowerCaseCommitMessage);
- while (matcher.find())
- issueNumbers.add(Long.parseLong(matcher.group(3)));
+
+ while (matcher.find()) {
+ String projectName = matcher.group(3);
+ if (projectName == null || projectName.equalsIgnoreCase(project.getName()))
+ issueNumbers.add(Long.parseLong(matcher.group(matcher.groupCount())));
+ }
}
return issueNumbers;
diff --git a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
index a1f8ce4942..86b42e97df 100644
--- a/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
+++ b/server-core/src/main/java/io/onedev/server/util/ProjectScopedCommit.java
@@ -47,7 +47,7 @@ public class ProjectScopedCommit implements Serializable {
public Collection<Long> getFixedIssueNumbers() {
if (fixedIssueNumbers == null) {
RevCommit revCommit = project.getRevCommit(commitId, true);
- fixedIssueNumbers = IssueUtils.parseFixedIssueNumbers(revCommit.getFullMessage());
+ fixedIssueNumbers = IssueUtils.parseFixedIssueNumbers(project, revCommit.getFullMessage());
}
return fixedIssueNumbers;
}
diff --git a/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java b/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java
index b1f08bb0eb..5078ba267a 100644
--- a/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/IssueUtilsTest.java
@@ -6,12 +6,21 @@ import org.junit.Test;
import com.google.common.collect.Sets;
+import io.onedev.server.model.Project;
+
public class IssueUtilsTest {
@Test
public void testParseFixedIssueNumbers() {
- assertEquals(Sets.newHashSet(1L, 2L, 3L, 4L), IssueUtils.parseFixedIssueNumbers(
- "fix issue #1,fixing issue #2 fix issue #3 and resolve issue #4: gogogo"));
+ Project project = new Project();
+
+ project.setName("test-23");
+ assertEquals(Sets.newHashSet(6L), IssueUtils.parseFixedIssueNumbers(project,
+ "Closing issue test#5, Fixing issue test-23#6"));
+
+ project.setName("test");
+ assertEquals(Sets.newHashSet(1L, 2L, 3L, 4L, 5L), IssueUtils.parseFixedIssueNumbers(project,
+ "fix issue #1,fixing issue #2 fix issue #3 and resolve issue #4: gogogo and Closes issue test#5"));
}
}