The Unified and Autonomous Development Platform
feat: Improve performance of workspace changes page (OD-2752)
Robin Shen78a65859144a
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex fd9ac24018..a1d08b9380 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -8644,4 +8644,21 @@ public class DataMigrator {}}+ private void migrate224(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Workspaces.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element workspaceElement : dom.getRootElement().elements()) {+ Element statusElement = workspaceElement.element("status");+ if (statusElement.getTextTrim().equals("ERROR"))+ statusElement.setText("INACTIVE");+ Element errorDateElement = workspaceElement.element("errorDate");+ if (errorDateElement != null)+ errorDateElement.setName("inactiveDate");+ }+ dom.writeToFile(file, false);+ }+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/event/project/workspace/WorkspaceError.java b/server-core/src/main/java/io/onedev/server/event/project/workspace/WorkspaceInactive.javasimilarity index 50%rename from server-core/src/main/java/io/onedev/server/event/project/workspace/WorkspaceError.javarename to server-core/src/main/java/io/onedev/server/event/project/workspace/WorkspaceInactive.javaindex f4d3687714..02ade96009 100644--- a/server-core/src/main/java/io/onedev/server/event/project/workspace/WorkspaceError.java+++ b/server-core/src/main/java/io/onedev/server/event/project/workspace/WorkspaceInactive.java@@ -2,17 +2,17 @@ package io.onedev.server.event.project.workspace;import io.onedev.server.model.Workspace;-public class WorkspaceError extends WorkspaceEvent {+public class WorkspaceInactive extends WorkspaceEvent {private static final long serialVersionUID = 1L;- public WorkspaceError(Workspace workspace) {- super(workspace.getUser(), workspace.getErrorDate(), workspace);+ public WorkspaceInactive(Workspace workspace) {+ super(workspace.getUser(), workspace.getInactiveDate(), workspace);}@Overridepublic String getActivity() {- return "error";+ return "inactive";}}diff --git a/server-core/src/main/java/io/onedev/server/model/Workspace.java b/server-core/src/main/java/io/onedev/server/model/Workspace.javaindex f4c3aa1546..af70a01efc 100644--- a/server-core/src/main/java/io/onedev/server/model/Workspace.java+++ b/server-core/src/main/java/io/onedev/server/model/Workspace.java@@ -113,7 +113,7 @@ public class Workspace extends AbstractEntity {}public enum Status {- PENDING, ACTIVE, ERROR;+ PENDING, ACTIVE, INACTIVE;@Overridepublic String toString() {@@ -150,7 +150,7 @@ public class Workspace extends AbstractEntity {private Date activeDate;- private Date errorDate;+ private Date inactiveDate;private transient Optional<WorkspaceSpec> specOptional;@@ -232,12 +232,12 @@ public class Workspace extends AbstractEntity {}@Nullable- public Date getErrorDate() {- return errorDate;+ public Date getInactiveDate() {+ return inactiveDate;}- public void setErrorDate(Date errorDate) {- this.errorDate = errorDate;+ public void setInactiveDate(Date inactiveDate) {+ this.inactiveDate = inactiveDate;}public String getToken() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.javaindex 3a6393b5ab..14ba1cd372 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalWorkspaceSetting.java@@ -21,7 +21,7 @@ public class GlobalWorkspaceSetting implements Serializable {namedQueries.add(new NamedWorkspaceQuery("All", null));namedQueries.add(new NamedWorkspaceQuery("Pending", "pending"));namedQueries.add(new NamedWorkspaceQuery("Active", "active"));- namedQueries.add(new NamedWorkspaceQuery("In Error", "error"));+ namedQueries.add(new NamedWorkspaceQuery("Inactive", "inactive"));namedQueries.add(new NamedWorkspaceQuery("Created by me", "created by me"));namedQueries.add(new NamedWorkspaceQuery("Created recently", "\"Create Date\" is since \"last week\""));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ErrorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/InactiveCriteria.javasimilarity index 61%rename from server-core/src/main/java/io/onedev/server/search/entity/workspace/ErrorCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/workspace/InactiveCriteria.javaindex f40f75c6c6..72943ef9e1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/ErrorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/InactiveCriteria.java@@ -2,18 +2,18 @@ package io.onedev.server.search.entity.workspace;import io.onedev.server.model.Workspace;-public class ErrorCriteria extends StatusCriteria {+public class InactiveCriteria extends StatusCriteria {private static final long serialVersionUID = 1L;@Overridepublic Workspace.Status getStatus() {- return Workspace.Status.ERROR;+ return Workspace.Status.INACTIVE;}@Overridepublic String toStringWithoutParens() {- return WorkspaceQuery.getRuleName(WorkspaceQueryLexer.Error);+ return WorkspaceQuery.getRuleName(WorkspaceQueryLexer.Inactive);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.g4index 99ee5bfe04..2d98cc6059 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.g4@@ -7,7 +7,7 @@ query;criteria- : operator=(Pending|Active|Error|CreatedByMe) #OperatorCriteria+ : operator=(Pending|Active|Inactive|CreatedByMe) #OperatorCriteria| operator=CreatedBy WS+ criteriaValue=multipleQuoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| criteriaField=Quoted WS+ operator=(IsSince|IsUntil) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria@@ -35,8 +35,8 @@ Active: 'active';-Error- : 'error'+Inactive+ : 'inactive';CreatedByMediff --git a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.javaindex 9e14e83590..21f05f0794 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/workspace/WorkspaceQuery.java@@ -11,7 +11,7 @@ import static io.onedev.server.model.Workspace.SORT_FIELDS;import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.Active;-import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.Error;+import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.Inactive;import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.Is;import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.IsGreaterThan;import static io.onedev.server.search.entity.workspace.WorkspaceQueryParser.IsLessThan;@@ -110,8 +110,8 @@ public class WorkspaceQuery extends EntityQuery<Workspace> {return new PendingCriteria();case Active:return new ActiveCriteria();- case Error:- return new ErrorCriteria();+ case Inactive:+ return new InactiveCriteria();case WorkspaceQueryLexer.CreatedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");diff --git a/server-core/src/main/java/io/onedev/server/util/FileData.java b/server-core/src/main/java/io/onedev/server/util/FileData.javaindex d2f83aa923..3f2c866655 100644--- a/server-core/src/main/java/io/onedev/server/util/FileData.java+++ b/server-core/src/main/java/io/onedev/server/util/FileData.java@@ -6,6 +6,7 @@ import java.io.IOException;import java.io.Serializable;import org.apache.commons.io.IOUtils;+import org.jspecify.annotations.Nullable;public class FileData implements Serializable {@@ -25,17 +26,22 @@ public class FileData implements Serializable {this.size = size;}+ @Nullablepublic static FileData from(File file) throws IOException {- String name = file.getName();- long length = file.length();- long toRead = Math.min(length, MAX_READ_SIZE);- byte[] content = new byte[(int) toRead];- if (toRead > 0) {- try (var is = new FileInputStream(file)) {- IOUtils.readFully(is, content);+ if (file.exists()) {+ String name = file.getName();+ long length = file.length();+ long toRead = Math.min(length, MAX_READ_SIZE);+ byte[] content = new byte[(int) toRead];+ if (toRead > 0) {+ try (var is = new FileInputStream(file)) {+ IOUtils.readFully(is, content);+ }}+ return new FileData(name, content, length);+ } else {+ return null;}- return new FileData(name, content, length);}public String getName() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.javaindex c4e4e86a9f..cdb45054b9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/workspace/WorkspaceStatsPanel.java@@ -21,7 +21,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.Workspace;import io.onedev.server.model.Workspace.Status;import io.onedev.server.search.entity.workspace.ActiveCriteria;-import io.onedev.server.search.entity.workspace.ErrorCriteria;+import io.onedev.server.search.entity.workspace.InactiveCriteria;import io.onedev.server.search.entity.workspace.PendingCriteria;import io.onedev.server.search.entity.workspace.WorkspaceQuery;import io.onedev.server.util.criteria.Criteria;@@ -79,7 +79,7 @@ public class WorkspaceStatsPanel extends Panel {} else if (entry.getKey() == Status.ACTIVE) {criteria = new ActiveCriteria();} else {- criteria = new ErrorCriteria();+ criteria = new InactiveCriteria();}WorkspaceQuery query = new WorkspaceQuery(criteria);PageParameters params = ProjectWorkspacesPage.paramsOf(getProject(), query.toString(), 0);@@ -92,7 +92,7 @@ public class WorkspaceStatsPanel extends Panel {case ACTIVE:cssClass = "link-success";break;- case ERROR:+ case INACTIVE:cssClass = "link-danger";break;default:diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.javaindex 0b11d60f82..b27b6c23eb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/list/WorkspaceFilterPanel.java@@ -31,7 +31,7 @@ import io.onedev.server.search.entity.workspace.ActiveCriteria;import io.onedev.server.search.entity.workspace.CreateDateCriteria;import io.onedev.server.search.entity.workspace.CreatedByCriteria;import io.onedev.server.search.entity.workspace.CreatedByUserCriteria;-import io.onedev.server.search.entity.workspace.ErrorCriteria;+import io.onedev.server.search.entity.workspace.InactiveCriteria;import io.onedev.server.search.entity.workspace.PendingCriteria;import io.onedev.server.search.entity.workspace.SpecCriteria;import io.onedev.server.search.entity.workspace.StatusCriteria;@@ -79,7 +79,7 @@ abstract class WorkspaceFilterPanel extends FilterEditPanel<Workspace> {} else if (status.equals(Workspace.Status.ACTIVE.name())) {criterias.add(new ActiveCriteria());} else {- criterias.add(new ErrorCriteria());+ criterias.add(new InactiveCriteria());}}Criteria<Workspace> rootCriteria = Criteria.orCriterias(criterias);diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.javaindex 478a952f65..86b7fac556 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.java+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/status/WorkspaceStatusIcon.java@@ -83,8 +83,8 @@ public class WorkspaceStatusIcon extends SpriteImage {return "target";case ACTIVE:return "tick-circle-o";- case ERROR:- return "times-circle-o";+ case INACTIVE:+ return "warning-o";default:throw new RuntimeException("Unexpected workspace status: " + status);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/status/workspace-status.css b/server-core/src/main/java/io/onedev/server/web/component/workspace/status/workspace-status.cssindex 5a73f056aa..db4a178748 100644--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/status/workspace-status.css+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/status/workspace-status.css@@ -4,8 +4,8 @@.workspace-status-active {color: var(--success) !important;}-.workspace-status-error {- color: var(--danger) !important;+.workspace-status-inactive {+ color: var(--warning) !important;}.workspace-status-none {color: #CCC !important;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.htmlindex c79e67266f..63f6227233 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.html@@ -4,7 +4,7 @@<div class="left d-flex align-items-center"><div class="status text-nowrap mr-3"><svg wicket:id="statusIcon" class="mr-2"></svg>- <span wicket:id="statusLabel"></span>+ <span wicket:id="statusLabel" class="font-weight-bolder"></span></div><div class="summary mr-3"><span class="d-none d-md-inline"><a wicket:id="user"></a> on </span><a wicket:id="branch"></a> <span class="d-none d-md-inline">for <span wicket:id="spec"></span></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.javaindex 7ffd9aea62..481116bc9b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/WorkspaceDetailPage.java@@ -167,7 +167,7 @@ public abstract class WorkspaceDetailPage extends ProjectPage {@Overridepublic String getObject() {- return _T(workspaceModel.getObject().getStatus().toString());+ return _T(workspaceModel.getObject().getStatus().name());}}));@@ -303,7 +303,7 @@ public abstract class WorkspaceDetailPage extends ProjectPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getWorkspace().getStatus() == Status.ERROR+ setVisible(getWorkspace().getStatus() == Status.INACTIVE&& SecurityUtils.canModifyOrDelete(getWorkspace()));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.htmlindex bc531d150a..87a55f8566 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.html@@ -1,13 +1,12 @@<wicket:extend><div class="workspace-changes d-flex flex-grow-1 position-relative"><div wicket:id="changesSidebar" class="changes-sidebar autofit d-flex flex-column flex-grow-1 border-right">- <div wicket:id="statusError" class="alert alert-light-danger text-break m-3"></div>+ <div wicket:id="statusError" class="alert alert-light-warning text-break m-3"></div><div class="sync-info d-flex align-items-center p-3"><div class="pull-info flex-grow-1 d-flex align-items-center">- <span wicket:id="behindCount" class="mr-1"></span><a wicket:id="pull" t:data-tippy-content="Pull"><wicket:svg href="arrow3" class="icon rotate-90"/></a></div>- <a wicket:id="sync" t:data-tippy-content="Sync" class="mx-2">+ <a wicket:id="sync" t:data-tippy-content="Sync (pull & push)" class="mx-2"><wicket:svg href="refresh" class="icon"/></a><div class="push-info flex-grow-1 d-flex align-items-center justify-content-end">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.javaindex 2504b01b08..4338cb4ee7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/workspaces/detail/changes/WorkspaceChangesPage.java@@ -4,10 +4,10 @@ import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;import java.nio.charset.StandardCharsets;+import java.text.MessageFormat;import java.util.ArrayList;import java.util.List;-import io.onedev.server.web.page.project.workspaces.detail.log.WorkspaceLogPage;import org.apache.wicket.AttributeModifier;import org.apache.wicket.RestartResponseException;import org.apache.wicket.Session;@@ -26,6 +26,8 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.markup.html.list.ListItem;import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.cycle.RequestCycle;@@ -42,6 +44,7 @@ import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;import io.onedev.server.web.component.diff.text.PlainTextDiffPanel;import io.onedev.server.web.component.fileview.FileViewPanel;import io.onedev.server.web.page.project.workspaces.detail.WorkspaceDetailPage;+import io.onedev.server.web.page.project.workspaces.detail.log.WorkspaceLogPage;import io.onedev.server.workspace.GitExecutionResult;public class WorkspaceChangesPage extends WorkspaceDetailPage {@@ -64,6 +67,37 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {private WebMarkupContainer noSelection;+ private final IModel<StatusInfo> statusModel = new LoadableDetachableModel<>() {++ private static final long serialVersionUID = 1L;++ @Override+ protected StatusInfo load() {+ if (getWorkspace().getStatus() != Workspace.Status.ACTIVE) {+ return StatusInfo.failure(MessageFormat.format(+ _T("Please reprovision the workspace to show changes, or you may login to server \"{0}\" and check changes at \"{1}\""),+ projectService.getActiveServer(getProject().getId(), true),+ Workspace.getWorkDir(getProject().getId(), getWorkspace().getNumber())));+ }+ GitExecutionResult result = executeGit(+ "status", "-b", "--porcelain", "--untracked-files=all");+ if (result.getReturnCode() != 0)+ return StatusInfo.failure(getErrorMessage(result));+ boolean mergeInProgress = workspaceService.readFileData(+ getWorkspace(), ".git/MERGE_HEAD") != null;+ StatusInfo info = parseStatusOutput(stdoutString(result), mergeInProgress);+ if (info.ahead == null) {+ // Branch has no upstream tracking (e.g. workspace was provisioned+ // from an empty server repository). Fall back to counting local+ // commits reachable from HEAD so commits made inside the workspace+ // are reflected by the ahead count and the push button is enabled.+ info = StatusInfo.success(info.entries, countLocalCommits(), mergeInProgress);+ }+ return info;+ }++ };+public WorkspaceChangesPage(PageParameters params) {super(params);if (getWorkspace().getStatus() == Workspace.Status.PENDING)@@ -76,8 +110,6 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {protected void onInitialize() {super.onInitialize();- executeGit("fetch");-sidebar = new WebMarkupContainer("changesSidebar");sidebar.setOutputMarkupId(true);add(sidebar);@@ -109,10 +141,9 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {}private void addSyncInfo(WebMarkupContainer container) {- int[] counts = getAheadBehind();+ int aheadCount = getAhead();- container.add(new Label("behindCount", String.valueOf(counts[0])));- container.add(new Label("aheadCount", String.valueOf(counts[1])));+ container.add(new Label("aheadCount", String.valueOf(aheadCount)));AjaxLink<Void> pullLink = new AjaxLink<Void>("pull") {@@ -136,7 +167,7 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {};- if (counts[0] == 0 || !SecurityUtils.canModifyOrDelete(getWorkspace())) {+ if (!SecurityUtils.canModifyOrDelete(getWorkspace())) {pullLink.add(AttributeAppender.append("class", "disabled"));pullLink.setEnabled(false);}@@ -161,8 +192,7 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {return;}}- int[] aheadBehind = getAheadBehind();- if (aheadBehind[1] > 0) {+ if (getAhead() > 0) {var result = executeGit("push");if (result.getReturnCode() != 0) {Session.get().error(getErrorMessage(result));@@ -202,7 +232,7 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {};pushLink.add(new AjaxIndicatorAppender());- if (counts[0] != 0 || counts[1] == 0 || !SecurityUtils.canModifyOrDelete(getWorkspace())) {+ if (aheadCount == 0 || !SecurityUtils.canModifyOrDelete(getWorkspace())) {pushLink.add(AttributeAppender.append("class", "disabled"));pushLink.setEnabled(false);}@@ -294,29 +324,16 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {}private void addFileSections(WebMarkupContainer container) {- GitExecutionResult statusResult;- if (getWorkspace().getStatus() == Workspace.Status.ACTIVE) {- statusResult = executeGit("status", "--porcelain");- } else {- var errorMessage = String.format(- "Please reprovision the workspace to show changes, " +- "or you may login to server \"%s\" and check changes at \"%s\"",- projectService.getActiveServer(getProject().getId(), true),- Workspace.getWorkDir(getProject().getId(), getWorkspace().getNumber()));-- statusResult = new GitExecutionResult(new byte[0], errorMessage.getBytes(StandardCharsets.UTF_8), 1);- }+ StatusInfo status = statusModel.getObject();- Label statusError = new Label("statusError", getErrorMessage(statusResult));- statusError.setVisible(statusResult.getReturnCode() != 0);+ Label statusError = new Label("statusError", status.errorMessage != null ? status.errorMessage : "");+ statusError.setVisible(status.errorMessage != null);container.add(statusError);- List<FileEntry> allEntries = statusResult.getReturnCode() == 0- ? parseGitStatusOutput(stdoutString(statusResult))- : new ArrayList<>();+ List<FileEntry> allEntries = status.entries;container.add(new WebMarkupContainer("noChangedFiles")- .setVisible(statusResult.getReturnCode() == 0 && allEntries.isEmpty()));+ .setVisible(status.errorMessage == null && allEntries.isEmpty()));List<FileEntry> conflictEntries = new ArrayList<>();List<FileEntry> stagedEntries = new ArrayList<>();@@ -685,7 +702,12 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {private void showRegularDiff(FileEntry entry) {if (entry.displayStatus == 'U') {FileData fileData = workspaceService.readFileData(getWorkspace(), entry.path);- diffContent.replace(new FileViewPanel("diffPanel", Model.of(fileData)));+ if (fileData != null) {+ diffContent.replace(new FileViewPanel("diffPanel", Model.of(fileData)));+ } else {+ diffContent.replace(new Label("diffPanel", _T("File not found"))+ .add(AttributeModifier.replace("class", "d-flex flex-grow-1 align-items-center justify-content-center text-muted text-center")));+ }return;}@@ -709,18 +731,13 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {return;}- FileData fileData;- try {- fileData = workspaceService.readFileData(getWorkspace(), entry.path);- } catch (Exception e) {- diffContent.replace(new Label("diffPanel",- getConflictDescription(entry.indexStatus, entry.workTreeStatus) + ". "- + _T("Unable to read file from the working directory. Please resolve this conflict in the terminal and then mark as resolved."))+ var fileData = workspaceService.readFileData(getWorkspace(), entry.path);+ if (fileData != null) {+ diffContent.replace(new FileViewPanel("diffPanel", Model.of(fileData)));+ } else {+ diffContent.replace(new Label("diffPanel", getConflictDescription(entry.indexStatus, entry.workTreeStatus) + ". " + _T("Unable to read file from the working directory. Please resolve this conflict in the terminal and then mark as resolved.")).add(AttributeModifier.replace("class", "d-flex flex-grow-1 align-items-center justify-content-center text-muted text-center")));- return;}-- diffContent.replace(new FileViewPanel("diffPanel", Model.of(fileData)));}private static String getConflictDescription(char indexStatus, char workTreeStatus) {@@ -844,8 +861,7 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {}private boolean isMergeInProgress() {- GitExecutionResult result = executeGit("rev-parse", "--verify", "MERGE_HEAD");- return result.getReturnCode() == 0;+ return statusModel.getObject().mergeInProgress;}private boolean hasStagedFiles() {@@ -856,43 +872,34 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {return false;}- private int[] getAheadBehind() {- GitExecutionResult result = executeGit("rev-list", "--left-right", "--count",- "@{upstream}...HEAD");- if (result.getReturnCode() != 0) {- result = executeGit("rev-list", "--count", "HEAD");- if (result.getReturnCode() == 0) {- try {- int count = Integer.parseInt(stdoutString(result).trim());- return new int[]{0, count};- } catch (NumberFormatException e) {- // fall through- }- }- return new int[]{0, 0};- }- String output = stdoutString(result).trim();- String[] parts = output.split("\\s+");- if (parts.length == 2) {- try {- return new int[]{Integer.parseInt(parts[0]), Integer.parseInt(parts[1])};- } catch (NumberFormatException e) {- return new int[]{0, 0};- }+ private int getAhead() {+ Integer cached = statusModel.getObject().ahead;+ return cached != null ? cached : 0;+ }++ private int countLocalCommits() {+ GitExecutionResult result = executeGit("rev-list", "--count", "HEAD");+ if (result.getReturnCode() != 0)+ return 0;+ try {+ return Integer.parseInt(stdoutString(result).trim());+ } catch (NumberFormatException e) {+ return 0;}- return new int[]{0, 0};}private List<FileEntry> parseGitStatus() {- GitExecutionResult result = executeGit("status", "--porcelain");- if (result.getReturnCode() != 0)- return new ArrayList<>();- return parseGitStatusOutput(stdoutString(result));+ return statusModel.getObject().entries;}- private List<FileEntry> parseGitStatusOutput(String output) {+ private StatusInfo parseStatusOutput(String output, boolean mergeInProgress) {List<FileEntry> entries = new ArrayList<>();+ Integer ahead = null;for (String line : output.split("\n")) {+ if (line.startsWith("## ")) {+ ahead = parseAheadFromBranchHeader(line);+ continue;+ }if (line.length() < 4)continue;char indexStatus = line.charAt(0);@@ -900,21 +907,33 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {String path = line.substring(3);if (path.startsWith("\"") && path.endsWith("\""))path = unquoteGitPath(path);- if (path.endsWith("/")) {- GitExecutionResult lsResult = executeGit(- "ls-files", "--others", "--exclude-standard", "--", path);- if (lsResult.getReturnCode() == 0) {- for (String filePath : stdoutString(lsResult).split("\n")) {- filePath = filePath.trim();- if (!filePath.isEmpty())- entries.add(new FileEntry(indexStatus, workTreeStatus, filePath));- }- }- } else {- entries.add(new FileEntry(indexStatus, workTreeStatus, path));- }+ entries.add(new FileEntry(indexStatus, workTreeStatus, path));+ }+ return StatusInfo.success(entries, ahead, mergeInProgress);+ }++ /**+ * Parses the ahead count from the {@code ## branch...upstream [ahead N, behind M]}+ * header produced by {@code git status -b --porcelain}. Returns {@code null}+ * when the branch has no upstream (or for unborn / detached HEAD), in which+ * case the caller falls back to {@link #countLocalCommits()}.+ */+ private Integer parseAheadFromBranchHeader(String line) {+ String header = line.substring(3);+ if (header.indexOf("...") < 0)+ return null;+ int aheadIdx = header.indexOf("[ahead ");+ if (aheadIdx < 0)+ return 0;+ int start = aheadIdx + "[ahead ".length();+ int end = start;+ while (end < header.length() && Character.isDigit(header.charAt(end)))+ end++;+ try {+ return Integer.parseInt(header.substring(start, end));+ } catch (NumberFormatException e) {+ return 0;}- return entries;}private String unquoteGitPath(String quoted) {@@ -992,6 +1011,12 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {return result;}+ @Override+ protected void onDetach() {+ statusModel.detach();+ super.onDetach();+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -1094,4 +1119,32 @@ public class WorkspaceChangesPage extends WorkspaceDetailPage {}}+ private static class StatusInfo implements Serializable {+ private static final long serialVersionUID = 1L;++ final List<FileEntry> entries;+ final String errorMessage;+ // Number of commits to push. Parsed from the branch header when the+ // branch has an upstream; otherwise filled in with the count of local+ // commits reachable from HEAD. null only when status loading failed.+ final Integer ahead;+ final boolean mergeInProgress;++ private StatusInfo(List<FileEntry> entries, String errorMessage,+ Integer ahead, boolean mergeInProgress) {+ this.entries = entries;+ this.errorMessage = errorMessage;+ this.ahead = ahead;+ this.mergeInProgress = mergeInProgress;+ }++ static StatusInfo success(List<FileEntry> entries, Integer ahead, boolean mergeInProgress) {+ return new StatusInfo(entries, null, ahead, mergeInProgress);+ }++ static StatusInfo failure(String errorMessage) {+ return new StatusInfo(new ArrayList<>(), errorMessage, null, false);+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation.javaindex 99113d3c0c..ecfdd87426 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation.java@@ -90,11 +90,13 @@ public class Translation extends TranslationResourceBundle {extraKeys.add("PENDING");extraKeys.add("FAILED");extraKeys.add("CANCELLED");- extraKeys.add("TIMED_OUT");+ extraKeys.add("TIMED_OUT");extraKeys.add("SUCCESSFUL");extraKeys.add("OPEN");extraKeys.add("MERGED");extraKeys.add("DISCARDED");+ extraKeys.add("ACTIVE");+ extraKeys.add("INACTIVE");extraKeys.add("Container Image(s)");extraKeys.add("Container Image");extraKeys.add("RubyGems(s)");diff --git a/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.java b/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.javaindex f9df42ba8d..b4db97e260 100644--- a/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.java+++ b/server-core/src/main/java/io/onedev/server/web/websocket/WorkspaceEventBroadcaster.java@@ -7,7 +7,7 @@ import javax.inject.Singleton;import io.onedev.server.event.Listen;import io.onedev.server.event.project.workspace.WorkspaceActive;-import io.onedev.server.event.project.workspace.WorkspaceError;+import io.onedev.server.event.project.workspace.WorkspaceInactive;@Singletonpublic class WorkspaceEventBroadcaster {@@ -25,7 +25,7 @@ public class WorkspaceEventBroadcaster {}@Listen- public void on(WorkspaceError event) {+ public void on(WorkspaceInactive event) {webSocketService.notifyObservablesChange(Set.of(event.getWorkspace().getStatusChangeObservable()), event.getSourcePage());}diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.javaindex 4886fea517..00b4be1988 100644--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java@@ -67,7 +67,7 @@ import io.onedev.server.event.ListenerRegistry;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.project.workspace.WorkspaceActive;import io.onedev.server.event.project.workspace.WorkspaceCreated;-import io.onedev.server.event.project.workspace.WorkspaceError;+import io.onedev.server.event.project.workspace.WorkspaceInactive;import io.onedev.server.event.project.workspace.WorkspaceEvent;import io.onedev.server.event.project.workspace.WorkspacePending;import io.onedev.server.event.system.SystemStarted;@@ -238,7 +238,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>@Sessional@Listen- public void on(WorkspaceError event) {+ public void on(WorkspaceInactive event) {logService.flush(event.getWorkspace().getLoggingSupport());}@@ -415,9 +415,9 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>@Transactional@Overridepublic void requestToReprovision(Workspace workspace) {- Preconditions.checkState(workspace.getStatus() == Status.ERROR);+ Preconditions.checkState(workspace.getStatus() == Status.INACTIVE);workspace.setStatus(Status.PENDING);- workspace.setErrorDate(null);+ workspace.setInactiveDate(null);workspace.setActiveDate(null);var projectId = workspace.getProject().getId();var workspaceNumber = workspace.getNumber();@@ -551,7 +551,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>var workspace = get(entry.getKey());var future = entry.getValue();if (workspace == null- || workspace.getStatus() == Status.ERROR+ || workspace.getStatus() == Status.INACTIVE|| !localServer.equals(projectService.getActiveServer(workspace.getProject().getId(), false))) {future.cancel(true);it.remove();@@ -738,10 +738,10 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>}private void markWorkspaceError(Workspace workspace) {- workspace.setStatus(Workspace.Status.ERROR);- workspace.setErrorDate(new Date());+ workspace.setStatus(Workspace.Status.INACTIVE);+ workspace.setInactiveDate(new Date());update(workspace);- listenerRegistry.post(new WorkspaceError(workspace));+ listenerRegistry.post(new WorkspaceInactive(workspace));}private void log(TaskLogger logger, Throwable throwable) {diff --git a/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.javaindex ec39e6b882..e7ac2030be 100644--- a/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java+++ b/server-core/src/main/java/io/onedev/server/workspace/WorkspaceService.java@@ -70,6 +70,7 @@ public interface WorkspaceService extends EntityService<Workspace> {GitExecutionResult executeGitCommand(Workspace workspace, String[] gitArgs);+ @NullableFileData readFileData(Workspace workspace, String path);}