The Unified and Autonomous Development Platform
Improve commit reference in markdown to suppport project prefixing
Robin Shen7e51d1d4b46a
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.javaindex c8984a7d49..b9f5bab3ba 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@@ -507,8 +507,12 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>});try {for (Issue issue: issueManager.query(projectScope, query, true, 0, Integer.MAX_VALUE)) {+ String commitFQN = newCommitId.name();+ if (!project.equals(issue.getProject()))+ commitFQN = project.getPath() + ":" + commitFQN;changeState(issue, transition.getToState(), new HashMap<>(),- transition.getRemoveFields(), "State changed as code fixing the issue is committed");+ transition.getRemoveFields(),+ "State changed as code fixing the issue is committed (" + commitFQN + ")");}} finally {ProjectScopedCommit.pop();diff --git a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.javaindex 80340e35a8..706a670bb8 100644--- a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java+++ b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java@@ -6,6 +6,9 @@ import java.util.regex.Pattern;import javax.annotation.Nullable;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.util.validation.ProjectPathValidator;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.ObjectId;import org.jsoup.nodes.Document;@@ -26,7 +29,8 @@ public class CommitProcessor implements MarkdownProcessor {private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");- private static final Pattern PATTERN_COMMIT = Pattern.compile("(^|\\s)([a-z0-9]{40})($|\\s)");+ private static final Pattern PATTERN_COMMIT = Pattern.compile(+ "(^|\\W+)((" + ProjectPathValidator.PATTERN.pattern() + "):)?([a-z0-9]{40})($|[^a-z0-9])");@Overridepublic void process(Document document, @Nullable Project project,@@ -44,21 +48,33 @@ public class CommitProcessor implements MarkdownProcessor {NodeTraversor.traverse(visitor, document);+ ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);for (TextNode node : visitor.getMatchedNodes()) {Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());while (matcher.find()) {- String commitHash = matcher.group(2);- String commitTag;- ObjectId commitId = ObjectId.fromString(commitHash);- if (project.getRevCommit(commitId, false) != null) {- CharSequence url = RequestCycle.get().urlFor(- CommitDetailPage.class, CommitDetailPage.paramsOf(project, commitId.name()));- commitTag = String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>", url, commitId.name(),- GitUtils.abbreviateSHA(commitId.name()));+ String commitReplacement;+ String commitProjectPath = matcher.group(3);+ String commitHash = matcher.group(5);+ Project commitProject = project;+ String commitPrefix = "";+ if (commitProjectPath != null) {+ commitProject = projectManager.findByPath(commitProjectPath);+ commitPrefix = commitProjectPath + ":";+ }+ if (commitProject != null) {+ ObjectId commitId = ObjectId.fromString(commitHash);+ if (commitProject.getRevCommit(commitId, false) != null) {+ CharSequence url = RequestCycle.get().urlFor(+ CommitDetailPage.class, CommitDetailPage.paramsOf(commitProject, commitId.name()));+ commitReplacement = String.format("<a href='%s' class='commit reference' data-reference='%s'>%s</a>",+ url, commitPrefix + commitId.name(), commitPrefix + GitUtils.abbreviateSHA(commitId.name()));+ } else {+ commitReplacement = commitPrefix + commitHash;+ }} else {- commitTag = commitId.name();+ commitReplacement = commitPrefix + commitHash;}- HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitTag + matcher.group(3));+ HtmlUtils.appendReplacement(matcher, node, matcher.group(1) + commitReplacement + matcher.group(6));}HtmlUtils.appendTail(matcher, node);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 6d066691ee..3d0402494e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -416,14 +416,14 @@ public class MarkdownEditor extends FormComponentPanel<String> {case "referenceQuery":String referenceQuery = params.getParameterValue("param1").toOptionalString();String referenceQueryType = params.getParameterValue("param2").toOptionalString();- String referenceProjectName = params.getParameterValue("param3").toOptionalString();+ String referenceProjectPath = params.getParameterValue("param3").toOptionalString();List<Map<String, String>> referenceList = new ArrayList<>();Project referenceProject;- if (StringUtils.isNotBlank(referenceProjectName))- referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectName);+ if (StringUtils.isNotBlank(referenceProjectPath))+ referenceProject = OneDev.getInstance(ProjectManager.class).findByPath(referenceProjectPath);elsereferenceProject = null;- if (referenceProject != null || StringUtils.isBlank(referenceProjectName)) {+ if (referenceProject != null || StringUtils.isBlank(referenceProjectPath)) {if ("issue".equals(referenceQueryType)) {for (Issue issue: getReferenceSupport().findIssues(referenceProject, referenceQuery, ATWHO_LIMIT)) {Map<String, String> referenceMap = new HashMap<>();diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 10fbc82328..560dd396cd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -6,6 +6,7 @@ import java.util.List;import javax.annotation.Nullable;+import io.onedev.server.entitymanager.*;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;@@ -28,11 +29,6 @@ import org.unbescape.javascript.JavaScriptEscape;import io.onedev.commons.loader.AppLoader;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.BuildManager;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.entitymanager.UserManager;import io.onedev.server.markdown.MarkdownManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;@@ -254,8 +250,19 @@ public class MarkdownViewer extends GenericPanel<String> {}break;case "commit":- RevCommit commit = getProject().getRevCommit(ObjectId.fromString(referenceId), false);- if (commit != null && SecurityUtils.canReadCode(getProject())) {+ Project commitProject = getProject();+ String commitHash;+ if (referenceId.contains(":")) {+ commitProject = OneDev.getInstance(ProjectManager.class)+ .findByPath(StringUtils.substringBefore(referenceId, ":"));+ commitHash = StringUtils.substringAfter(referenceId, ":");+ } else {+ commitHash = referenceId;+ }+ RevCommit commit = null;+ if (commitProject != null)+ commit = commitProject.getRevCommit(ObjectId.fromString(commitHash), false);+ if (commit != null && SecurityUtils.canReadCode(commitProject)) {String script = String.format("onedev.server.markdown.renderCommitTooltip('%s', '%s', '%s');",JavaScriptEscape.escapeJavaScript(commit.getAuthorIdent().getName()),JavaScriptEscape.escapeJavaScript(DateUtils.formatAge(commit.getCommitterIdent().getWhen())),diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.javaindex ca31146827..1ad1508cd8 100644--- a/server-product/src/test/java/io/onedev/server/product/Test.java+++ b/server-product/src/test/java/io/onedev/server/product/Test.java@@ -5,5 +5,4 @@ public class Test {@org.junit.Testpublic void test() {}-}\ No newline at end of file