The Unified and Autonomous Development Platform
feat: More detailed error message for repository sync failure (OD-2395)
Robin Shen271bddff556a
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.javaindex a36ea67b95..ec9fd2e233 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PullRepository.java@@ -238,7 +238,8 @@ public class PullRepository extends SyncRepository {for (String each : Splitter.on(' ').omitEmptyStrings().trimResults().split(refs))git.addArgs(each + ":" + each);- git.execute(new LineConsumer() {+ var errorMessage = new StringBuilder();+ var result = git.execute(new LineConsumer() {@Overridepublic void consume(String line) {@@ -249,13 +250,18 @@ public class PullRepository extends SyncRepository {@Overridepublic void consume(String line) {- if (!line.startsWith("From") && !line.contains("->"))- logger.error(line);- else+ if (!line.startsWith("From")) {+ errorMessage.append(line).append("\n");+ logger.warn(line);+ } else {logger.debug(line);+ }}- }).checkReturnCode();+ });+ if (errorMessage.length() != 0)+ result.setErrorMessage(errorMessage.toString());+ result.checkReturnCode();Map<String, ObjectId> newCommitIds = getBranchCommits(repository);@@ -268,7 +274,8 @@ public class PullRepository extends SyncRepository {git.addArgs("remote", "show", remoteUrl);AtomicReference<String> headBranch = new AtomicReference<>(null);- git.execute(new LineConsumer() {+ errorMessage.setLength(0);+ result = git.execute(new LineConsumer() {@Overridepublic void consume(String line) {@@ -281,10 +288,14 @@ public class PullRepository extends SyncRepository {@Overridepublic void consume(String line) {+ errorMessage.append(line).append("\n");logger.warn(line);}- }).checkReturnCode();+ });+ if (errorMessage.length() != 0)+ result.setErrorMessage(errorMessage.toString());+ result.checkReturnCode();if (headBranch.get() != null) {if (GitUtils.resolve(repository, R_HEADS + headBranch.get(), false) == null) {@@ -298,7 +309,8 @@ public class PullRepository extends SyncRepository {git.clearArgs();git.addArgs("branch");- git.execute(new LineConsumer() {+ errorMessage.setLength(0);+ result = git.execute(new LineConsumer() {@Overridepublic void consume(String line) {@@ -310,10 +322,14 @@ public class PullRepository extends SyncRepository {@Overridepublic void consume(String line) {+ errorMessage.append(line).append("\n");logger.warn(line);}- }).checkReturnCode();+ });+ if (errorMessage.length() != 0)+ result.setErrorMessage(errorMessage.toString());+ result.checkReturnCode();}if (headBranch.get() != null)GitUtils.setDefaultBranch(repository, headBranch.get());diff --git a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.javaindex 681208b6e2..fc11f473a3 100644--- a/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java+++ b/server-core/src/main/java/io/onedev/server/search/entitytext/EntityTextManager.java@@ -38,7 +38,6 @@ import org.apache.lucene.analysis.nl.DutchAnalyzer;import org.apache.lucene.analysis.no.NorwegianAnalyzer;import org.apache.lucene.analysis.pt.PortugueseAnalyzer;import org.apache.lucene.analysis.ru.RussianAnalyzer;-import org.apache.lucene.analysis.snowball.SnowballFilter;import org.apache.lucene.analysis.standard.StandardAnalyzer;import org.apache.lucene.analysis.sv.SwedishAnalyzer;import org.apache.lucene.document.Document;