Skip to content

The Unified and Autonomous Development Platform

chore: Remove file by file mode in diff view to simply diff logic

Robin Shen2e0e79b51fd4
diff --git a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java
index debbb9216a..49126fb61b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/CompareContext.java
@@ -1,19 +1,13 @@
package io.onedev.server.model.support;
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-import javax.persistence.Column;
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.diff.WhitespaceOption;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.util.diff.WhitespaceOption;
+import javax.annotation.Nullable;
+import javax.persistence.*;
+import java.io.Serializable;
@Embeddable
public class CompareContext implements Serializable {
@@ -43,8 +37,6 @@ public class CompareContext implements Serializable {
private String pathFilter;
- private String currentFile;
-
@Column(nullable=false)
private WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;
@@ -73,15 +65,6 @@ public class CompareContext implements Serializable {
this.pathFilter = pathFilter;
}
- @Nullable
- public String getCurrentFile() {
- return currentFile;
- }
-
- public void setCurrentFile(@Nullable String currentFile) {
- this.currentFile = currentFile;
- }
-
public WhitespaceOption getWhitespaceOption() {
return whitespaceOption;
}
@@ -102,7 +85,6 @@ public class CompareContext implements Serializable {
.append(oldCommitHash, otherContext.oldCommitHash)
.append(newCommitHash, otherContext.newCommitHash)
.append(pathFilter, otherContext.pathFilter)
- .append(currentFile, otherContext.currentFile)
.append(whitespaceOption, otherContext.whitespaceOption)
.isEquals();
}
@@ -114,7 +96,6 @@ public class CompareContext implements Serializable {
.append(oldCommitHash)
.append(newCommitHash)
.append(pathFilter)
- .append(currentFile)
.append(whitespaceOption)
.toHashCode();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
index cb2eaef6f1..a5344087ec 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html
@@ -10,7 +10,7 @@
<a wicket:id="batchedSuggestions" class="batched-suggestions btn btn-light flex-shrink-0" title="Batched suggestions"><wicket:svg href="diff" class="icon icon-lg mr-2"/> <span wicket:id="count" class="mr-1">3</span><wicket:svg href="arrow" class="icon rotate-90"/></a>
<a wicket:id="option" class="btn btn-light btn-icon btn-lg flex-shrink-0"><wicket:svg href="gear" class="icon"/></a>
</span>
- <div class="path-filter flex-grow-1 mr-5">
+ <div class="path-filter flex-grow-1">
<form wicket:id="pathFilter">
<div class="clearable-wrapper">
<div class="input-group">
@@ -22,22 +22,6 @@
</div>
</form>
</div>
- <div wicket:id="navs" class="ml-auto flex-shrink-0 border rounded navs">
- <div wicket:id="showAllFiles" class="font-size-lg d-flex align-items-center flex-nowrap flex-shrink-0">
- <span wicket:id="totalFiles"></span>
- <wicket:enclosure child="showSingleFile">
- <span class="dot mx-3"></span>
- <a wicket:id="showSingleFile">Show one by one</a>
- </wicket:enclosure>
- </div>
- <div wicket:id="showSingleFile" class="font-size-lg d-flex align-items-center flex-nowrap flex-shrink-0">
- <span wicket:id="message"></span>
- <a wicket:id="prev" class="ml-3">Prev</a>
- <a wicket:id="next" class="ml-2">Next</a>
- <span class="dot mx-3"></span>
- <a wicket:id="showAllFiles">Show all files</a>
- </div>
- </div>
</div>
<div wicket:id="body" class="body">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index a64190d44c..ba0bcccb93 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -13,9 +13,9 @@ import io.onedev.commons.utils.match.Matcher;
import io.onedev.commons.utils.match.PathMatcher;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.ProjectAttachmentSupport;
+import io.onedev.server.codequality.BlobTarget;
import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CoverageStatus;
-import io.onedev.server.codequality.BlobTarget;
import io.onedev.server.entitymanager.PendingSuggestionApplyManager;
import io.onedev.server.event.project.CommitIndexed;
import io.onedev.server.git.BlobChange;
@@ -45,7 +45,6 @@ import io.onedev.server.web.component.codecomment.CodeCommentPanel;
import io.onedev.server.web.component.comment.CommentInput;
import io.onedev.server.web.component.diff.blob.BlobDiffPanel;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.markdown.OutdatedSuggestionException;
import io.onedev.server.web.component.markdown.SuggestionSupport;
import io.onedev.server.web.component.menu.MenuItem;
@@ -67,7 +66,6 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
@@ -124,8 +122,6 @@ public abstract class RevisionDiffPanel extends Panel {
private DiffViewMode diffMode;
- private final IModel<String> currentFileModel;
-
private final IModel<List<DiffEntryFacade>> diffEntriesModel = new LoadableDetachableModel<List<DiffEntryFacade>>() {
@Override
@@ -224,16 +220,10 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
protected List<BlobChange> load() {
List<BlobChange> diffChanges = new ArrayList<>();
- if (getCurrentFile() != null) {
- for (BlobChange change: getTotalChanges()) {
- if (change.getPaths().contains(getCurrentFile()))
- diffChanges.add(change);
- }
- } else if (getTotalChanges().size() > WebConstants.MAX_DIFF_FILES) {
+ if (getTotalChanges().size() > WebConstants.MAX_DIFF_FILES)
diffChanges = getTotalChanges().subList(0, WebConstants.MAX_DIFF_FILES);
- } else {
+ else
diffChanges = getTotalChanges();
- }
List<BlobChange> displayChanges = new ArrayList<>();
int totalChangedLines = 0;
@@ -281,13 +271,12 @@ public abstract class RevisionDiffPanel extends Panel {
private ListView<BlobChange> diffsView;
- private WebMarkupContainer navs;
-
private WebMarkupContainer body;
- public RevisionDiffPanel(String id, String oldRev, String newRev, IModel<String> pathFilterModel,
- IModel<String> currentFileModel, IModel<WhitespaceOption> whitespaceOptionModel,
- @Nullable IModel<String> blameModel, @Nullable RevisionDiff.AnnotationSupport annotationSupport) {
+ public RevisionDiffPanel(String id, String oldRev, String newRev,
+ IModel<String> pathFilterModel, IModel<WhitespaceOption> whitespaceOptionModel,
+ @Nullable IModel<String> blameModel,
+ @Nullable RevisionDiff.AnnotationSupport annotationSupport) {
super(id);
this.oldRev = oldRev;
@@ -326,24 +315,11 @@ public abstract class RevisionDiffPanel extends Panel {
diffMode = DiffViewMode.UNIFIED;
else
diffMode = DiffViewMode.valueOf(cookie.getValue());
-
- this.currentFileModel = currentFileModel;
}
private void doFilter(AjaxRequestTarget target) {
body.replace(commentContainer = newCommentContainer());
target.add(body);
- target.add(navs);
- }
-
- @Nullable
- private String getCurrentFile() {
- return currentFileModel.getObject();
- }
-
- private void setCurrentFile(@Nullable String currentFile) {
- currentFileModel.setObject(currentFile);
- body.replace(commentContainer = newCommentContainer());
}
@Override
@@ -533,7 +509,6 @@ public abstract class RevisionDiffPanel extends Panel {
whitespaceOptionModel.setObject(bean.getWhitespaceOption());
- target.add(navs);
target.add(body);
close();
@@ -624,160 +599,6 @@ public abstract class RevisionDiffPanel extends Panel {
add(pathFilterForm);
- navs = new WebMarkupContainer("navs");
- navs.setOutputMarkupId(true);
- add(navs);
-
- navs.add(new WebMarkupContainer("showAllFiles") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("totalFiles", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return "Total " + getTotalChanges().size() + " files";
- }
-
- }));
- add(new ViewStateAwareAjaxLink<Void>("showSingleFile") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- setCurrentFile(getTotalChanges().iterator().next().getPath());
- target.add(body);
- target.add(navs);
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getTotalChanges().size() > 1);
- }
-
- });
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getCurrentFile() == null);
- }
-
- });
-
- navs.add(new WebMarkupContainer("showSingleFile") {
-
- private int getIndex() {
- int index = 0;
- for (BlobChange change: getTotalChanges()) {
- if (change.getPaths().contains(getCurrentFile()))
- return index;
- index++;
- }
- return -1;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ViewStateAwareAjaxLink<Void>("prev") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- int index = getIndex() - 1;
- if (index >=0 && index < getTotalChanges().size()) {
- setCurrentFile(getTotalChanges().get(index).getPath());
- target.add(body);
- target.add(navs);
- target.appendJavaScript("onedev.server.revisionDiff.scrollToFilesTop();");
- }
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (!isEnabled())
- tag.put("disabled", "disabled");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- int index = getIndex();
- setEnabled(index > 0);
- setVisible(index != -1);
- }
-
- });
-
- add(new Label("message", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- int index = getIndex();
- if (index != -1)
- return "File " + (index +1) + " of " + getTotalChanges().size();
- else
- return "File '" + getCurrentFile() + "' not found in change set";
- }
-
- }));
-
- add(new ViewStateAwareAjaxLink<Void>("next") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- int index = getIndex() + 1;
- if (index >=0 && index < getTotalChanges().size()) {
- setCurrentFile(getTotalChanges().get(index).getPath());
- target.add(body);
- target.add(navs);
- target.appendJavaScript("onedev.server.revisionDiff.scrollToFilesTop();");
- }
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (!isEnabled())
- tag.put("disabled", "disabled");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- int index = getIndex();
- setEnabled(index < getTotalChanges().size()-1);
- setVisible(index != -1);
- }
-
- });
-
- add(new ViewStateAwareAjaxLink<Void>("showAllFiles") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- setCurrentFile(null);
- target.add(body);
- target.add(navs);
- }
-
- });
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getCurrentFile() != null);
- }
-
- });
-
body = new WebMarkupContainer("body");
body.setOutputMarkupId(true);
add(body);
@@ -797,7 +618,7 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getCurrentFile() == null && getDisplayChanges().size() < getTotalChanges().size());
+ setVisible(getDisplayChanges().size() < getTotalChanges().size());
}
});
@@ -1232,7 +1053,6 @@ public abstract class RevisionDiffPanel extends Panel {
compareContext.setOldCommitHash(getOldCommitId().name());
compareContext.setNewCommitHash(getNewCommitId().name());
compareContext.setPathFilter(pathFilterModel.getObject());
- compareContext.setCurrentFile(currentFileModel.getObject());
compareContext.setWhitespaceOption(whitespaceOptionModel.getObject());
return compareContext;
}
@@ -1614,7 +1434,6 @@ public abstract class RevisionDiffPanel extends Panel {
blameFileModel.detach();
pathFilterModel.detach();
whitespaceOptionModel.detach();
- currentFileModel.detach();
pendingSuggestionAppliesModel.detach();
super.onDetach();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index cb7e539e21..36767e4855 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -855,7 +855,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
compareContext.setOldCommitHash(context.getCommit().name());
compareContext.setNewCommitHash(context.getCommit().name());
if (context.getBlobIdent().path != null)
- compareContext.setCurrentFile(context.getBlobIdent().path);
+ compareContext.setPathFilter(PatternSet.quoteIfNecessary(context.getBlobIdent().path));
return compareContext;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
index 2b05f359bd..1d29b4198a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java
@@ -97,8 +97,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
private static final String PARAM_PATH_FILTER = "path-filter";
- private static final String PARAM_CURRENT_FILE = "current-file";
-
private static final String PARAM_COMMENT = "comment";
private static final String PARAM_MARK = "mark";
@@ -152,7 +150,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.IGNORE_TRAILING.name()));
state.pathFilter = params.get(PARAM_PATH_FILTER).toString();
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
- state.currentFile = params.get(PARAM_CURRENT_FILE).toString();
state.commentId = params.get(PARAM_COMMENT).toOptionalLong();
state.mark = Mark.fromString(params.get(PARAM_MARK).toString());
state.requestId = params.get(PARAM_PULL_REQUEST).toOptionalLong();
@@ -368,7 +365,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
newState.revision = parent.name();
newState.whitespaceOption = state.whitespaceOption;
newState.pathFilter = state.pathFilter;
- newState.currentFile = state.currentFile;
Link<Void> link = new ViewStateAwarePageLink<Void>("parent", CommitDetailPage.class,
paramsOf(projectModel.getObject(), newState));
link.add(new Label("label", GitUtils.abbreviateSHA(parent.name())));
@@ -395,7 +391,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
newState.revision = parent.name();
newState.whitespaceOption = state.whitespaceOption;
newState.pathFilter = state.pathFilter;
- newState.currentFile = state.currentFile;
Link<Void> link = new ViewStateAwarePageLink<Void>("link", CommitDetailPage.class,
paramsOf(projectModel.getObject(), newState));
@@ -482,7 +477,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Override
public void setObject(String object) {
state.pathFilter = object;
- state.currentFile = null;
pushState(RequestCycle.get().find(AjaxRequestTarget.class));
}
@@ -506,27 +500,9 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
pushState(target);
}
- };
- IModel<String> currentFileModel = new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return state.currentFile;
- }
-
- @Override
- public void setObject(String object) {
- state.currentFile = object;
- pushState(RequestCycle.get().find(AjaxRequestTarget.class));
- }
-
};
revisionDiff = new RevisionDiffPanel("revisionDiff", getCompareWith().name(),
- state.revision, pathFilterModel, currentFileModel, whitespaceOptionModel,
+ state.revision, pathFilterModel, whitespaceOptionModel,
blameModel, this) {
@Override
@@ -573,7 +549,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
state.compareWith = compareContext.getOldCommitHash();
state.whitespaceOption = compareContext.getWhitespaceOption();
state.pathFilter = compareContext.getPathFilter();
- state.currentFile = compareContext.getCurrentFile();
return state;
}
@@ -592,8 +567,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());
if (state.pathFilter != null)
params.set(PARAM_PATH_FILTER, state.pathFilter);
- if (state.currentFile != null)
- params.set(PARAM_CURRENT_FILE, state.currentFile);
if (state.blameFile != null)
params.set(PARAM_BLAME_FILE, state.blameFile);
if (state.commentId != null)
@@ -640,9 +613,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
@Nullable
public String pathFilter;
- @Nullable
- public String currentFile;
-
@Nullable
public String blameFile;
@@ -665,7 +635,6 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota
markState.whitespaceOption = state.whitespaceOption;
markState.compareWith = state.compareWith;
markState.pathFilter = state.pathFilter;
- markState.currentFile = state.currentFile;
markState.revision = resolvedRevision.name();
return urlFor(CommitDetailPage.class, paramsOf(getProject(), markState)).toString();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 0634d2969c..61f273a97d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -92,8 +92,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
private static final String PARAM_PATH_FILTER = "path-filter";
- private static final String PARAM_CURRENT_FILE = "current-file";
-
private static final String PARAM_COMMIT_QUERY = "commit-query";
private static final String PARAM_BLAME_FILE = "blame-file";
@@ -139,7 +137,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;
state.whitespaceOption = compareContext.getWhitespaceOption();
state.pathFilter = compareContext.getPathFilter();
- state.currentFile = compareContext.getCurrentFile();
return state;
}
@@ -157,8 +154,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
params.add(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());
if (state.pathFilter != null)
params.add(PARAM_PATH_FILTER, state.pathFilter);
- if (state.currentFile != null)
- params.add(PARAM_CURRENT_FILE, state.currentFile);
if (state.commitQuery != null)
params.add(PARAM_COMMIT_QUERY, state.commitQuery);
if (state.blameFile != null)
@@ -219,7 +214,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
throw new IllegalArgumentException("Can only compare with common ancestor when different projects are involved");
state.pathFilter = params.get(PARAM_PATH_FILTER).toString();
- state.currentFile = params.get(PARAM_CURRENT_FILE).toString();
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
state.whitespaceOption = WhitespaceOption.ofName(
params.get(PARAM_WHITESPACE_OPTION).toString(WhitespaceOption.IGNORE_TRAILING.name()));
@@ -269,7 +263,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
newState.leftSide = new ProjectAndRevision(project, revision);
newState.rightSide = state.rightSide;
newState.pathFilter = state.pathFilter;
- newState.currentFile = state.currentFile;
newState.tabPanel = state.tabPanel;
newState.whitespaceOption = state.whitespaceOption;
newState.compareWithMergeBase = state.compareWithMergeBase;
@@ -364,7 +357,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
newState.leftSide = state.leftSide;
newState.rightSide = new ProjectAndRevision(project, revision);
newState.pathFilter = state.pathFilter;
- newState.currentFile = state.currentFile;
newState.tabPanel = state.tabPanel;
newState.whitespaceOption = state.whitespaceOption;
newState.compareWithMergeBase = state.compareWithMergeBase;
@@ -386,7 +378,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
newState.leftSide = state.rightSide;
newState.rightSide = state.leftSide;
newState.pathFilter = state.pathFilter;
- newState.currentFile = state.currentFile;
newState.tabPanel = state.tabPanel;
newState.whitespaceOption = state.whitespaceOption;
newState.compareWithMergeBase = state.compareWithMergeBase;
@@ -603,25 +594,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Override
public void setObject(String object) {
state.pathFilter = object;
- state.currentFile = null;
- pushState(RequestCycle.get().find(AjaxRequestTarget.class));
- }
-
- };
- IModel<String> currentFileModel = new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return state.currentFile;
- }
-
- @Override
- public void setObject(String object) {
- state.currentFile = object;
pushState(RequestCycle.get().find(AjaxRequestTarget.class));
}
@@ -647,8 +619,8 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
tabPanel = new RevisionDiffPanel(TAB_PANEL_ID,
state.compareWithMergeBase?mergeBase.name():state.leftSide.getRevision(),
- state.rightSide.getRevision(), pathFilterModel, currentFileModel,
- whitespaceOptionModel,blameModel, this) {
+ state.rightSide.getRevision(), pathFilterModel, whitespaceOptionModel,
+ blameModel, this) {
@Override
protected Project getProject() {
@@ -769,9 +741,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
@Nullable
public String pathFilter;
- @Nullable
- public String currentFile;
-
@Nullable
public String blameFile;
@@ -790,7 +759,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
compareWithMergeBase = state.compareWithMergeBase;
whitespaceOption = state.whitespaceOption;
pathFilter = state.pathFilter;
- currentFile = state.currentFile;
blameFile = state.blameFile;
commentId = state.commentId;
mark = state.mark;
@@ -879,7 +847,6 @@ public class RevisionComparePage extends ProjectPage implements RevisionDiff.Ann
markState.rightSide = new ProjectAndRevision(state.rightSide.getProject(), rightCommitId.name());
markState.mark = mark;
markState.pathFilter = state.pathFilter;
- markState.currentFile = state.currentFile;
markState.tabPanel = TabPanel.FILE_CHANGES;
markState.whitespaceOption = state.whitespaceOption;
markState.compareWithMergeBase = false;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 24b24e83ba..1c7e4e8b76 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -9,13 +9,13 @@ import io.onedev.server.codequality.CodeProblem;
import io.onedev.server.codequality.CodeProblemContribution;
import io.onedev.server.codequality.CoverageStatus;
import io.onedev.server.codequality.LineCoverageContribution;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.service.GitService;
-import io.onedev.server.git.service.RefFacade;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.service.GitService;
+import io.onedev.server.git.service.RefFacade;
import io.onedev.server.model.*;
import io.onedev.server.model.PullRequest.Status;
import io.onedev.server.model.support.CompareContext;
@@ -118,8 +118,6 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
private String pathFilter;
- private String currentFile;
-
private String blameFile;
private WhitespaceOption whitespaceOption = WhitespaceOption.IGNORE_TRAILING;
@@ -492,27 +490,9 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
@Override
public void setObject(String object) {
- currentFile = null;
pathFilter = object;
}
- };
- IModel<String> currentFileModel = new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return currentFile;
- }
-
- @Override
- public void setObject(String object) {
- currentFile = object;
- }
-
};
IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {
@@ -539,8 +519,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
* it above when loading the project
*/
RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, request.getBaseCommitHash(),
- source.getRevision(), pathFilterModel, currentFileModel, whitespaceOptionModel,
- blameModel, this) {
+ source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {
@Override
protected Project getProject() {
@@ -908,7 +887,6 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());
state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getLatestUpdate().getHeadCommitHash());
state.pathFilter = pathFilter;
- state.currentFile = currentFile;
state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;
state.whitespaceOption = whitespaceOption;
state.compareWithMergeBase = false;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index 779bda851a..2051042eb2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -73,8 +73,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
private static final String PARAM_PATH_FILTER = "path-filter";
- private static final String PARAM_CURRENT_FILE = "current-file";
-
private static final String PARAM_BLAME_FILE = "blame-file";
public static final String PARAM_COMMENT = "comment";
@@ -157,7 +155,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state.newCommitHash = params.get(PARAM_NEW_COMMIT).toString();
state.createdCommitHash = params.get(ProjectBlobPage.PARAM_CREATED_COMMIT).toString();
state.pathFilter = params.get(PARAM_PATH_FILTER).toString();
- state.currentFile = params.get(PARAM_CURRENT_FILE).toString();
state.blameFile = params.get(PARAM_BLAME_FILE).toString();
state.whitespaceOption = WhitespaceOption.ofName(params.get(PARAM_WHITESPACE_OPTION).toString());
@@ -592,7 +589,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
state.commentId = comment.getId();
state.mark = comment.getMark();
state.pathFilter = comment.getCompareContext().getPathFilter();
- state.currentFile = comment.getCompareContext().getCurrentFile();
state.whitespaceOption = comment.getCompareContext().getWhitespaceOption();
state.oldCommitHash = compareContext.getOldCommitHash();
state.newCommitHash = compareContext.getNewCommitHash();
@@ -614,8 +610,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
params.add(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());
if (state.pathFilter != null)
params.add(PARAM_PATH_FILTER, state.pathFilter);
- if (state.currentFile != null)
- params.add(PARAM_CURRENT_FILE, state.currentFile);
if (state.blameFile != null)
params.add(PARAM_BLAME_FILE, state.blameFile);
if (state.commentId != null)
@@ -671,25 +665,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
@Override
public void setObject(String object) {
state.pathFilter = object;
- state.currentFile = null;
- pushState(RequestCycle.get().find(AjaxRequestTarget.class));
- }
-
- };
- IModel<String> currentFileModel = new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return state.currentFile;
- }
-
- @Override
- public void setObject(String object) {
- state.currentFile = object;
pushState(RequestCycle.get().find(AjaxRequestTarget.class));
}
@@ -715,8 +690,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
};
Component revisionDiff = new RevisionDiffPanel("revisionDiff", getComparisonBase().name(),
- state.newCommitHash, pathFilterModel, currentFileModel, whitespaceOptionModel,
- blameModel, this) {
+ state.newCommitHash, pathFilterModel, whitespaceOptionModel, blameModel, this) {
@Override
protected Project getProject() {
@@ -775,7 +749,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
markState.oldCommitHash = state.oldCommitHash;
markState.newCommitHash = state.newCommitHash;
markState.pathFilter = state.pathFilter;
- markState.currentFile = state.currentFile;
markState.whitespaceOption = state.whitespaceOption;
return urlFor(PullRequestChangesPage.class, paramsOf(getPullRequest(), markState)).toString();
} else {
@@ -899,9 +872,6 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev
@Nullable
public String pathFilter;
- @Nullable
- public String currentFile;
-
@Nullable
public String blameFile;