The Unified and Autonomous Development Platform
fix: Gitlink without `.gitmodules` breaks commit rendering
Robin Shenff8634a644e1
diff --git a/server-core/src/main/java/io/onedev/server/git/Submodule.java b/server-core/src/main/java/io/onedev/server/git/Submodule.javaindex 3f8820206d..9db009e555 100644--- a/server-core/src/main/java/io/onedev/server/git/Submodule.java+++ b/server-core/src/main/java/io/onedev/server/git/Submodule.java@@ -2,7 +2,7 @@ package io.onedev.server.git;import java.io.Serializable;-import org.apache.commons.lang3.StringUtils;+import org.jspecify.annotations.Nullable;public class Submodule implements Serializable {@@ -10,16 +10,16 @@ public class Submodule implements Serializable {private static final String SEPARATOR = ":";- private final String url;+ private final @Nullable String url;private final String commitHash;- public Submodule(String url, String commitHash) {+ public Submodule(@Nullable String url, String commitHash) {this.url = url;this.commitHash = commitHash;}- public String getUrl() {+ public @Nullable String getUrl() {return url;}@@ -29,12 +29,20 @@ public class Submodule implements Serializable {@Overridepublic String toString() {- return url + SEPARATOR + commitHash;+ if (url != null)+ return url + SEPARATOR + commitHash;+ else+ return commitHash;}public static Submodule fromString(String str) {- String url = StringUtils.substringBeforeLast(str, SEPARATOR);- String commitHash = StringUtils.substringAfterLast(str, SEPARATOR);- return new Submodule(url, commitHash);+ int separatorIndex = str.lastIndexOf(SEPARATOR);+ if (separatorIndex != -1) {+ String url = str.substring(0, separatorIndex);+ String commitHash = str.substring(separatorIndex + SEPARATOR.length());+ return new Submodule(url, commitHash);+ } else {+ return new Submodule(null, str);+ }}}diff --git a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.javaindex 991162c8f5..e0fc1313fd 100644--- a/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java+++ b/server-core/src/main/java/io/onedev/server/git/service/DefaultGitService.java@@ -936,14 +936,8 @@ public class DefaultGitService implements GitService, Serializable {ObjectId blobId = treeWalk.getObjectId(0);if (blobIdent.isGitLink()) {String url = getSubmodules().get(blobIdent.path);- if (url == null) {- logger.error("Unable to find submodule (revision: {}, path: {})",- revId.name(), path);- blob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());- } else {- String hash = blobId.name();- blob = new Blob(blobIdent, blobId, new Submodule(url, hash).toString().getBytes());- }+ String hash = blobId.name();+ blob = new Blob(blobIdent, blobId, new Submodule(url, hash).toString().getBytes());} else if (blobIdent.isTree()) {throw new BadRequestException("Path '" + blobIdent.path + "' is a tree");} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.htmlindex a6db017279..e3ab8f40be 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html@@ -1,5 +1,5 @@<wicket:extend><div class="git-link">- <wicket:svg href="folder-embed" class="icon"></wicket:svg> Sub module: <a wicket:id="link"><span wicket:id="label"></span></a>+ <wicket:svg href="folder-embed" class="icon"></wicket:svg> Sub module: <a wicket:id="link"><span wicket:id="label"></span></a><span wicket:id="unregistered"> (path not registered in <code>.gitmodules</code>)</span></div>-</wicket:extend>\ No newline at end of file+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.javaindex e14f405061..43e0c8a402 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java@@ -37,15 +37,16 @@ public class GitLinkPanel extends BlobViewPanel {ProjectService projectService = OneDev.getInstance(ProjectService.class);String rootUrl = settingService.getSystemSetting().getServerUrl() + "/";Project project = null;- if (submodule.getUrl().startsWith(rootUrl)) {+ String url = submodule.getUrl();+ if (url != null && url.startsWith(rootUrl)) {link = new WebMarkupContainer("link");- String projectPath = submodule.getUrl().substring(rootUrl.length());+ String projectPath = url.substring(rootUrl.length());project = projectService.findByPath(projectPath);- } else if (!submodule.getUrl().startsWith("http:")- && !submodule.getUrl().startsWith("https:")- && !submodule.getUrl().startsWith("ssh:")) { // relative url+ } else if (url != null && !url.startsWith("http:")+ && !url.startsWith("https:")+ && !url.startsWith("ssh:")) { // relative urlString projectPath = Paths.get(context.getProject().getPath())- .resolve(submodule.getUrl()).normalize().toString();+ .resolve(url).normalize().toString();project = projectService.findByPath(projectPath);}if (project != null) {@@ -66,6 +67,7 @@ public class GitLinkPanel extends BlobViewPanel {}link.add(new Label("label", submodule));add(link);+ add(new WebMarkupContainer("unregistered").setVisible(url == null));}@Overridediff --git a/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.java b/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.javaindex df5840b0f0..2a1328b24d 100644--- a/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.java+++ b/server-core/src/test/java/io/onedev/server/git/service/DefaultGitServiceCommitTest.java@@ -16,6 +16,8 @@ import java.util.Map;import java.util.Set;import org.bouncycastle.openpgp.PGPSecretKeyRing;+import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;+import org.eclipse.jgit.dircache.DirCacheEntry;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevTree;@@ -32,8 +34,10 @@ import io.onedev.server.cluster.ClusterTask;import io.onedev.server.event.ListenerRegistry;import io.onedev.server.exception.NotFoundException;import io.onedev.server.git.AbstractGitTest;+import io.onedev.server.git.Blob;import io.onedev.server.git.BlobContent;import io.onedev.server.git.BlobEdits;+import io.onedev.server.git.Submodule;import io.onedev.server.git.exception.NotTreeException;import io.onedev.server.git.exception.ObjectAlreadyExistsException;import io.onedev.server.git.exception.ObsoleteCommitException;@@ -73,6 +77,32 @@ public class DefaultGitServiceCommitTest extends AbstractGitTest {gitService = new DefaultGitService(projectService, settingService, sessionService,clusterService, listenerRegistry);}++ @Test+ public void testGetUnregisteredGitLink() throws IOException {+ addFileAndCommit("README.md", "test", "initial commit");+ ObjectId gitLinkId = ObjectId.fromString("0123456789012345678901234567890123456789");+ var dirCache = git.getRepository().lockDirCache();+ var editor = dirCache.editor();+ editor.add(new PathEdit("unregistered") {++ @Override+ public void apply(DirCacheEntry entry) {+ entry.setFileMode(FileMode.GITLINK);+ entry.setObjectId(gitLinkId);+ }++ });+ editor.commit();+ ObjectId commitId = ObjectId.fromString(commit("add unregistered gitlink"));++ Blob blob = gitService.getBlob(new Project(), commitId, "unregistered");++ assertEquals(gitLinkId.name(), blob.getText().getContent());+ Submodule submodule = Submodule.fromString(blob.getText().getContent());+ assertNull(submodule.getUrl());+ assertEquals(gitLinkId.name(), submodule.getCommitId());+ }@Testpublic void testRemoveFile() throws IOException {