The Unified and Autonomous Development Platform
Exclude changes contributed by commits reachable from target branch in pull request changes page
Robin Shene2183e2dca5e
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.javaindex 312750311d..00eb49c0ba 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java@@ -68,7 +68,7 @@ public class PullRequestTrigger extends JobTrigger {private boolean touchedFile(PullRequest request) {if (getPaths() != null) {Collection<String> changedFiles = GitUtils.getChangedFiles(request.getTargetProject().getRepository(),- request.getTarget().getObjectId(), ObjectId.fromString(request.getLastMergePreview().getMerged()));+ request.getTarget().getObjectId(), ObjectId.fromString(request.getLastMergePreview().getMergeCommitHash()));PatternSet patternSet = PatternSet.parse(getPaths());Matcher matcher = new PathMatcher();for (String changedFile: changedFiles) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex d5db7d2405..3ccf69e143 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -10,7 +10,6 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.search.entity.EntityQuery;@@ -61,9 +60,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void open(PullRequest request);- PullRequest open(ProjectAndBranch source, ProjectAndBranch target,- MergeStrategy mergeStrategy, User submitter, String title);-void delete(PullRequest request);void deleteSourceBranch(PullRequest request, @Nullable String note);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex 27612d31eb..7c2c965f83 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java@@ -214,7 +214,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic void restoreSourceBranch(PullRequest request, String note) {Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);if (request.getSource().getObjectName(false) == null) {- RevCommit latestCommit = request.getHeadCommit();+ RevCommit latestCommit = request.getLatestUpdate().getHeadCommit();try {request.getSourceProject().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();} catch (Exception e) {@@ -284,7 +284,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestprivate void merge(PullRequest request) {MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());- String merged = Preconditions.checkNotNull(preview.getMerged());+ String merged = Preconditions.checkNotNull(preview.getMergeCommitHash());ObjectId mergedId = ObjectId.fromString(merged);RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId, true);@@ -294,7 +294,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestProject targetProject = request.getTargetProject();MergeStrategy strategy = request.getMergeStrategy();if ((strategy == CREATE_MERGE_COMMIT || strategy == CREATE_MERGE_COMMIT_IF_NECESSARY || strategy == SQUASH_SOURCE_BRANCH_COMMITS)- && !preview.getMerged().equals(preview.getRequestHead())+ && !preview.getMergeCommitHash().equals(preview.getHeadCommitHash())&& !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {@@ -310,7 +310,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest} catch (Exception e) {throw ExceptionUtils.unchecked(e);}- preview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),+ preview = new MergePreview(preview.getTargetHeadCommitHash(), preview.getHeadCommitHash(),preview.getMergeStrategy(), merged);request.setLastMergePreview(preview);request.writeMergeRef();@@ -319,7 +319,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcloseAsMerged(request, false);String targetRef = request.getTargetRef();- ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());+ ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHeadCommitHash());RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), targetRef);refUpdate.setRefLogIdent(committer);refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);@@ -436,7 +436,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest&& request.isRequiredBuildsSuccessful()&& request.getCheckError() == null&& preview != null- && preview.getMerged() != null) {+ && preview.getMergeCommitHash() != null) {merge(request);}}@@ -501,12 +501,12 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestif (request.isOpen() && !request.isMergeIntoTarget()) {if (mergePreview == null || !mergePreview.isUpToDate(request)) {mergePreview = new MergePreview(request.getTarget().getObjectName(),- request.getHeadCommitHash(), request.getMergeStrategy(), null);+ request.getLatestUpdate().getHeadCommitHash(), request.getMergeStrategy(), null);logger.debug("Calculating merge preview of pull request #{} in project '{}'...",request.getNumber(), targetProject.getName());ObjectId merged = mergePreview.getMergeStrategy().merge(request);if (merged != null)- mergePreview.setMerged(merged.name());+ mergePreview.setMergeCommitHash(merged.name());mergePreview.syncRef(request);request.setLastMergePreview(mergePreview);dao.persist(request);@@ -558,8 +558,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);Criterion merged = Restrictions.and(- Restrictions.eq("closeInfo.status", CloseInfo.Status.MERGED),- Restrictions.eq("lastMergePreview.requestHead", source.getObjectName()));+ Restrictions.eq(PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS, CloseInfo.Status.MERGED),+ Restrictions.eq(PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH, source.getObjectName()));criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));@@ -573,8 +573,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestCollection<Criterion> criterions = new ArrayList<>();for (ProjectAndBranch source: sources) {Criterion merged = Restrictions.and(- Restrictions.eq("closeInfo.status", CloseInfo.Status.MERGED),- Restrictions.eq("lastMergePreview.requestHead", source.getObjectName()));+ Restrictions.eq(PullRequest.PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS, CloseInfo.Status.MERGED),+ Restrictions.eq(PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH, source.getObjectName()));criterions.add(Restrictions.and(ofTarget(target), ofSource(source), Restrictions.or(ofOpen(), merged)));}criteria.add(Restrictions.or(criterions.toArray(new Criterion[0])));@@ -781,9 +781,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestCollection<PullRequestBuild> prevPullRequestBuilds = new ArrayList<>(request.getPullRequestBuilds());request.getPullRequestBuilds().clear();MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMerged() != null) {+ if (preview != null && preview.getMergeCommitHash() != null) {Project project = request.getTargetProject();- ObjectId commitId = ObjectId.fromString(preview.getMerged());+ ObjectId commitId = ObjectId.fromString(preview.getMergeCommitHash());ScriptIdentity.push(new JobIdentity(project, commitId));try {Collection<String> requiredJobNames;@@ -1076,35 +1076,6 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestreturn find(criteria);}- @Transactional- @Override- public PullRequest open(ProjectAndBranch source, ProjectAndBranch target, MergeStrategy mergeStrategy,- User submitter, String title) {- ObjectId baseCommitId = GitUtils.getMergeBase(- target.getProject().getRepository(), target.getObjectId(),- source.getProject().getRepository(), source.getObjectId());- if (baseCommitId != null) {- PullRequest request = new PullRequest();- request.setTarget(target);- request.setSource(source);- request.setSubmitter(submitter);- request.setTitle(title);- request.setBaseCommitHash(baseCommitId.name());- request.setHeadCommitHash(source.getObjectName());- PullRequestUpdate update = new PullRequestUpdate();- request.addUpdate(update);- update.setRequest(request);- update.setRequestHead(request.getHeadCommitHash());- update.setMergeBaseCommitHash(request.getBaseCommitHash());- request.setMergeStrategy(mergeStrategy);- open(request);-- return request;- } else {- throw new OneException("No merge base found");- }- }-@Sessional@Overridepublic PullRequest find(Project targetProject, long number) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.javaindex c8948bc11f..329cf7cc01 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestUpdateManager.java@@ -47,21 +47,19 @@ public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullR@Transactional@Overridepublic void checkUpdate(PullRequest request) {- if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {+ if (!request.getLatestUpdate().getHeadCommitHash().equals(request.getSource().getObjectName())) {ObjectId mergeBase = GitUtils.getMergeBase(request.getTargetProject().getRepository(), request.getTarget().getObjectId(),request.getSourceProject().getRepository(), request.getSource().getObjectId());if (mergeBase != null) {- request.setHeadCommitHash(request.getSource().getObjectName());- request.writeHeadRef();-PullRequestUpdate update = new PullRequestUpdate();update.setRequest(request);- update.setRequestHead(request.getHeadCommitHash());- update.setMergeBaseCommitHash(mergeBase.name());+ update.setHeadCommitHash(request.getSource().getObjectName());+ update.setTargetHeadCommitHash(request.getTarget().getObjectName());request.addUpdate(update);-save(update);++ request.writeHeadRef();listenerRegistry.post(new PullRequestUpdated(update));}diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.javaindex 3cc4a42006..b9ee8488c8 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java@@ -1,6 +1,7 @@package io.onedev.server.infomanager;import java.io.File;+import java.nio.ByteBuffer;import java.util.Collection;import java.util.List;import java.util.concurrent.Callable;@@ -43,7 +44,7 @@ import jetbrains.exodus.env.TransactionalExecutable;public class DefaultPullRequestInfoManager extends AbstractEnvironmentManagerimplements PullRequestInfoManager {- private static final int INFO_VERSION = 6;+ private static final int INFO_VERSION = 7;private static final int BATCH_SIZE = 5000;@@ -55,7 +56,7 @@ public class DefaultPullRequestInfoManager extends AbstractEnvironmentManagerprivate static final String COMMIT_TO_IDS_STORE = "commitToIds";- private static final String MERGE_COMMITS_STORE = "mergeCommits";+ private static final String COMPARISON_BASES_STORE = "comparisonBases";private static final ByteIterable LAST_PULL_REQUEST_UPDATE_KEY = new StringByteIterable("lastPullRequestUpdate");@@ -227,18 +228,15 @@ public class DefaultPullRequestInfoManager extends AbstractEnvironmentManager}@Override- public ObjectId readMergeCommitId(Project project, ObjectId commitId1, ObjectId commitId2) {- Environment env = getEnv(project.getId().toString());- Store store = getStore(env, MERGE_COMMITS_STORE);+ public ObjectId getComparisonBase(PullRequest request, ObjectId commitId1, ObjectId commitId2) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, COMPARISON_BASES_STORE);return env.computeInTransaction(new TransactionalComputable<ObjectId>() {@Overridepublic ObjectId compute(Transaction txn) {- byte[] keyBytes = new byte[40];- commitId1.copyRawTo(keyBytes, 0);- commitId2.copyRawTo(keyBytes, 20);- byte[] valueBytes = readBytes(store, txn, new ArrayByteIterable(keyBytes));+ byte[] valueBytes = readBytes(store, txn, getComparisonBaseKey(request, commitId1, commitId2));if (valueBytes != null)return ObjectId.fromRaw(valueBytes);else@@ -247,20 +245,25 @@ public class DefaultPullRequestInfoManager extends AbstractEnvironmentManager});}++ private ByteIterable getComparisonBaseKey(PullRequest request, ObjectId commitId1, ObjectId commitId2) {+ byte[] keyBytes = new byte[40 + Long.BYTES];+ ByteBuffer.wrap(keyBytes, 0, Long.BYTES).putLong(request.getId());+ commitId1.copyRawTo(keyBytes, Long.BYTES);+ commitId2.copyRawTo(keyBytes, Long.BYTES + 20);+ return new ArrayByteIterable(keyBytes);+ }@Override- public void writeMergeCommitId(Project project, ObjectId commitId1, ObjectId commitId2, ObjectId mergeCommitId) {- Environment env = getEnv(project.getId().toString());- Store store = getStore(env, MERGE_COMMITS_STORE);+ public void cacheComparisonBase(PullRequest request, ObjectId commitId1, ObjectId commitId2, ObjectId comparisonBase) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, COMPARISON_BASES_STORE);env.executeInTransaction(new TransactionalExecutable() {@Overridepublic void execute(Transaction txn) {- byte[] keyBytes = new byte[40];- commitId1.copyRawTo(keyBytes, 0);- commitId2.copyRawTo(keyBytes, 20);- store.put(txn, new ArrayByteIterable(keyBytes), new CommitByteIterable(mergeCommitId));+ store.put(txn, getComparisonBaseKey(request, commitId1, commitId2), new CommitByteIterable(comparisonBase));}});diff --git a/server-core/src/main/java/io/onedev/server/infomanager/PullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/PullRequestInfoManager.javaindex 64a3e6fabf..2148d1d3a3 100644--- a/server-core/src/main/java/io/onedev/server/infomanager/PullRequestInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/infomanager/PullRequestInfoManager.java@@ -7,14 +7,15 @@ import javax.annotation.Nullable;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;public interface PullRequestInfoManager {Collection<Long> getPullRequestIds(Project project, ObjectId commitId);@Nullable- ObjectId readMergeCommitId(Project project, ObjectId commitId1, ObjectId commitId2);+ ObjectId getComparisonBase(PullRequest request, ObjectId commitId1, ObjectId commitId2);- void writeMergeCommitId(Project project, ObjectId commitId1, ObjectId commitId2, ObjectId mergeCommit);+ void cacheComparisonBase(PullRequest request, ObjectId commitId1, ObjectId commitId2, ObjectId comparisonBase);}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.javaindex 045aca7a7d..a76c2c33d5 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java@@ -287,17 +287,17 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupppublic boolean isContextChanged(PullRequest request) {if (contextChanged == null) {- if (request.getHeadCommitHash().equals(markPos.getCommit())) {+ if (request.getLatestUpdate().getHeadCommit().equals(markPos.getCommit())) {contextChanged = false;} else {Project project = request.getTargetProject();try (RevWalk revWalk = new RevWalk(project.getRepository())) {TreeWalk treeWalk = TreeWalk.forPath(project.getRepository(), markPos.getPath(),- request.getHeadCommit().getTree());+ request.getLatestUpdate().getHeadCommit().getTree());if (treeWalk != null) {ObjectId blobId = treeWalk.getObjectId(0);if (treeWalk.getRawMode(0) == FileMode.REGULAR_FILE.getBits()) {- BlobIdent blobIdent = new BlobIdent(request.getHeadCommitHash(), markPos.getPath(),+ BlobIdent blobIdent = new BlobIdent(request.getLatestUpdate().getHeadCommitHash(), markPos.getPath(),treeWalk.getRawMode(0));Blob newBlob = new Blob(blobIdent, blobId, treeWalk.getObjectReader());Blob oldBlob = project.getBlob(new BlobIdent(markPos.getCommit(),diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex 36d2b310e4..f88179c87c 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -1,6 +1,5 @@package io.onedev.server.model;-import static io.onedev.server.model.PullRequest.PROP_HEAD_COMMIT_HASH;import static io.onedev.server.model.PullRequest.PROP_NO_SPACE_TITLE;import static io.onedev.server.model.PullRequest.PROP_NUMBER;import static io.onedev.server.model.PullRequest.PROP_SUBMIT_DATE;@@ -9,6 +8,7 @@ import static io.onedev.server.model.PullRequest.PROP_UUID;import java.io.IOException;import java.io.Serializable;+import java.nio.channels.IllegalSelectorException;import java.util.ArrayList;import java.util.Collection;import java.util.Collections;@@ -38,10 +38,10 @@ import javax.persistence.UniqueConstraint;import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectDatabase;import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.RefUpdate;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.annotations.DynamicUpdate;@@ -56,6 +56,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.git.GitUtils;+import io.onedev.server.infomanager.PullRequestInfoManager;import io.onedev.server.infomanager.UserInfoManager;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.EntityWatch;@@ -84,10 +85,10 @@ import io.onedev.server.web.util.WicketUtils;@Index(columnList=PROP_NO_SPACE_TITLE), @Index(columnList=PROP_NUMBER),@Index(columnList="o_targetProject_id"), @Index(columnList=PROP_SUBMIT_DATE),@Index(columnList=LastUpdate.COLUMN_DATE), @Index(columnList="o_sourceProject_id"),- @Index(columnList="o_submitter_id"), @Index(columnList=PROP_HEAD_COMMIT_HASH),- @Index(columnList=MergePreview.COLUMN_REQUEST_HEAD), @Index(columnList=CloseInfo.COLUMN_DATE),- @Index(columnList=CloseInfo.COLUMN_STATUS), @Index(columnList=CloseInfo.COLUMN_USER),- @Index(columnList=CloseInfo.COLUMN_USER_NAME), @Index(columnList="o_numberScope_id")},+ @Index(columnList="o_submitter_id"), @Index(columnList=MergePreview.COLUMN_HEAD_COMMIT_HASH),+ @Index(columnList=CloseInfo.COLUMN_DATE), @Index(columnList=CloseInfo.COLUMN_STATUS),+ @Index(columnList=CloseInfo.COLUMN_USER), @Index(columnList=CloseInfo.COLUMN_USER_NAME),+ @Index(columnList="o_numberScope_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_numberScope_id", PROP_NUMBER})})//use dynamic update in order not to overwrite other edits while background threads change update date@DynamicUpdate@@ -170,8 +171,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";- public static final String PROP_HEAD_COMMIT_HASH = "headCommitHash";-public static final String STATE_OPEN = "Open";public static final String REFS_PREFIX = "refs/pull/";@@ -242,9 +241,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach@Column(nullable=false)private String baseCommitHash;- @Column(nullable=false)- private String headCommitHash;-@Column(nullable=true)private Date lastCodeCommentActivityDate;@@ -300,10 +296,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachprivate transient List<PullRequestUpdate> sortedUpdates;- private transient Collection<RevCommit> pendingCommits;-- private transient Collection<RevCommit> mergedCommits;-private transient Optional<MergePreview> mergePreviewOpt;private transient Boolean valid;@@ -445,22 +437,10 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.baseCommitHash = baseCommitHash;}- public String getHeadCommitHash() {- return headCommitHash;- }-- public void setHeadCommitHash(String headCommitHash) {- this.headCommitHash = headCommitHash;- }-public RevCommit getBaseCommit() {return getTargetProject().getRevCommit(ObjectId.fromString(getBaseCommitHash()), true);}- public RevCommit getHeadCommit() {- return getTargetProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()), true);- }-/*** Get unmodifiable collection of updates of this pull request. To add update* to the pull request, call {@link this#addUpdate(PullRequestUpdate)} instead.@@ -658,13 +638,13 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic void writeHeadRef() {RefUpdate refUpdate = GitUtils.getRefUpdate(getTargetProject().getRepository(), getHeadRef());- refUpdate.setNewObjectId(ObjectId.fromString(getHeadCommitHash()));+ refUpdate.setNewObjectId(ObjectId.fromString(getLatestUpdate().getHeadCommitHash()));GitUtils.updateRef(refUpdate);}public void writeMergeRef() {RefUpdate refUpdate = GitUtils.getRefUpdate(getTargetProject().getRepository(), getMergeRef());- refUpdate.setNewObjectId(ObjectId.fromString(getLastMergePreview().getMerged()));+ refUpdate.setNewObjectId(ObjectId.fromString(getLastMergePreview().getMergeCommitHash()));GitUtils.updateRef(refUpdate);}@@ -711,48 +691,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachthis.submitDate = submitDate;}- /**- * Get commits pending merge.- *- * @return- * commits pending merge- */- public Collection<RevCommit> getPendingCommits() {- if (pendingCommits == null) {- pendingCommits = new HashSet<>();- Project project = getTargetProject();- try (RevWalk revWalk = new RevWalk(project.getRepository())) {- revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash())));- revWalk.markUninteresting(revWalk.parseCommit(getTarget().getObjectId()));- revWalk.forEach(c->pendingCommits.add(c));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- return pendingCommits;- }-- /**- * Merged commits represent commits already merged to target branch since base commit.- *- * @return- * commits already merged to target branch since base commit- */- public Collection<RevCommit> getMergedCommits() {- if (mergedCommits == null) {- mergedCommits = new HashSet<>();- Project project = getTargetProject();- try (RevWalk revWalk = new RevWalk(project.getRepository())) {- revWalk.markStart(revWalk.parseCommit(getTarget().getObjectId(false)));- revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash())));- revWalk.forEach(c->mergedCommits.add(c));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- return mergedCommits;- }-public Collection<PullRequestReview> getReviews() {return reviews;}@@ -869,7 +807,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic boolean isMergeIntoTarget() {if (mergedIntoTarget == null) {mergedIntoTarget = GitUtils.isMergedInto(getTargetProject().getRepository(), null,- ObjectId.fromString(getHeadCommitHash()), getTarget().getObjectId());+ ObjectId.fromString(getLatestUpdate().getHeadCommitHash()), getTarget().getObjectId());}return mergedIntoTarget;}@@ -955,13 +893,12 @@ public class PullRequest extends AbstractEntity implements Referenceable, AttachRepository repository = targetProject.getRepository();ObjectDatabase objDb = repository.getObjectDatabase();try {- if (!objDb.has(ObjectId.fromString(baseCommitHash))- || !objDb.has(ObjectId.fromString(headCommitHash))) {+ if (!objDb.has(ObjectId.fromString(baseCommitHash))) {valid = false;} else {for (PullRequestUpdate update: updates) {- if (!objDb.has(ObjectId.fromString(update.getMergeBaseCommitHash()))- || !objDb.has(ObjectId.fromString(update.getRequestHead()))) {+ if (!objDb.has(ObjectId.fromString(update.getTargetHeadCommitHash()))+ || !objDb.has(ObjectId.fromString(update.getHeadCommitHash()))) {valid = false;break;}@@ -1050,18 +987,50 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach}public ObjectId getComparisonBase(ObjectId oldCommitId, ObjectId newCommitId) {- for (PullRequestUpdate update: getSortedUpdates()) {- if (update.getCommits().contains(newCommitId)) {- ObjectId targetHeadId = ObjectId.fromString(update.getTargetHead());- ObjectId mergeBaseId = GitUtils.getMergeBase(getTargetProject().getRepository(), targetHeadId, newCommitId);- if (mergeBaseId != null) {-- } else {- return oldCommitId;+ if (oldCommitId.equals(newCommitId))+ return newCommitId;++ PullRequestInfoManager infoManager = OneDev.getInstance(PullRequestInfoManager.class);+ ObjectId comparisonBase = infoManager.getComparisonBase(this, oldCommitId, newCommitId);+ if (comparisonBase != null) {+ try {+ if (!getTargetProject().getRepository().getObjectDatabase().has(comparisonBase))+ comparisonBase = null;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ if (comparisonBase == null) {+ for (PullRequestUpdate update: getSortedUpdates()) {+ if (update.getCommits().contains(newCommitId)) {+ ObjectId targetHead = ObjectId.fromString(update.getTargetHeadCommitHash());+ Repository repo = getTargetProject().getRepository();+ ObjectId mergeBase1 = GitUtils.getMergeBase(repo, targetHead, newCommitId);+ if (mergeBase1 != null) {+ ObjectId mergeBase2 = GitUtils.getMergeBase(repo, mergeBase1, oldCommitId);+ if (mergeBase2.equals(mergeBase1)) {+ comparisonBase = oldCommitId;+ break;+ } else if (mergeBase2.equals(oldCommitId)) {+ comparisonBase = mergeBase1;+ break;+ } else {+ PersonIdent person = new PersonIdent("OneDev", "");+ comparisonBase = GitUtils.merge(repo, mergeBase1, oldCommitId, false,+ person, person, "helper commit", true);+ break;+ }+ } else {+ return oldCommitId;+ }}}+ if (comparisonBase != null)+ infoManager.cacheComparisonBase(this, oldCommitId, newCommitId, comparisonBase);+ else+ throw new IllegalSelectorException();}- throw new IllegalStateException();+ return comparisonBase;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex efdd592851..7eb638fd7f 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -86,11 +86,11 @@ public class PullRequestReview extends AbstractEntity {PullRequestUpdate update = null;if (result != null) {MergePreview preview = request.getMergePreview();- if (preview != null && result.getCommit().equals(preview.getMerged())) {+ if (preview != null && result.getCommit().equals(preview.getMergeCommitHash())) {update = request.getLatestUpdate();} else {for (PullRequestUpdate each: request.getUpdates()) {- if (each.getRequestHead().equals(result.getCommit())) {+ if (each.getHeadCommitHash().equals(result.getCommit())) {update = each;break;}diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.javaindex 7747befda9..988078a6e3 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestUpdate.java@@ -16,14 +16,11 @@ import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;import javax.persistence.Table;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.RefUpdate;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.revwalk.filter.RevFilter;import org.eclipse.jgit.transport.RefSpec;import org.eclipse.jgit.treewalk.TreeWalk;import org.eclipse.jgit.treewalk.filter.TreeFilter;@@ -51,14 +48,11 @@ public class PullRequestUpdate extends AbstractEntity {private PullRequest request;@Column(nullable=false)- private String requestHead;+ private String headCommitHash;@Column(nullable=false)- private String targetHead;+ private String targetHeadCommitHash;- @Column(nullable=false)- private String mergeBaseCommitHash;-@Column(nullable=false)private Date date = new Date();@@ -74,28 +68,20 @@ public class PullRequestUpdate extends AbstractEntity {this.request = request;}- public String getRequestHead() {- return requestHead;+ public String getHeadCommitHash() {+ return headCommitHash;}- public void setRequestHead(String requestHead) {- this.requestHead = requestHead;+ public void setHeadCommitHash(String headCommitHash) {+ this.headCommitHash = headCommitHash;}- public String getTargetHead() {- return targetHead;+ public String getTargetHeadCommitHash() {+ return targetHeadCommitHash;}- public void setTargetHead(String targetHead) {- this.targetHead = targetHead;- }-- public String getMergeBaseCommitHash() {- return mergeBaseCommitHash;- }-- public void setMergeBaseCommitHash(String mergeBaseCommitHash) {- this.mergeBaseCommitHash = mergeBaseCommitHash;+ public void setTargetHeadCommitHash(String targetHeadCommitHash) {+ this.targetHeadCommitHash = targetHeadCommitHash;}public Date getDate() {@@ -116,11 +102,6 @@ public class PullRequestUpdate extends AbstractEntity {GitUtils.deleteRef(GitUtils.getRefUpdate(getRequest().getTargetProject().getRepository(), getHeadRef()));}- /**- * Get changed files of this update since previous update. This calculation- * excludes changes introduced by commits from target branch (this will- * happen if some commits were merged from target branch to source branch)- */public Collection<String> getChangedFiles() {if (changedFiles == null) {changedFiles = new HashSet<>();@@ -128,59 +109,14 @@ public class PullRequestUpdate extends AbstractEntity {Repository repository = getRequest().getWorkProject().getRepository();try ( RevWalk revWalk = new RevWalk(repository);TreeWalk treeWalk = new TreeWalk(repository)) {- RevCommit mergeBaseCommit = revWalk.parseCommit(ObjectId.fromString(getMergeBaseCommitHash()));- RevCommit baseCommit = revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash()));- RevCommit headCommit = revWalk.parseCommit(ObjectId.fromString(getRequestHead()));- revWalk.markStart(mergeBaseCommit);- revWalk.markStart(baseCommit);- revWalk.setRevFilter(RevFilter.MERGE_BASE);- RevCommit nextMergeBase = Preconditions.checkNotNull(revWalk.next());- treeWalk.setRecursive(true);- if (nextMergeBase.equals(baseCommit)) {- treeWalk.addTree(mergeBaseCommit.getTree());- treeWalk.addTree(headCommit.getTree());- treeWalk.setFilter(TreeFilter.ANY_DIFF);- while (treeWalk.next())- changedFiles.add(treeWalk.getPathString());- } else if (nextMergeBase.equals(mergeBaseCommit)) {- treeWalk.addTree(baseCommit.getTree());- treeWalk.addTree(headCommit.getTree());- treeWalk.setFilter(TreeFilter.ANY_DIFF);- while (treeWalk.next())- changedFiles.add(treeWalk.getPathString());- } else {- treeWalk.addTree(headCommit.getTree());- treeWalk.addTree(baseCommit.getTree());- treeWalk.addTree(mergeBaseCommit.getTree());- treeWalk.setFilter(new TreeFilter() {-- @Override- public boolean include(TreeWalk walker)- throws MissingObjectException, IncorrectObjectTypeException, IOException {- int m0 = walker.getRawMode(0);-- // only include the path if the file is modified in head commit- // compared to base commit and that modification is not introduced- // by commit from target branch- return (walker.getRawMode(1) != m0 || !walker.idEqual(1, 0))- && (walker.getRawMode(2) != m0 || !walker.idEqual(2, 0));- }-- @Override- public boolean shouldBeRecursive() {- return false;- }-- @Override- public TreeFilter clone() {- return this;- }-- });- while (treeWalk.next()) {- changedFiles.add(treeWalk.getPathString());- }- }+ RevCommit baseCommit = revWalk.parseCommit(ObjectId.fromString(getBase()));+ RevCommit headCommit = revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash()));+ RevCommit comparisonBaseCommit = revWalk.parseCommit(getRequest().getComparisonBase(baseCommit, headCommit));+ treeWalk.addTree(headCommit.getTree());+ treeWalk.addTree(comparisonBaseCommit.getTree());+ treeWalk.setFilter(TreeFilter.ANY_DIFF);+ while (treeWalk.next())+ changedFiles.add(treeWalk.getPathString());} catch (IOException e) {throw new RuntimeException(e);}@@ -188,16 +124,20 @@ public class PullRequestUpdate extends AbstractEntity {return changedFiles;}- public String getBaseCommitHash() {+ public String getBase() {PullRequest request = getRequest();int index = request.getSortedUpdates().indexOf(this);if (index > 0)- return request.getSortedUpdates().get(index-1).getRequestHead();+ return request.getSortedUpdates().get(index-1).getHeadCommitHash();elsereturn request.getBaseCommitHash();}+ public RevCommit getHeadCommit() {+ return request.getWorkProject().getRevCommit(ObjectId.fromString(getHeadCommitHash()), true);+ }+/*** Base commit represents head commit of last update, or base commit of the request* for the first update. Base commit is used to calculate commits belonging to@@ -230,8 +170,8 @@ public class PullRequestUpdate extends AbstractEntity {commits = new ArrayList<>();try (RevWalk revWalk = new RevWalk(getRequest().getWorkProject().getRepository())) {- revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getRequestHead())));- revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getBaseCommitHash())));+ revWalk.markStart(revWalk.parseCommit(ObjectId.fromString(getHeadCommitHash())));+ revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getBase())));/** Instead of excluding commits reachable from target branch, we exclude commits reachable@@ -240,7 +180,7 @@ public class PullRequestUpdate extends AbstractEntity {* update* 2. commits of this update will remain unchanged even if tip of the target branch changes*/- revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getMergeBaseCommitHash())));+ revWalk.markUninteresting(revWalk.parseCommit(ObjectId.fromString(getTargetHeadCommitHash())));revWalk.forEach(c->commits.add(c));} catch (IOException e) {@@ -251,12 +191,8 @@ public class PullRequestUpdate extends AbstractEntity {return commits;}- public RevCommit getHeadCommit() {- return request.getWorkProject().getRevCommit(ObjectId.fromString(getRequestHead()), true);- }-public void writeRef() {- ObjectId updateHeadId = ObjectId.fromString(getRequestHead());+ ObjectId updateHeadId = ObjectId.fromString(getHeadCommitHash());if (!request.getTargetProject().equals(request.getSourceProject())) {try {request.getTargetProject().git().fetch()diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.javaindex b91638c0e9..78002ab4a0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergePreview.java@@ -17,59 +17,60 @@ import io.onedev.server.model.PullRequest;@Embeddablepublic class MergePreview implements Serializable {- public static final String COLUMN_TARGET_HEAD = "PREVIEW_TARGET_HEAD";+ public static final String COLUMN_TARGET_HEAD_COMMIT_HASH = "PREVIEW_TARGET_HEAD";- public static final String COLUMN_REQUEST_HEAD = "PREVIEW_REQUEST_HEAD";+ public static final String COLUMN_HEAD_COMMIT_HASH = "PREVIEW_HEAD";public static final String COLUMN_MERGE_STRATEGY = "PREVIEW_MERGE_STRATEGY";- public static final String COLUMN_MERGED = "PREVIEW_MERGED";+ public static final String COLUMN_MERGE_COMMIT_HASH = "PREVIEW_MERGE_COMMIT";- public static final String PROP_MERGED = "merged";+ public static final String PROP_MERGED_COMMIT_HASH = "mergeCommitHash";- public static final String PROP_REQUEST_HEAD = "requestHead";+ public static final String PROP_HEAD_COMMIT_HASH = "headCommitHash";- @Column(name=COLUMN_TARGET_HEAD)- private String targetHead;+ @Column(name=COLUMN_TARGET_HEAD_COMMIT_HASH)+ private String targetHeadCommitHash;- @Column(name=COLUMN_REQUEST_HEAD)- private String requestHead;+ @Column(name=COLUMN_HEAD_COMMIT_HASH)+ private String headCommitHash;@Column(name=COLUMN_MERGE_STRATEGY)private MergeStrategy mergeStrategy;- @Column(name=COLUMN_MERGED)- private String merged;+ @Column(name=COLUMN_MERGE_COMMIT_HASH)+ private String mergeCommitHash;@SuppressWarnings("unused")private MergePreview() {}- public MergePreview(String targetHead, String requestHead, MergeStrategy mergeStrategy, @Nullable String merged) {- this.targetHead = targetHead;- this.requestHead = requestHead;+ public MergePreview(String targetHeadCommitHash, String headCommitHash,+ MergeStrategy mergeStrategy, @Nullable String mergeCommitHash) {+ this.targetHeadCommitHash = targetHeadCommitHash;+ this.headCommitHash = headCommitHash;this.mergeStrategy = mergeStrategy;- this.merged = merged;+ this.mergeCommitHash = mergeCommitHash;}- public String getTargetHead() {- return targetHead;+ public String getTargetHeadCommitHash() {+ return targetHeadCommitHash;}- public String getRequestHead() {- return requestHead;+ public String getHeadCommitHash() {+ return headCommitHash;}public MergeStrategy getMergeStrategy() {return mergeStrategy;}- public void setTargetHead(String targetHead) {- this.targetHead = targetHead;+ public void setTargetHeadCommitHash(String targetHeadCommitHash) {+ this.targetHeadCommitHash = targetHeadCommitHash;}- public void setRequestHead(String requestHead) {- this.requestHead = requestHead;+ public void setHeadCommitHash(String headCommitHash) {+ this.headCommitHash = headCommitHash;}public void setIntegrationStrategy(MergeStrategy mergeStrategy) {@@ -77,34 +78,34 @@ public class MergePreview implements Serializable {}/**- * Integrated commit hash+ * Merge commit hash** @return* null if there are conflicts*/@Nullable- public String getMerged() {- return merged;+ public String getMergeCommitHash() {+ return mergeCommitHash;}- public void setMerged(String merged) {- this.merged = merged;+ public void setMergeCommitHash(String mergeCommitHash) {+ this.mergeCommitHash = mergeCommitHash;}public boolean isUpToDate(PullRequest request) {- return getRequestHead().equals(request.getHeadCommitHash())- && getTargetHead().equals(request.getTarget().getObjectName())+ return getHeadCommitHash().equals(request.getLatestUpdate().getHeadCommitHash())+ && getTargetHeadCommitHash().equals(request.getLatestUpdate().getTargetHeadCommitHash())&& getMergeStrategy() == request.getMergeStrategy();}public void syncRef(PullRequest request) {Project project = request.getTargetProject();- ObjectId mergedId = getMerged()!=null? ObjectId.fromString(getMerged()): null;+ ObjectId mergedId = getMergeCommitHash()!=null? ObjectId.fromString(getMergeCommitHash()): null;RefUpdate refUpdate = GitUtils.getRefUpdate(project.getRepository(), request.getMergeRef());if (mergedId != null && !mergedId.equals((project.getObjectId(request.getMergeRef(), false)))) {refUpdate.setNewObjectId(mergedId);GitUtils.updateRef(refUpdate);- } else if (merged == null && project.getObjectId(request.getMergeRef(), false) != null) {+ } else if (mergeCommitHash == null && project.getObjectId(request.getMergeRef(), false) != null) {GitUtils.deleteRef(refUpdate);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex d5da7911d5..dc3fff9f72 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -18,7 +18,7 @@ public enum MergeStrategy {public ObjectId merge(PullRequest request) {PersonIdent user = new PersonIdent(OneDev.NAME, "");Repository repository = request.getTargetProject().getRepository();- ObjectId requestHead = request.getHeadCommit();+ ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();return GitUtils.merge(repository, targetHead, requestHead, false, user, user,request.getCommitMessage(), false);@@ -30,7 +30,7 @@ public enum MergeStrategy {@Overridepublic ObjectId merge(PullRequest request) {Repository repository = request.getTargetProject().getRepository();- ObjectId requestHead = request.getHeadCommit();+ ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();if (GitUtils.isMergedInto(repository, null, targetHead, requestHead)) {return requestHead;@@ -47,7 +47,7 @@ public enum MergeStrategy {@Overridepublic ObjectId merge(PullRequest request) {Repository repository = request.getTargetProject().getRepository();- ObjectId requestHead = request.getHeadCommit();+ ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();PersonIdent user = new PersonIdent(OneDev.NAME, "");return GitUtils.merge(repository, targetHead, requestHead, true, user, user,@@ -60,7 +60,7 @@ public enum MergeStrategy {@Overridepublic ObjectId merge(PullRequest request) {Repository repository = request.getTargetProject().getRepository();- ObjectId requestHead = request.getHeadCommit();+ ObjectId requestHead = request.getLatestUpdate().getHeadCommit();ObjectId targetHead = request.getTarget().getObjectId();PersonIdent user = new PersonIdent(OneDev.NAME, "");return GitUtils.rebase(repository, requestHead, targetHead, user);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.javaindex 43225fa5bb..c778874df3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasMergeConflictsCriteria.java@@ -16,8 +16,8 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {@Overridepublic Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {- Path<?> requestHead = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_REQUEST_HEAD);- Path<?> merged = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED);+ Path<?> requestHead = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_HEAD_COMMIT_HASH);+ Path<?> merged = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_MERGE_PREVIEW + "." + MergePreview.PROP_MERGED_COMMIT_HASH);return builder.and(builder.isNotNull(requestHead),builder.isNull(merged));@@ -26,7 +26,7 @@ public class HasMergeConflictsCriteria extends EntityCriteria<PullRequest> {@Overridepublic boolean matches(PullRequest request) {MergePreview preview = request.getLastMergePreview();- return preview != null && preview.getMerged() == null;+ return preview != null && preview.getMergeCommitHash() == null;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex f05f972aa9..d5903e7bd1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -429,7 +429,7 @@ public abstract class CodeCommentPanel extends Panel {if (page.getState().newCommit.equals(comment.getMarkPos().getCommit())) {setVisible(comment.isContextChanged(getPullRequest()));} else {- setVisible(!getPullRequest().getHeadCommitHash().equals(page.getState().newCommit));+ setVisible(!getPullRequest().getLatestUpdate().getHeadCommitHash().equals(page.getState().newCommit));}} else {setVisible(false);diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.javaindex e51662be0d..a08f559ec3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java@@ -52,8 +52,9 @@ public class BuildListPage extends LayoutPage {public BuildListPage(PageParameters params) {super(params);- query = getPageParameters().get(PARAM_QUERY).toOptionalString();+ query = params.get(PARAM_QUERY).toOptionalString();expectedCount = params.get(PARAM_EXPECTED_COUNT).toInt(0);+ params.remove(PARAM_EXPECTED_COUNT);}private static GlobalBuildSetting getBuildSetting() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 6aa5b1dd00..5b6aa7e782 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -51,8 +51,9 @@ public class ProjectListPage extends LayoutPage {public ProjectListPage(PageParameters params) {super(params);- query = getPageParameters().get(PARAM_QUERY).toOptionalString();+ query = params.get(PARAM_QUERY).toOptionalString();expectedCount = params.get(PARAM_EXPECTED_COUNT).toInt(0);+ params.remove(PARAM_EXPECTED_COUNT);}private static GlobalProjectSetting getProjectSetting() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.javaindex 12b77a0e2d..8cd4bc9da8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java@@ -400,8 +400,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Searif (!found) {if (request.getMergePreview() != null- && request.getMergePreview().getMerged() != null- && request.getMergePreview().getMerged().equals(commitHash)) {+ && request.getMergePreview().getMergeCommitHash() != null+ && request.getMergePreview().getMergeCommitHash().equals(commitHash)) {unableCommentMessage = "Unable to comment on pull request merge preview";} else {unableCommentMessage = "Unable to comment on commits not belonging to pull request";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.javaindex 158902e55e..17257e2910 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@@ -196,7 +196,6 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {request.setSubmitter(currentUser);request.setBaseCommitHash(baseCommitId.name());- request.setHeadCommitHash(source.getObjectName());if (request.getBaseCommitHash().equals(source.getObjectName())) {CloseInfo closeInfo = new CloseInfo();closeInfo.setDate(new Date());@@ -208,8 +207,8 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {update.setDate(new DateTime(request.getSubmitDate()).plusSeconds(1).toDate());request.addUpdate(update);update.setRequest(request);- update.setRequestHead(request.getHeadCommitHash());- update.setMergeBaseCommitHash(request.getBaseCommitHash());+ update.setHeadCommitHash(source.getObjectName());+ update.setTargetHeadCommitHash(request.getTarget().getObjectName());OneDev.getInstance(PullRequestManager.class).checkQuality(request);@@ -398,7 +397,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {PullRequest request = getPullRequest();List<Revision> revisions = new ArrayList<>();revisions.add(new Revision(request.getBaseCommitHash(), Revision.Scope.SINCE));- revisions.add(new Revision(request.getHeadCommitHash(), Revision.Scope.UNTIL));+ revisions.add(new Revision(request.getLatestUpdate().getHeadCommitHash(), Revision.Scope.UNTIL));return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));}@@ -419,7 +418,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {protected Project load() {Project project = source.getProject();project.cacheObjectId(source.getRevision(),- ObjectId.fromString(getPullRequest().getHeadCommitHash()));+ ObjectId.fromString(getPullRequest().getLatestUpdate().getHeadCommitHash()));return project;}@@ -734,11 +733,11 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {@Overridepublic Component getLazyLoadComponent(String componentId) {PullRequest request = getPullRequest();- MergePreview mergePreview = new MergePreview(request.getTarget().getObjectName(),- request.getHeadCommitHash(), request.getMergeStrategy(), null);+ MergePreview mergePreview = new MergePreview(request.getLatestUpdate().getTargetHeadCommitHash(),+ request.getLatestUpdate().getHeadCommitHash(), request.getMergeStrategy(), null);ObjectId merged = mergePreview.getMergeStrategy().merge(request);if (merged != null)- mergePreview.setMerged(merged.name());+ mergePreview.setMergeCommitHash(merged.name());request.setLastMergePreview(mergePreview);if (merged != null) {@@ -794,7 +793,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {RevisionComparePage.State state = new RevisionComparePage.State();state.mark = mark;state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());- state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());+ state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getLatestUpdate().getHeadCommitHash());state.pathFilter = pathFilter;state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = whitespaceOption;@@ -842,7 +841,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {mark = comment.getMarkPos();state.commentId = comment.getId();state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());- state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());+ state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getLatestUpdate().getHeadCommitHash());state.pathFilter = pathFilter;state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;state.whitespaceOption = whitespaceOption;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 3162bf9599..12ba1be88b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -923,7 +923,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();MergePreview preview = getPullRequest().getMergePreview();- setVisible(preview != null && preview.getMerged() == null);+ setVisible(preview != null && preview.getMergeCommitHash() == null);}});@@ -933,7 +933,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRprotected void onConfigure() {super.onConfigure();MergePreview preview = getPullRequest().getMergePreview();- setVisible(preview != null && preview.getMerged() != null);+ setVisible(preview != null && preview.getMergeCommitHash() != null);}});@@ -1229,7 +1229,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();MergePreview preview = request.getLastMergePreview();- setVisible(preview != null && preview.getRequestHead().equals(preview.getMerged()));+ setVisible(preview != null && preview.getHeadCommitHash().equals(preview.getMergeCommitHash()));}});@@ -1242,7 +1242,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();MergePreview preview = request.getLastMergePreview();setVisible(preview != null- && !preview.getRequestHead().equals(preview.getMerged())+ && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())&& (preview.getMergeStrategy() == CREATE_MERGE_COMMIT || preview.getMergeStrategy() == CREATE_MERGE_COMMIT_IF_NECESSARY));}@@ -1266,7 +1266,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();MergePreview preview = request.getLastMergePreview();setVisible(preview != null- && !preview.getRequestHead().equals(preview.getMerged())+ && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())&& preview.getMergeStrategy() == SQUASH_SOURCE_BRANCH_COMMITS);}@@ -1280,7 +1280,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();MergePreview preview = request.getMergePreview();setVisible(preview != null- && !preview.getRequestHead().equals(preview.getMerged())+ && !preview.getHeadCommitHash().equals(preview.getMergeCommitHash())&& preview.getMergeStrategy() == REBASE_SOURCE_BRANCH_COMMITS);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.javaindex 713901740e..8a9f223da3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java@@ -52,7 +52,7 @@ public enum PullRequestOperation {ReviewResult result = new ReviewResult();result.setApproved(true);result.setComment(comment);- result.setCommit(request.getHeadCommitHash());+ result.setCommit(request.getLatestUpdate().getHeadCommitHash());review.setResult(result);OneDev.getInstance(PullRequestReviewManager.class).review(review);Session.get().success("Approved");@@ -80,7 +80,7 @@ public enum PullRequestOperation {ReviewResult result = new ReviewResult();result.setApproved(false);result.setComment(comment);- result.setCommit(request.getHeadCommitHash());+ result.setCommit(request.getLatestUpdate().getHeadCommitHash());review.setResult(result);OneDev.getInstance(PullRequestReviewManager.class).review(review);Session.get().success("Requested for changes");@@ -125,8 +125,8 @@ public enum PullRequestOperation {&& request.getSource().getObjectName(false) != null&& !request.getSource().isDefault()&& preview != null- && (request.getSource().getObjectName().equals(preview.getRequestHead())- || request.getSource().getObjectName().equals(preview.getMerged()))+ && (request.getSource().getObjectName().equals(preview.getHeadCommitHash())+ || request.getSource().getObjectName().equals(preview.getMergeCommitHash()))&& SecurityUtils.canModify(request)&& SecurityUtils.canDeleteBranch(request.getSourceProject(), request.getSourceBranch())&& pullRequestManager.queryOpenTo(request.getSource()).isEmpty();diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.javaindex fd010e9917..0eb212e9b8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java@@ -21,8 +21,8 @@ public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {PullRequestUpdate update = getModelObject();PullRequestChangesPage.State state = new PullRequestChangesPage.State();- state.oldCommit = update.getRequestHead();- state.newCommit = update.getRequest().getHeadCommitHash();+ state.oldCommit = update.getHeadCommitHash();+ state.newCommit = update.getRequest().getLatestUpdate().getHeadCommitHash();add(new ViewStateAwarePageLink<Void>("link", PullRequestChangesPage.class,PullRequestChangesPage.paramsOf(update.getRequest(), state)));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.javaindex ae854d55b5..0bf6613ba4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java@@ -19,7 +19,7 @@ public class UpdateChangesLink extends ViewStateAwarePageLink<Void> {private static PageParameters paramsOf(PullRequestUpdate update) {return PullRequestChangesPage.paramsOf(update.getRequest(),- update.getBaseCommitHash(), update.getRequestHead());+ update.getBase(), update.getHeadCommitHash());}public IModel<?> getBody() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.javaindex 3f912696de..ac13a6f51a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java@@ -31,7 +31,7 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {String commit = request.getBaseCommitHash();for (PullRequestUpdate update: request.getSortedUpdates()) {if (update.getDate().before(sinceDate))- commit = update.getRequestHead();+ commit = update.getHeadCommitHash();}return commit;}@@ -49,7 +49,7 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {PullRequest request = getPullRequest();PullRequestChangesPage.State state = new PullRequestChangesPage.State();state.oldCommit = oldCommitModel.getObject();- state.newCommit = request.getHeadCommitHash();+ state.newCommit = request.getLatestUpdate().getHeadCommitHash();return PullRequestChangesPage.paramsOf(request, state);}@@ -81,7 +81,7 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!oldCommitModel.getObject().equals(getPullRequest().getHeadCommitHash()));+ setVisible(!oldCommitModel.getObject().equals(getPullRequest().getLatestUpdate().getHeadCommitHash()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.htmlindex 843874bd05..fcbf4e85e2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html@@ -17,8 +17,8 @@<wicket:fragment wicket:id="commitsFrag"><div class="commits-selector noselect"><div class="head clearfix">- <div class="title pull-left">Click to select a commit, or shift-click to select range of commits</div>- <a title="Apply selected commits" disabled="disabled" class="btn btn-xs btn-default"><i class="fa fa-ext fa-file-diff"></i> Show changes</a>+ <div class="title pull-left">Click to select a commit, or shift-click to select multiple commits</div>+ <a disabled="disabled">show changes</a></div><ul class="body list-unstyled autosize"><li wicket:id="commits">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.javaindex 81aaf5d5e0..f0e80b8cee 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@@ -29,6 +29,7 @@ import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.IRequestParameters;import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.collect.Sets;@@ -106,7 +107,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Comif (requestComparingInfo != null && state.oldCommit == null && state.newCommit == null) {if (comment.isContextChanged(request)) {state.oldCommit = comment.getMarkPos().getCommit();- state.newCommit = request.getHeadCommitHash();+ state.newCommit = request.getLatestUpdate().getHeadCommitHash();} else {state.oldCommit = requestComparingInfo.getOldCommit();state.newCommit = requestComparingInfo.getNewCommit();@@ -116,7 +117,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Comif (state.oldCommit == null)state.oldCommit = request.getBaseCommitHash();if (state.newCommit == null)- state.newCommit = request.getHeadCommitHash();+ state.newCommit = request.getLatestUpdate().getHeadCommitHash();}private int getCommitIndex(String commitHash) {@@ -312,7 +313,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements ComoldName = GitUtils.abbreviateSHA(state.oldCommit);String newName;- if (state.newCommit.equals(getPullRequest().getHeadCommitHash())) {+ if (state.newCommit.equals(getPullRequest().getLatestUpdate().getHeadCommitHash())) {newName = "head";} else {newName = GitUtils.abbreviateSHA(state.newCommit);@@ -330,7 +331,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com@Overridepublic void onClick(AjaxRequestTarget target) {state.oldCommit = getPullRequest().getBaseCommitHash();- state.newCommit = getPullRequest().getHeadCommitHash();+ state.newCommit = getPullRequest().getLatestUpdate().getHeadCommitHash();target.add(head);newRevisionDiff(target);onRegionChange();@@ -341,7 +342,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Comprotected void onConfigure() {super.onConfigure();setVisible(!state.oldCommit.equals(getPullRequest().getBaseCommitHash())- || !state.newCommit.equals(getPullRequest().getHeadCommitHash()));+ || !state.newCommit.equals(getPullRequest().getLatestUpdate().getHeadCommitHash()));}});@@ -413,6 +414,10 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements CompushState(partialPageRequestHandler, url.toString(), state);}+ private ObjectId getComparisonBase() {+ return getPullRequest().getComparisonBase(ObjectId.fromString(state.oldCommit), ObjectId.fromString(state.newCommit));+ }+private void newRevisionDiff(@Nullable AjaxRequestTarget target) {IModel<String> blameModel = new IModel<String>() {@@ -470,7 +475,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com};Component revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,- requestModel, state.oldCommit, state.newCommit, pathFilterModel,+ requestModel, getComparisonBase().name(), state.newCommit, pathFilterModel,whitespaceOptionModel, blameModel, this);revisionDiff.setOutputMarkupId(true);if (target != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.cssindex 8628f29f74..1cc979c64b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css@@ -37,13 +37,13 @@font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}.commits-selector ul a:hover {- background: #FCEDAA;+ background: #F2F2F2;}.commits-selector ul a.selected {- background: #FAE170;+ background: #FDF2C5;}.commits-selector ul a.selected:hover {- background: #F7CD11;+ background: #FDF2C5;}.commits-selector ul .hash, .commits-selector ul .icon {color: #666;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javaindex 9964f8db7d..fb12e59d92 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java@@ -93,25 +93,25 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParamprivate void newContent(IPartialPageRequestHandler handler) {Fragment fragment;MergePreview preview = getPullRequest().getMergePreview();- if (getPullRequest().isOpen() && preview != null && preview.getMerged() != null) {+ if (getPullRequest().isOpen() && preview != null && preview.getMergeCommitHash() != null) {fragment = new Fragment("content", "availableFrag", this);CommitDetailPage.State commitState = new CommitDetailPage.State();- commitState.revision = preview.getTargetHead();+ commitState.revision = preview.getTargetHeadCommitHash();PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);Link<Void> hashLink = new ViewStateAwarePageLink<Void>("targetHead", CommitDetailPage.class, params);fragment.add(hashLink);- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getTargetHead())));- fragment.add(new CopyToClipboardLink("copyTargetHead", Model.of(preview.getTargetHead())));+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getTargetHeadCommitHash())));+ fragment.add(new CopyToClipboardLink("copyTargetHead", Model.of(preview.getTargetHeadCommitHash())));commitState = new CommitDetailPage.State();- commitState.revision = preview.getMerged();+ commitState.revision = preview.getMergeCommitHash();params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);hashLink = new ViewStateAwarePageLink<Void>("mergedCommit", CommitDetailPage.class, params);fragment.add(hashLink);- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMerged())));- fragment.add(new CopyToClipboardLink("copyMergedCommit", Model.of(preview.getMerged())));- fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMerged())) {+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMergeCommitHash())));+ fragment.add(new CopyToClipboardLink("copyMergedCommit", Model.of(preview.getMergeCommitHash())));+ fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMergeCommitHash())) {@Overrideprotected String getCssClasses() {@@ -160,9 +160,9 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParamMergePreview latestPreview = getPullRequest().getMergePreview();setVisible(!getPullRequest().isOpen()|| latestPreview == null- || latestPreview.getMerged() == null- || !latestPreview.getTargetHead().equals(preview.getTargetHead())- || !latestPreview.getMerged().equals(preview.getMerged()));+ || latestPreview.getMergeCommitHash() == null+ || !latestPreview.getTargetHeadCommitHash().equals(preview.getTargetHeadCommitHash())+ || !latestPreview.getMergeCommitHash().equals(preview.getMergeCommitHash()));}}.setOutputMarkupPlaceholderTag(true));@@ -223,7 +223,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam};Component revisionDiff = new RevisionDiffPanel("revisionDiff", projectModel,- requestModel, preview.getTargetHead(), preview.getMerged(), pathFilterModel,+ requestModel, preview.getTargetHeadCommitHash(), preview.getMergeCommitHash(), pathFilterModel,whitespaceOptionModel, blameModel, null);revisionDiff.setOutputMarkupId(true);fragment.add(revisionDiff);