Skip to content

The Unified and Autonomous Development Platform

Correctly hyper-link issues and pull requests in commit message

Robin Shen5246816c9680
diff --git a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
index 8a986291de..7e1d649e19 100644
--- a/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
+++ b/core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java
@@ -34,9 +34,9 @@ public class CommitMessageTransformer implements Transformer<String> {
private static final Logger logger = LoggerFactory.getLogger(CommitMessageTransformer.class);
- private static final Pattern PULL_REQUEST_PATTERN = Pattern.compile("(.*pull\\s*request\\s+)([\\w\\.-]*)#(\\d+)($|\\W+?)");
+ private static final Pattern PULL_REQUEST_PATTERN = Pattern.compile("(.*pull\\s*request\\s+)([\\w\\.-]*)#(\\d+)(?=$|\\W+?)");
- private static final Pattern ISSUE_PATTERN = Pattern.compile("(^|\\W+)([\\w\\.-]*)#(\\d+)($|\\W+?)");
+ private static final Pattern ISSUE_PATTERN = Pattern.compile("(^|\\W+)([\\w\\.-]*)#(\\d+)(?=$|\\W+?)");
private final Project project;
@@ -140,7 +140,7 @@ public class CommitMessageTransformer implements Transformer<String> {
AbstractEntity entity = entityInfoProvider.find(referencedProject, Long.parseLong(matcher.group(3)));
if (entity != null) {
String link = String.format("<a href=\"%s\">%s#%s</a>", entityInfoProvider.getUrl(referencedProject, entity), referencedProjectName, matcher.group(3));
- matcher.appendReplacement(buffer, matcher.group(1) + link + matcher.group(4));
+ matcher.appendReplacement(buffer, matcher.group(1) + link);
} else {
matcher.appendReplacement(buffer, matcher.group());
}
@@ -149,7 +149,7 @@ public class CommitMessageTransformer implements Transformer<String> {
AbstractEntity entity = entityInfoProvider.find(project, Long.parseLong(matcher.group(3)));
if (entity != null) {
String link = String.format("<a href=\"%s\">#%s</a>", entityInfoProvider.getUrl(project, entity), matcher.group(3));
- matcher.appendReplacement(buffer, matcher.group(1) + link + matcher.group(4));
+ matcher.appendReplacement(buffer, matcher.group(1) + link);
} else {
matcher.appendReplacement(buffer, matcher.group());
}
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index c98f113975..e8d3cec64b 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -31,9 +31,9 @@
<span wicket:id="avatar"></span>
</div>
<div class="detail pull-left">
- <div class="message-and-labels">
- <span wicket:id="message" class="message"></span>
- <span wicket:id="labels" class="label label-default"></span>
+ <div class="message-and-labels clearfix">
+ <div wicket:id="message" class="message pull-left"></div>
+ <div wicket:id="labels" class="label label-default pull-left"></div>
</div>
<div wicket:id="contribution"></div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html b/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html
index 0aafba700f..e2a458dc2f 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html
@@ -1,9 +1,9 @@
<wicket:panel>
- <span class="commit-message">
+ <div class="commit-message">
<span wicket:id="summary" class="summary"></span>
<a class="ellipsis-expander" href="javascript:void(0);" title="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize();" wicket:id="toggle">
<i class="fa fa-ellipsis-h"></i>
</a>
<pre wicket:id="detail" class="detail"></pre>
- </span>
+ </div>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css b/core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
index 780b228772..df2be57580 100644
--- a/core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
+++ b/core/src/main/java/io/onedev/server/web/component/commit/message/commit-message.css
@@ -4,9 +4,14 @@
.commit-message>.detail {
display: none;
color: #666;
- font-size: 12px;
- border: none;
- background: none;
- margin-bottom: 0;
- padding-left: 0;
+ font-size: 12px;
+ border: none;
+ border-left: 4px solid #E8E8E8;
+ background: none;
+ margin: 8px 0;
+ padding: 0 0 0 12px;
+ border-radius: 0;
}
+.commit:hover .commit-message>.detail {
+ border-left-color: #D8D8D8;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
index 077a78f6c0..52b05f659d 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
@@ -3,7 +3,7 @@
<div class="head">Commits</div>
<div class="body">
<div wicket:id="commits" class="commit clearfix">
- <a wicket:id="message" class="pull-left"><span wicket:id="label"></span></a>
+ <div wicket:id="message" class="pull-left"></div>
<div class="pull-right">
<a wicket:id="hash" class="hash"><span wicket:id="label"></span></a>
<a wicket:id="copyHash" class="copy"><i class="fa fa-clipboard"></i></a>
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
index 2174f1549f..5294d40102 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
@@ -18,8 +18,10 @@ import org.eclipse.jgit.revwalk.RevCommit;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
+import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
@@ -46,14 +48,19 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {
@Override
protected void populateItem(ListItem<RevCommit> item) {
RevCommit commit = item.getModelObject();
+ item.add(new CommitMessagePanel("message", new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return getIssue().getProject();
+ }
+
+ }, item.getModel()));
+
CommitDetailPage.State commitState = new CommitDetailPage.State();
commitState.revision = commit.name();
PageParameters params = CommitDetailPage.paramsOf(getIssue().getProject(), commitState);
- Link<Void> messageLink = new ViewStateAwarePageLink<Void>("message", CommitDetailPage.class, params);
- messageLink.add(new Label("label", commit.getShortMessage()));
- item.add(messageLink);
-
Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hash", CommitDetailPage.class, params);
hashLink.add(new Label("label", GitUtils.abbreviateSHA(commit.name())));
item.add(hashLink);
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css b/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
index 2b1fc82a73..37330fc2f2 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
@@ -9,4 +9,10 @@
}
.issue-commits>.body .commit {
margin-bottom: 6px;
+}
+.issue-commits>.body .commit .hash {
+ color: #444;
+}
+.issue-commits>.body .commit:hover {
+ background: #F2F2F2;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css
index cab58defef..aee66a8cc0 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css
@@ -10,3 +10,9 @@
.issue-pull-requests>.body .pull-request {
margin-bottom: 6px;
}
+.issue-pull-requests>.body .pull-request a {
+ color: #444;
+}
+.issue-pull-requests>.body .pull-request:hover {
+ background: #F2F2F2;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
index cd9cf1683f..47b98aa207 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html
@@ -20,7 +20,7 @@
<a wicket:id="commitHash" class="hash"><span wicket:id="label"></span></a>
<a wicket:id="copyCommitHash" class="copy"><i class="fa fa-clipboard"></i></a>
</div>
- <a wicket:id="commitMessage" class="message pull-left"><span wicket:id="label"></span></a>
+ <div wicket:id="commitMessage" class="message pull-left"></div>
<div class="contribution pull-right">
<span wicket:id="commitAvatars"></span> <span wicket:id="commitNames"></span>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index 65274deff4..852b3c89d3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -43,6 +43,7 @@ import io.onedev.server.web.component.build.BuildTitleLabel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.build.status.BuildStatusLabel;
+import io.onedev.server.web.component.commit.message.CommitMessagePanel;
import io.onedev.server.web.component.contributorpanel.ContributorPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.sideinfo.SideInfoClosed;
@@ -233,15 +234,20 @@ public abstract class BuildDetailPage extends ProjectPage {
});
- RevCommit commit = getProject().getRevCommit(getBuild().getCommitHash(), true);
-
CommitDetailPage.State commitState = new CommitDetailPage.State();
- commitState.revision = commit.name();
+ commitState.revision = getBuild().getCommitHash();
PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);
- Link<Void> messageLink = new ViewStateAwarePageLink<Void>("commitMessage", CommitDetailPage.class, params);
- add(messageLink);
- messageLink.add(new Label("label", commit.getShortMessage()));
+ add(new CommitMessagePanel("commitMessage", projectModel, new AbstractReadOnlyModel<RevCommit>() {
+
+ @Override
+ public RevCommit getObject() {
+ return getProject().getRevCommit(getBuild().getCommitHash(), true);
+ }
+
+ }));
+
+ RevCommit commit = getProject().getRevCommit(getBuild().getCommitHash(), true);
add(new ContributorAvatars("commitAvatars", commit.getAuthorIdent(), commit.getCommitterIdent()));
add(new ContributorPanel("commitNames", commit.getAuthorIdent(), commit.getCommitterIdent()));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
index 16661527c5..7457374691 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
@@ -36,6 +36,9 @@
background: #F9F9F9;
display: none;
}
+#build-detail>.main>.commit-info a.hash {
+ color: #444;
+}
#build-detail>.main>.commit-info>* {
margin-right: 16px;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css b/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
index c2ceee1512..975a835ca3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/commit-detail.css
@@ -32,7 +32,7 @@
}
#commit-detail>.info>.message>.detail {
color: #666;
- padding: 12px;
+ padding: 0 0 12px 0;
font-size: 13px;
border: none;
background: none;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
index 7626f7055a..d652a54bb1 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html
@@ -9,7 +9,7 @@
<td class="icon"><i class="fa fa-ext fa-commit"></i></td>
<td class="author"><span wicket:id="author"></span></td>
<td class="message">
- <span wicket:id="message"></span>
+ <div wicket:id="message"></div>
</td>
<td class="hash-and-status clearfix">
<div class="pull-right">