The Unified and Autonomous Development Platform
Require git version minimum 2.11.1 for config allowAnySHA1InWant. And some bug fixes
robin shen47ca66b4d780
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex ea92d99bb0..815ba07924 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -154,11 +154,7 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemdao.persist(project);if (isNew) {- UserAuthorization authorization = new UserAuthorization();- authorization.setPrivilege(ProjectPrivilege.ADMINISTRATION);- authorization.setProject(project);- authorization.setUser(SecurityUtils.getUser());- userAuthorizationManager.save(authorization);+ authorizeCreator(project, SecurityUtils.getUser());checkSanity(project);}@@ -206,12 +202,22 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implemreturn null;}+ private void authorizeCreator(Project project, User user) {+ UserAuthorization authorization = new UserAuthorization();+ authorization.setPrivilege(ProjectPrivilege.ADMINISTRATION);+ authorization.setProject(project);+ authorization.setUser(user);+ userAuthorizationManager.save(authorization);+ }+@Transactional@Overridepublic void fork(Project from, Project to) {- save(to);+ dao.persist(to);+ authorizeCreator(to, SecurityUtils.getUser());FileUtils.cleanDir(to.getGitDir());new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();+ checkSanity(to);commitInfoManager.cloneInfo(from, to);avatarManager.copyAvatar(from.getFacade(), to.getFacade());}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 0b9205fb76..318f804c5e 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@@ -1,1083 +1,1081 @@-package io.onedev.server.entitymanager.impl;--import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSourceProject;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofSubmitter;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;-import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;--import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Comparator;-import java.util.Date;-import java.util.HashMap;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;--import javax.inject.Inject;-import javax.inject.Singleton;-import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.CriteriaQuery;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.validation.ValidationException;--import org.apache.commons.lang3.StringUtils;-import org.apache.shiro.authz.Permission;-import org.apache.shiro.subject.Subject;-import org.apache.shiro.util.ThreadContext;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.lib.CommitBuilder;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectInserter;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.lib.RefUpdate;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevWalk;-import org.hibernate.Session;-import org.hibernate.criterion.Criterion;-import org.hibernate.criterion.MatchMode;-import org.hibernate.criterion.Order;-import org.hibernate.criterion.Restrictions;-import org.hibernate.query.Query;-import org.joda.time.DateTime;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.base.Preconditions;--import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.MatrixRunner;-import io.onedev.commons.utils.concurrent.Prioritized;-import io.onedev.server.OneDev;-import io.onedev.server.OneException;-import io.onedev.server.cache.CommitInfoManager;-import io.onedev.server.ci.CISpec;-import io.onedev.server.ci.job.Job;-import io.onedev.server.ci.job.JobManager;-import io.onedev.server.ci.job.param.JobParam;-import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;-import io.onedev.server.ci.job.trigger.JobTrigger;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestBuildManager;-import io.onedev.server.entitymanager.PullRequestChangeManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.entitymanager.PullRequestReviewManager;-import io.onedev.server.entitymanager.PullRequestUpdateManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.event.RefUpdated;-import io.onedev.server.event.build.BuildEvent;-import io.onedev.server.event.entity.EntityRemoved;-import io.onedev.server.event.pullrequest.PullRequestBuildEvent;-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;-import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;-import io.onedev.server.event.pullrequest.PullRequestEvent;-import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;-import io.onedev.server.event.pullrequest.PullRequestOpened;-import io.onedev.server.git.GitUtils;-import io.onedev.server.git.command.FileChange;-import io.onedev.server.model.Build;-import io.onedev.server.model.Group;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestBuild;-import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.model.support.FileProtection;-import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.TransactionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.search.entity.EntityQuery;-import io.onedev.server.search.entity.EntitySort;-import io.onedev.server.search.entity.EntitySort.Direction;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.security.permission.ProjectPermission;-import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.PullRequestConstants;-import io.onedev.server.util.facade.ProjectFacade;-import io.onedev.server.util.facade.UserFacade;-import io.onedev.server.util.markdown.MarkdownManager;-import io.onedev.server.util.reviewrequirement.ReviewRequirement;-import io.onedev.server.util.work.BatchWorkManager;-import io.onedev.server.util.work.BatchWorker;--@Singleton-public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {-- private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);-- private static final int MAX_CONTRIBUTION_FILES = 100;-- private static final int UI_PREVIEW_PRIORITY = 10;-- private static final int BACKEND_PREVIEW_PRIORITY = 50;-- private final PullRequestUpdateManager pullRequestUpdateManager;-- private final ProjectManager projectManager;-- private final UserManager userManager;-- private final SessionManager sessionManager;-- private final ListenerRegistry listenerRegistry;-- private final PullRequestReviewManager pullRequestReviewManager;-- private final PullRequestBuildManager pullRequestBuildManager;-- private final BatchWorkManager batchWorkManager;-- private final PullRequestChangeManager pullRequestChangeManager;-- private final TransactionManager transactionManager;-- private final JobManager jobManager;-- @Inject- public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,- PullRequestReviewManager pullRequestReviewManager, UserManager userManager,- MarkdownManager markdownManager, BatchWorkManager batchWorkManager,- ListenerRegistry listenerRegistry, SessionManager sessionManager,- PullRequestChangeManager pullRequestChangeManager,- PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager,- JobManager jobManager, ProjectManager projectManager) {- super(dao);-- this.pullRequestUpdateManager = pullRequestUpdateManager;- this.pullRequestReviewManager = pullRequestReviewManager;- this.transactionManager = transactionManager;- this.userManager = userManager;- this.batchWorkManager = batchWorkManager;- this.sessionManager = sessionManager;- this.listenerRegistry = listenerRegistry;- this.pullRequestChangeManager = pullRequestChangeManager;- this.pullRequestBuildManager = pullRequestBuildManager;- this.jobManager = jobManager;- this.projectManager = projectManager;- }-- @Transactional- @Override- public void delete(PullRequest request) {- deleteRefs(request);- dao.remove(request);- }-- @Sessional- @Override- public void deleteRefs(PullRequest request) {- for (PullRequestUpdate update : request.getUpdates())- update.deleteRefs();-- request.deleteRefs();- }-- @Transactional- @Override- public void restoreSourceBranch(PullRequest request, String note) {- Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);- if (request.getSource().getObjectName(false) == null) {- RevCommit latestCommit = request.getHeadCommit();- try {- request.getSourceProject().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);- }- request.getSourceProject().cacheObjectId(request.getSourceBranch(), latestCommit.copy());-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setData(new PullRequestSourceBranchRestoreData(note));- change.setRequest(request);- change.setUser(userManager.getCurrent());- pullRequestChangeManager.save(change);- }- }-- @Transactional- @Override- public void deleteSourceBranch(PullRequest request, String note) {- Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);-- if (request.getSource().getObjectName(false) != null) {- projectManager.deleteBranch(request.getSourceProject(), request.getSourceBranch());- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setData(new PullRequestSourceBranchDeleteData(note));- change.setRequest(request);- change.setUser(userManager.getCurrent());- pullRequestChangeManager.save(change);- }- }-- @Transactional- @Override- public void reopen(PullRequest request, String note) {- User user = userManager.getCurrent();- request.setCloseInfo(null);-- PullRequestChange change = new PullRequestChange();- change.setDate(new Date());- change.setData(new PullRequestReopenData(note));- change.setRequest(request);- change.setUser(user);- pullRequestChangeManager.save(change);- checkAsync(request);- }-- @Transactional- @Override- public void discard(PullRequest request, String note) {- User user = userManager.getCurrent();- Date date = new Date();-- CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(date);- closeInfo.setUser(user);- closeInfo.setStatus(CloseInfo.Status.DISCARDED);- request.setCloseInfo(closeInfo);-- PullRequestChange change = new PullRequestChange();- change.setDate(date);- change.setData(new PullRequestDiscardData(note));- change.setRequest(request);- change.setUser(user);- pullRequestChangeManager.save(change);- }-- private void merge(PullRequest request) {- MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());- String merged = Preconditions.checkNotNull(preview.getMerged());-- ObjectId mergedId = ObjectId.fromString(merged);- RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId, true);-- PersonIdent committer = new PersonIdent(OneDev.NAME, "");-- Project 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())- && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {- try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());- ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {- CommitBuilder newCommit = new CommitBuilder();- newCommit.setAuthor(mergedCommit.getAuthorIdent());- newCommit.setCommitter(committer);- newCommit.setMessage(request.getCommitMessage());- newCommit.setTreeId(mergedCommit.getTree());- newCommit.setParentIds(mergedCommit.getParents());- mergedId = inserter.insert(newCommit);- merged = mergedId.name();- inserter.flush();- } catch (Exception e) {- throw ExceptionUtils.unchecked(e);- }- preview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),- preview.getMergeStrategy(), merged);- request.setLastMergePreview(preview);- RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), request.getMergeRef());- refUpdate.setNewObjectId(mergedId);- GitUtils.updateRef(refUpdate);- }-- closeAsMerged(request, false);-- String targetRef = request.getTargetRef();- ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());- RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), targetRef);- refUpdate.setRefLogIdent(committer);- refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);- refUpdate.setExpectedOldObjectId(targetHeadId);- refUpdate.setNewObjectId(mergedId);- GitUtils.updateRef(refUpdate);-- request.getTargetProject().cacheObjectId(request.getTargetRef(), mergedId);-- Long requestId = request.getId();- Subject subject = SecurityUtils.getSubject();- ObjectId newTargetHeadId = mergedId;- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- dao.getSessionManager().runAsync(new Runnable() {-- @Override- public void run() {- ThreadContext.bind(subject);- try {- PullRequest request = load(requestId);- request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);- listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,- targetHeadId, newTargetHeadId));- } finally {- ThreadContext.unbindSubject();- }- }-- });- }- });- }-- @Transactional- @Override- public void open(PullRequest request) {- Preconditions.checkArgument(request.isNew());- Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");- query.setParameter("project", request.getTargetProject());- request.setNumber(getNextNumber(request.getTargetProject(), query));-- dao.persist(request);-- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());- refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));- GitUtils.updateRef(refUpdate);-- refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getHeadRef());- refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));- GitUtils.updateRef(refUpdate);-- for (PullRequestUpdate update: request.getUpdates())- pullRequestUpdateManager.save(update, false);-- pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.savePullRequestBuilds(request);-- checkAsync(request);-- listenerRegistry.post(new PullRequestOpened(request));- }-- private void closeAsMerged(PullRequest request, boolean dueToMerged) {- Date date = new DateTime().plusMillis(1).toDate();-- if (dueToMerged)- request.setLastMergePreview(null);-- CloseInfo closeInfo = new CloseInfo();- closeInfo.setDate(date);- closeInfo.setStatus(CloseInfo.Status.MERGED);- request.setCloseInfo(closeInfo);-- String reason = null;- if (dueToMerged)- reason = "closed pull request as source branch is merged into target branch";-- PullRequestChange change = new PullRequestChange();- change.setDate(date);- change.setData(new PullRequestMergeData(reason));- change.setRequest(request);- pullRequestChangeManager.save(change);- }-- private void checkUpdate(PullRequest request) {- if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {- ObjectId mergeBase = GitUtils.getMergeBase(- request.getTargetProject().getRepository(), request.getTarget().getObjectId(),- request.getSourceProject().getRepository(), request.getSource().getObjectId(),- GitUtils.branch2ref(request.getSourceBranch()));- if (mergeBase != null) {- PullRequestUpdate update = new PullRequestUpdate();- update.setRequest(request);- update.setHeadCommitHash(request.getSource().getObjectName());- update.setMergeBaseCommitHash(mergeBase.name());- request.addUpdate(update);- pullRequestUpdateManager.save(update, true);-- RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),- request.getHeadRef());- refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));- GitUtils.updateRef(refUpdate);- }- }- }-- @Transactional- @Override- public void check(PullRequest request) {- try {- request.setCheckError(null);- if (request.isOpen() && request.isValid()) {- if (request.getSourceProject() == null) {- discard(request, "Source project no longer exists");- } else if (request.getSource().getObjectId(false) == null) {- discard(request, "Source branch no longer exists");- } else if (request.getTarget().getObjectId(false) == null) {- discard(request, "Target branch no longer exists");- } else {- checkUpdate(request);- if (request.isMergeIntoTarget()) {- closeAsMerged(request, true);- } else {- checkQuality(request);-- pullRequestReviewManager.saveReviews(request);- pullRequestBuildManager.savePullRequestBuilds(request);-- MergePreview preview = request.getMergePreview();-- if (request.isAllReviewsApproved()- && request.isAllBuildsSuccessful()- && request.getCheckError() == null- && preview != null- && preview.getMerged() != null) {- merge(request);- }- }- }- }- } catch (ValidationException|OneException e) {- request.setCheckError(e.getMessage());- } catch (Exception e) {- request.setCheckError("Error checking pull request, check server log for details");- String message = String.format("Error checking pull request (project: %s, number: %d)",- request.getTargetProject().getName(), request.getNumber());- logger.error(message, e);- }- }-- @Sessional- @Override- public MergePreview previewMerge(PullRequest request) {- if (!request.isNew() && request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE) {- MergePreview lastPreview = request.getLastMergePreview();- if (request.isOpen() && !request.isMergeIntoTarget()) {- if (lastPreview == null || !lastPreview.isUpToDate(request)) {- int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;- Long requestId = request.getId();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- batchWorkManager.submit(getMergePreviewer(requestId), new Prioritized(priority));- }-- });- return null;- } else {- lastPreview.syncRef(request);- return lastPreview;- }- } else {- return lastPreview;- }- } else {- return null;- }- }-- private BatchWorker getMergePreviewer(Long requestId) {- return new BatchWorker("request-" + requestId + "-previewMerge", 1) {-- @Override- public void doWorks(Collection<Prioritized> works) {- sessionManager.run(new Runnable() {-- @Override- public void run() {- Preconditions.checkState(works.size() == 1);- PullRequest request = load(requestId);- Project targetProject = request.getTargetProject();- MergePreview mergePreview = request.getLastMergePreview();- if (request.isOpen() && !request.isMergeIntoTarget()) {- if (mergePreview == null || !mergePreview.isUpToDate(request)) {- mergePreview = new MergePreview(request.getTarget().getObjectName(),- request.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.syncRef(request);- request.setLastMergePreview(mergePreview);- dao.persist(request);- listenerRegistry.post(new PullRequestMergePreviewCalculated(request));- } else {- mergePreview.syncRef(request);- }- }- }-- });- }-- };- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof Project) {- Project project = (Project) event.getEntity();- for (PullRequest request: project.getOutgoingRequests()) {- if (!request.getTargetProject().equals(project) && request.isOpen())- discard(request, "Source project is deleted.");- }-- Query<?> query = getSession().createQuery("update PullRequest set sourceProject=null where "- + "sourceProject=:project");- query.setParameter("project", project);- query.executeUpdate();- }- }-- @Transactional- @Listen- public void on(RefUpdated event) {- String branch = GitUtils.ref2branch(event.getRefName());- if (branch != null && !event.getOldCommitId().equals(ObjectId.zeroId())) {- ProjectAndBranch projectAndBranch = new ProjectAndBranch(event.getProject(), branch);- Criterion criterion = Restrictions.and(- ofOpen(),- Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));- for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion)))- check(request);- }- }-- @Sessional- @Override- public 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()));-- criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));-- return find(criteria);- }-- @Sessional- @Override- public PullRequest findLatest(Project targetProject, User submitter) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofOpen());- criteria.add(Restrictions.or(ofSourceProject(targetProject), ofTargetProject(targetProject)));- criteria.add(ofSubmitter(submitter));- criteria.addOrder(Order.desc("id"));- return find(criteria);- }-- @Sessional- @Override- public Collection<PullRequest> queryOpenTo(ProjectAndBranch target) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofTarget(target));- criteria.add(ofOpen());- return query(criteria);- }-- @Sessional- @Override- public Collection<PullRequest> queryOpen(ProjectAndBranch sourceOrTarget) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofOpen());- criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));- return query(criteria);- }-- @Sessional- @Override- public int countOpen(Project targetProject) {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(PullRequest.CriterionHelper.ofOpen());- criteria.add(PullRequest.CriterionHelper.ofTargetProject(targetProject));- return count(criteria);- }-- @Transactional- @Listen- public void on(PullRequestChangeEvent event) {- PullRequestChangeData data = event.getChange().getData();- if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData- || data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData- || data instanceof PullRequestMergeStrategyChangeData) {- checkAsync(event.getRequest());- }- }-- @Transactional- @Listen- public void on(PullRequestEvent event) {- if (!(event instanceof PullRequestMergePreviewCalculated) && !(event instanceof PullRequestBuildEvent))- event.getRequest().setUpdateDate(event.getDate());- }-- @Transactional- @Listen- public void on(PullRequestCodeCommentEvent event) {- event.getRequest().setLastCodeCommentActivityDate(event.getDate());- }-- @Listen- @Transactional- public void on(BuildEvent event) {- Build build = event.getBuild();- for (PullRequestBuild pullRequestBuild: build.getPullRequestBuilds()) {- listenerRegistry.post(new PullRequestBuildEvent(pullRequestBuild));- checkAsync(pullRequestBuild.getRequest());- }- }-- @Listen- public void on(PullRequestMergePreviewCalculated event) {- checkAsync(event.getRequest());- }-- @Sessional- protected void checkAsync(PullRequest request) {- Long requestId = request.getId();- Subject subject = SecurityUtils.getSubject();- transactionManager.runAfterCommit(new Runnable() {-- @Override- public void run() {- dao.getSessionManager().runAsync(new Runnable() {-- @Override- public void run() {- try {- ThreadContext.bind(subject);- check(load(requestId));- } finally {- ThreadContext.unbindSubject();- }- }-- });- }-- });- }-- @Transactional- @Override- public void checkQuality(PullRequest request) {- BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());- if (branchProtection != null) {- checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());-- Set<FileProtection> checkedFileProtections = new HashSet<>();- for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {- if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))- break;- PullRequestUpdate update = request.getSortedUpdates().get(i);- for (String file: update.getChangedFiles()) {- FileProtection fileProtection = branchProtection.getFileProtection(file);- if (fileProtection != null- && !checkedFileProtections.contains(fileProtection)) {- checkedFileProtections.add(fileProtection);- checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);- }- }- }- }-- checkBuilds(request);-- ProjectFacade project = request.getTargetProject().getFacade();- Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);- if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {- Collection<User> writers = new ArrayList<>();- for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))- writers.add(userManager.load(facade.getId()));- checkReviews(writers, 1, request.getLatestUpdate());- }- }-- private void checkBuilds(PullRequest request) {- Collection<PullRequestBuild> prevRequirements = new ArrayList<>(request.getPullRequestBuilds());- request.getPullRequestBuilds().clear();- MergePreview preview = request.getMergePreview();- if (preview != null && preview.getMerged() != null) {- Project project = request.getTargetProject();- ObjectId commitId = ObjectId.fromString(preview.getMerged());- CISpec ciSpec = project.getCISpec(commitId);- if (ciSpec == null)- throw new OneException("No CI spec defined in merge preview commit");- for (Job job: ciSpec.getJobs()) {- for (JobTrigger trigger: job.getTriggers()) {- if (trigger instanceof BranchUpdateTrigger) {- BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;- if (branchUpdateTrigger.isRejectIfNotSuccessful()) {- RefUpdated updated = new RefUpdated(project, GitUtils.branch2ref(request.getTargetBranch()),- request.getTarget().getObjectId(), commitId);- if (branchUpdateTrigger.matches(updated, job)) {- new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {-- @Override- public void run(Map<String, List<String>> paramMap) {- Build build = jobManager.submit(request.getTargetProject(),- commitId, job.getName(), paramMap, null);- PullRequestBuild pullRequestBuild = null;- for (PullRequestBuild prevRequirement: prevRequirements) {- if (prevRequirement.getBuild().equals(build)) {- pullRequestBuild = prevRequirement;- break;- }- }- if (pullRequestBuild == null) {- pullRequestBuild = new PullRequestBuild();- pullRequestBuild.setRequest(request);- pullRequestBuild.setBuild(build);- }- request.getPullRequestBuilds().add(pullRequestBuild);- }-- }.run();- }- }- }- }- }- }- }-- private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update) {- PullRequest request = update.getRequest();-- for (User user: reviewRequirement.getUsers()) {- if (!user.equals(request.getSubmitter())) {- PullRequestReview review = request.getReview(user);- if (review == null) {- review = new PullRequestReview();- review.setRequest(request);- review.setUser(user);- request.getReviews().add(review);- } else if (review.getExcludeDate() != null) {- review.setExcludeDate(null);- } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {- review.setResult(null);- }- }- }-- for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {- Group group = entry.getKey();- int requiredCount = entry.getValue();- checkReviews(group.getMembers(), requiredCount, update);- }- }-- private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update) {- PullRequest request = update.getRequest();-- if (requiredCount == 0)- requiredCount = users.size();-- int effectiveCount = 0;- Set<User> potentialReviewers = new HashSet<>();- for (User user: users) {- if (user.equals(request.getSubmitter())) {- effectiveCount++;- } else {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() == null) {- if (review.getResult() == null)- requiredCount--;- else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())- effectiveCount++;- else- potentialReviewers.add(user);- } else {- potentialReviewers.add(user);- }- }- if (effectiveCount >= requiredCount)- break;- }-- int missingCount = requiredCount - effectiveCount;- Set<User> reviewers = new HashSet<>();-- List<User> candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() == null)- candidateReviewers.add(user);- }-- sortByContributions(candidateReviewers, update);-- for (User user: candidateReviewers) {- reviewers.add(user);- request.getReview(user).setResult(null);- if (reviewers.size() == missingCount)- break;- }-- if (reviewers.size() < missingCount) {- candidateReviewers = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review == null)- candidateReviewers.add(user);- }- sortByContributions(candidateReviewers, update);- for (User user: candidateReviewers) {- reviewers.add(user);- PullRequestReview review = new PullRequestReview();- review.setRequest(request);- review.setUser(user);- request.getReviews().add(review);- if (reviewers.size() == missingCount)- break;- }- }-- if (reviewers.size() < missingCount) {- List<PullRequestReview> excludedReviews = new ArrayList<>();- for (User user: potentialReviewers) {- PullRequestReview review = request.getReview(user);- if (review != null && review.getExcludeDate() != null)- excludedReviews.add(review);- }- excludedReviews.sort(Comparator.comparing(PullRequestReview::getExcludeDate));-- for (PullRequestReview review: excludedReviews) {- reviewers.add(review.getUser());- review.setExcludeDate(null);- if (reviewers.size() == missingCount)- break;- }- }- if (reviewers.size() < missingCount) {- String errorMessage = String.format("Impossible to provide required number of reviewers "- + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",- reviewers, missingCount, update.getRequest().getNumber());- throw new OneException(errorMessage);- }- }-- private void sortByContributions(List<User> users, PullRequestUpdate update) {- if (users.size() <= 1)- return;-- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);- Map<User, Long> contributions = new HashMap<>();- for (User user: users)- contributions.put(user, 0L);-- int count = 0;- for (FileChange change: update.getFileChanges()) {- String path = change.getPath();- int edits = change.getAdditions() + change.getDeletions();- if (edits < 0)- edits = 100;- else if (edits == 0)- edits = 1;- int addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);- while (addedContributions == 0) {- if (path.contains("/")) {- path = StringUtils.substringBeforeLast(path, "/");- addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);- } else {- addContributions(contributions, commitInfoManager, "", edits, update);- break;- }- }- if (++count >= MAX_CONTRIBUTION_FILES)- break;- }-- Collections.sort(users, new Comparator<User>() {-- @Override- public int compare(User o1, User o2) {- if (contributions.get(o1) < contributions.get(o2))- return 1;- else- return -1;- }-- });- }-- private int addContributions(Map<User, Long> contributions, CommitInfoManager commitInfoManager,- String path, int edits, PullRequestUpdate update) {- int addedContributions = 0;- for (Map.Entry<User, Long> entry: contributions.entrySet()) {- User user = entry.getKey();- int pathEdits = commitInfoManager.getEdits(- update.getRequest().getTargetProject().getFacade(), user.getFacade(), path);- entry.setValue(entry.getValue() + edits*pathEdits);- addedContributions += pathEdits;- }- return addedContributions;- }-- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,- Project targetProject, User user, Root<PullRequest> root, CriteriaBuilder builder) {- List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get("targetProject"), targetProject));- if (criteria != null)- predicates.add(criteria.getPredicate(targetProject, root, builder, user));- return predicates.toArray(new Predicate[0]);- }-- private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject, User user,- EntityQuery<PullRequest> requestQuery) {- CriteriaBuilder builder = session.getCriteriaBuilder();- CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);- Root<PullRequest> root = query.from(PullRequest.class);- query.select(root).distinct(true);-- query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, root, builder));-- List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (EntitySort sort: requestQuery.getSorts()) {- if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));- else- orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));- }-- if (orders.isEmpty())- orders.add(builder.desc(root.get("number")));- query.orderBy(orders);-- return query;- }-- @Sessional- @Override- public List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {- CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);- Query<PullRequest> query = getSession().createQuery(criteriaQuery);- query.setFirstResult(firstResult);- query.setMaxResults(maxResults);- return query.getResultList();- }-- @Sessional- @Override- public int count(Project targetProject, User user, io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {- CriteriaBuilder builder = getSession().getCriteriaBuilder();- CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);- Root<PullRequest> root = criteriaQuery.from(PullRequest.class);-- criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, root, builder));-- criteriaQuery.select(builder.countDistinct(root));- return getSession().createQuery(criteriaQuery).uniqueResult().intValue();- }-- @Sessional- @Override- public PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- criteria.add(ofTarget(target)).add(ofSource(source)).add(ofOpen());- return 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(),- GitUtils.branch2ref(source.getBranch()));- 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.setHeadCommitHash(request.getHeadCommitHash());- update.setMergeBaseCommitHash(request.getBaseCommitHash());- request.setMergeStrategy(mergeStrategy);- open(request);-- return request;- } else {- throw new OneException("No merge base found");- }- }-- @Sessional- @Override- public PullRequest find(Project targetProject, long number) {- EntityCriteria<PullRequest> criteria = newCriteria();- criteria.add(Restrictions.eq("targetProject", targetProject));- criteria.add(Restrictions.eq("number", number));- return find(criteria);- }-- @Sessional- @Override- public List<PullRequest> query(Project targetProject, String term, int count) {- List<PullRequest> requests = new ArrayList<>();-- EntityCriteria<PullRequest> criteria = newCriteria();-- if (StringUtils.isNotBlank(term)) {- if (term.startsWith("#")) {- term = term.substring(1);- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));- }- } else {- try {- long buildNumber = Long.parseLong(term);- criteria.add(Restrictions.eq("number", buildNumber));- } catch (NumberFormatException e) {- criteria.add(Restrictions.or(- Restrictions.ilike("title", term, MatchMode.ANYWHERE),- Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));- }- }- }-- criteria.addOrder(Order.desc("number"));- requests.addAll(query(criteria, 0, count));-- return requests;- }--}+package io.onedev.server.entitymanager.impl;++import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofSourceProject;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofSubmitter;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;+import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;+import static io.onedev.server.model.support.pullrequest.MergeStrategy.SQUASH_SOURCE_BRANCH_COMMITS;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Comparator;+import java.util.Date;+import java.util.HashMap;+import java.util.HashSet;+import java.util.List;+import java.util.Map;+import java.util.Set;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;+import javax.validation.ValidationException;++import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.Permission;+import org.apache.shiro.subject.Subject;+import org.apache.shiro.util.ThreadContext;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.lib.CommitBuilder;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectInserter;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.lib.RefUpdate;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevWalk;+import org.hibernate.Session;+import org.hibernate.criterion.Criterion;+import org.hibernate.criterion.MatchMode;+import org.hibernate.criterion.Order;+import org.hibernate.criterion.Restrictions;+import org.hibernate.query.Query;+import org.joda.time.DateTime;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.MatrixRunner;+import io.onedev.commons.utils.concurrent.Prioritized;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.cache.CommitInfoManager;+import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobManager;+import io.onedev.server.ci.job.param.JobParam;+import io.onedev.server.ci.job.trigger.BranchUpdateTrigger;+import io.onedev.server.ci.job.trigger.JobTrigger;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.PullRequestBuildManager;+import io.onedev.server.entitymanager.PullRequestChangeManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.entitymanager.PullRequestReviewManager;+import io.onedev.server.entitymanager.PullRequestUpdateManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.event.RefUpdated;+import io.onedev.server.event.build.BuildEvent;+import io.onedev.server.event.entity.EntityRemoved;+import io.onedev.server.event.pullrequest.PullRequestBuildEvent;+import io.onedev.server.event.pullrequest.PullRequestChangeEvent;+import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;+import io.onedev.server.event.pullrequest.PullRequestEvent;+import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;+import io.onedev.server.event.pullrequest.PullRequestOpened;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.command.FileChange;+import io.onedev.server.model.Build;+import io.onedev.server.model.Group;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.User;+import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.FileProtection;+import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchDeleteData;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestSourceBranchRestoreData;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.TransactionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.search.entity.EntitySort;+import io.onedev.server.search.entity.EntitySort.Direction;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ProjectPrivilege;+import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.facade.ProjectFacade;+import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.markdown.MarkdownManager;+import io.onedev.server.util.reviewrequirement.ReviewRequirement;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;++@Singleton+public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {++ private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);++ private static final int MAX_CONTRIBUTION_FILES = 100;++ private static final int UI_PREVIEW_PRIORITY = 10;++ private static final int BACKEND_PREVIEW_PRIORITY = 50;++ private final PullRequestUpdateManager pullRequestUpdateManager;++ private final ProjectManager projectManager;++ private final UserManager userManager;++ private final SessionManager sessionManager;++ private final ListenerRegistry listenerRegistry;++ private final PullRequestReviewManager pullRequestReviewManager;++ private final PullRequestBuildManager pullRequestBuildManager;++ private final BatchWorkManager batchWorkManager;++ private final PullRequestChangeManager pullRequestChangeManager;++ private final TransactionManager transactionManager;++ private final JobManager jobManager;++ @Inject+ public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,+ PullRequestReviewManager pullRequestReviewManager, UserManager userManager,+ MarkdownManager markdownManager, BatchWorkManager batchWorkManager,+ ListenerRegistry listenerRegistry, SessionManager sessionManager,+ PullRequestChangeManager pullRequestChangeManager,+ PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager,+ JobManager jobManager, ProjectManager projectManager) {+ super(dao);++ this.pullRequestUpdateManager = pullRequestUpdateManager;+ this.pullRequestReviewManager = pullRequestReviewManager;+ this.transactionManager = transactionManager;+ this.userManager = userManager;+ this.batchWorkManager = batchWorkManager;+ this.sessionManager = sessionManager;+ this.listenerRegistry = listenerRegistry;+ this.pullRequestChangeManager = pullRequestChangeManager;+ this.pullRequestBuildManager = pullRequestBuildManager;+ this.jobManager = jobManager;+ this.projectManager = projectManager;+ }++ @Transactional+ @Override+ public void delete(PullRequest request) {+ deleteRefs(request);+ dao.remove(request);+ }++ @Sessional+ @Override+ public void deleteRefs(PullRequest request) {+ for (PullRequestUpdate update : request.getUpdates())+ update.deleteRefs();++ request.deleteRefs();+ }++ @Transactional+ @Override+ public void restoreSourceBranch(PullRequest request, String note) {+ Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);+ if (request.getSource().getObjectName(false) == null) {+ RevCommit latestCommit = request.getHeadCommit();+ try {+ request.getSourceProject().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ request.getSourceProject().cacheObjectId(request.getSourceBranch(), latestCommit.copy());++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setData(new PullRequestSourceBranchRestoreData(note));+ change.setRequest(request);+ change.setUser(userManager.getCurrent());+ pullRequestChangeManager.save(change);+ }+ }++ @Transactional+ @Override+ public void deleteSourceBranch(PullRequest request, String note) {+ Preconditions.checkState(!request.isOpen() && request.getSourceProject() != null);++ if (request.getSource().getObjectName(false) != null) {+ projectManager.deleteBranch(request.getSourceProject(), request.getSourceBranch());+ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setData(new PullRequestSourceBranchDeleteData(note));+ change.setRequest(request);+ change.setUser(userManager.getCurrent());+ pullRequestChangeManager.save(change);+ }+ }++ @Transactional+ @Override+ public void reopen(PullRequest request, String note) {+ User user = userManager.getCurrent();+ request.setCloseInfo(null);++ PullRequestChange change = new PullRequestChange();+ change.setDate(new Date());+ change.setData(new PullRequestReopenData(note));+ change.setRequest(request);+ change.setUser(user);+ pullRequestChangeManager.save(change);+ checkAsync(request);+ }++ @Transactional+ @Override+ public void discard(PullRequest request, String note) {+ User user = userManager.getCurrent();+ Date date = new Date();++ CloseInfo closeInfo = new CloseInfo();+ closeInfo.setDate(date);+ closeInfo.setUser(user);+ closeInfo.setStatus(CloseInfo.Status.DISCARDED);+ request.setCloseInfo(closeInfo);++ PullRequestChange change = new PullRequestChange();+ change.setDate(date);+ change.setData(new PullRequestDiscardData(note));+ change.setRequest(request);+ change.setUser(user);+ pullRequestChangeManager.save(change);+ }++ private void merge(PullRequest request) {+ MergePreview preview = Preconditions.checkNotNull(request.getMergePreview());+ String merged = Preconditions.checkNotNull(preview.getMerged());++ ObjectId mergedId = ObjectId.fromString(merged);+ RevCommit mergedCommit = request.getTargetProject().getRevCommit(mergedId, true);++ PersonIdent committer = new PersonIdent(OneDev.NAME, "");++ Project 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())+ && !mergedCommit.getFullMessage().equals(request.getCommitMessage())) {+ try ( RevWalk revWalk = new RevWalk(targetProject.getRepository());+ ObjectInserter inserter = targetProject.getRepository().newObjectInserter()) {+ CommitBuilder newCommit = new CommitBuilder();+ newCommit.setAuthor(mergedCommit.getAuthorIdent());+ newCommit.setCommitter(committer);+ newCommit.setMessage(request.getCommitMessage());+ newCommit.setTreeId(mergedCommit.getTree());+ newCommit.setParentIds(mergedCommit.getParents());+ mergedId = inserter.insert(newCommit);+ merged = mergedId.name();+ inserter.flush();+ } catch (Exception e) {+ throw ExceptionUtils.unchecked(e);+ }+ preview = new MergePreview(preview.getTargetHead(), preview.getRequestHead(),+ preview.getMergeStrategy(), merged);+ request.setLastMergePreview(preview);+ RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), request.getMergeRef());+ refUpdate.setNewObjectId(mergedId);+ GitUtils.updateRef(refUpdate);+ }++ closeAsMerged(request, false);++ String targetRef = request.getTargetRef();+ ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());+ RefUpdate refUpdate = GitUtils.getRefUpdate(targetProject.getRepository(), targetRef);+ refUpdate.setRefLogIdent(committer);+ refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);+ refUpdate.setExpectedOldObjectId(targetHeadId);+ refUpdate.setNewObjectId(mergedId);+ GitUtils.updateRef(refUpdate);++ request.getTargetProject().cacheObjectId(request.getTargetRef(), mergedId);++ Long requestId = request.getId();+ Subject subject = SecurityUtils.getSubject();+ ObjectId newTargetHeadId = mergedId;+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ dao.getSessionManager().runAsync(new Runnable() {++ @Override+ public void run() {+ ThreadContext.bind(subject);+ try {+ PullRequest request = load(requestId);+ request.getTargetProject().cacheObjectId(request.getTargetRef(), newTargetHeadId);+ listenerRegistry.post(new RefUpdated(request.getTargetProject(), targetRef,+ targetHeadId, newTargetHeadId));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }+ });+ }++ @Transactional+ @Override+ public void open(PullRequest request) {+ Preconditions.checkArgument(request.isNew());+ Query<?> query = getSession().createQuery("select max(number) from PullRequest where targetProject=:project");+ query.setParameter("project", request.getTargetProject());+ request.setNumber(getNextNumber(request.getTargetProject(), query));++ dao.persist(request);++ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());+ refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));+ GitUtils.updateRef(refUpdate);++ refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getHeadRef());+ refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));+ GitUtils.updateRef(refUpdate);++ for (PullRequestUpdate update: request.getUpdates())+ pullRequestUpdateManager.save(update, false);++ pullRequestReviewManager.saveReviews(request);+ pullRequestBuildManager.savePullRequestBuilds(request);++ checkAsync(request);++ listenerRegistry.post(new PullRequestOpened(request));+ }++ private void closeAsMerged(PullRequest request, boolean dueToMerged) {+ Date date = new DateTime().plusMillis(1).toDate();++ if (dueToMerged)+ request.setLastMergePreview(null);++ CloseInfo closeInfo = new CloseInfo();+ closeInfo.setDate(date);+ closeInfo.setStatus(CloseInfo.Status.MERGED);+ request.setCloseInfo(closeInfo);++ String reason = null;+ if (dueToMerged)+ reason = "closed pull request as source branch is merged into target branch";++ PullRequestChange change = new PullRequestChange();+ change.setDate(date);+ change.setData(new PullRequestMergeData(reason));+ change.setRequest(request);+ pullRequestChangeManager.save(change);+ }++ private void checkUpdate(PullRequest request) {+ if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {+ ObjectId mergeBase = GitUtils.getMergeBase(+ request.getTargetProject().getRepository(), request.getTarget().getObjectId(),+ request.getSourceProject().getRepository(), request.getSource().getObjectId());+ if (mergeBase != null) {+ PullRequestUpdate update = new PullRequestUpdate();+ update.setRequest(request);+ update.setHeadCommitHash(request.getSource().getObjectName());+ update.setMergeBaseCommitHash(mergeBase.name());+ request.addUpdate(update);+ pullRequestUpdateManager.save(update, true);++ RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(),+ request.getHeadRef());+ refUpdate.setNewObjectId(ObjectId.fromString(request.getHeadCommitHash()));+ GitUtils.updateRef(refUpdate);+ }+ }+ }++ @Transactional+ @Override+ public void check(PullRequest request) {+ try {+ request.setCheckError(null);+ if (request.isOpen() && request.isValid()) {+ if (request.getSourceProject() == null) {+ discard(request, "Source project no longer exists");+ } else if (request.getSource().getObjectId(false) == null) {+ discard(request, "Source branch no longer exists");+ } else if (request.getTarget().getObjectId(false) == null) {+ discard(request, "Target branch no longer exists");+ } else {+ checkUpdate(request);+ if (request.isMergeIntoTarget()) {+ closeAsMerged(request, true);+ } else {+ checkQuality(request);++ pullRequestReviewManager.saveReviews(request);+ pullRequestBuildManager.savePullRequestBuilds(request);++ MergePreview preview = request.getMergePreview();++ if (request.isAllReviewsApproved()+ && request.isAllBuildsSuccessful()+ && request.getCheckError() == null+ && preview != null+ && preview.getMerged() != null) {+ merge(request);+ }+ }+ }+ }+ } catch (ValidationException|OneException e) {+ request.setCheckError(e.getMessage());+ } catch (Exception e) {+ request.setCheckError("Error checking pull request, check server log for details");+ String message = String.format("Error checking pull request (project: %s, number: %d)",+ request.getTargetProject().getName(), request.getNumber());+ logger.error(message, e);+ }+ }++ @Sessional+ @Override+ public MergePreview previewMerge(PullRequest request) {+ if (!request.isNew() && request.getMergeStrategy() != MergeStrategy.DO_NOT_MERGE) {+ MergePreview lastPreview = request.getLastMergePreview();+ if (request.isOpen() && !request.isMergeIntoTarget()) {+ if (lastPreview == null || !lastPreview.isUpToDate(request)) {+ int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;+ Long requestId = request.getId();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ batchWorkManager.submit(getMergePreviewer(requestId), new Prioritized(priority));+ }++ });+ return null;+ } else {+ lastPreview.syncRef(request);+ return lastPreview;+ }+ } else {+ return lastPreview;+ }+ } else {+ return null;+ }+ }++ private BatchWorker getMergePreviewer(Long requestId) {+ return new BatchWorker("request-" + requestId + "-previewMerge", 1) {++ @Override+ public void doWorks(Collection<Prioritized> works) {+ sessionManager.run(new Runnable() {++ @Override+ public void run() {+ Preconditions.checkState(works.size() == 1);+ PullRequest request = load(requestId);+ Project targetProject = request.getTargetProject();+ MergePreview mergePreview = request.getLastMergePreview();+ if (request.isOpen() && !request.isMergeIntoTarget()) {+ if (mergePreview == null || !mergePreview.isUpToDate(request)) {+ mergePreview = new MergePreview(request.getTarget().getObjectName(),+ request.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.syncRef(request);+ request.setLastMergePreview(mergePreview);+ dao.persist(request);+ listenerRegistry.post(new PullRequestMergePreviewCalculated(request));+ } else {+ mergePreview.syncRef(request);+ }+ }+ }++ });+ }++ };+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Project) {+ Project project = (Project) event.getEntity();+ for (PullRequest request: project.getOutgoingRequests()) {+ if (!request.getTargetProject().equals(project) && request.isOpen())+ discard(request, "Source project is deleted.");+ }++ Query<?> query = getSession().createQuery("update PullRequest set sourceProject=null where "+ + "sourceProject=:project");+ query.setParameter("project", project);+ query.executeUpdate();+ }+ }++ @Transactional+ @Listen+ public void on(RefUpdated event) {+ String branch = GitUtils.ref2branch(event.getRefName());+ if (branch != null && !event.getOldCommitId().equals(ObjectId.zeroId())) {+ ProjectAndBranch projectAndBranch = new ProjectAndBranch(event.getProject(), branch);+ Criterion criterion = Restrictions.and(+ ofOpen(),+ Restrictions.or(ofSource(projectAndBranch), ofTarget(projectAndBranch)));+ for (PullRequest request: query(EntityCriteria.of(PullRequest.class).add(criterion)))+ check(request);+ }+ }++ @Sessional+ @Override+ public 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()));++ criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));++ return find(criteria);+ }++ @Sessional+ @Override+ public PullRequest findLatest(Project targetProject, User submitter) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofOpen());+ criteria.add(Restrictions.or(ofSourceProject(targetProject), ofTargetProject(targetProject)));+ criteria.add(ofSubmitter(submitter));+ criteria.addOrder(Order.desc("id"));+ return find(criteria);+ }++ @Sessional+ @Override+ public Collection<PullRequest> queryOpenTo(ProjectAndBranch target) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofTarget(target));+ criteria.add(ofOpen());+ return query(criteria);+ }++ @Sessional+ @Override+ public Collection<PullRequest> queryOpen(ProjectAndBranch sourceOrTarget) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofOpen());+ criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));+ return query(criteria);+ }++ @Sessional+ @Override+ public int countOpen(Project targetProject) {+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(PullRequest.CriterionHelper.ofOpen());+ criteria.add(PullRequest.CriterionHelper.ofTargetProject(targetProject));+ return count(criteria);+ }++ @Transactional+ @Listen+ public void on(PullRequestChangeEvent event) {+ PullRequestChangeData data = event.getChange().getData();+ if (data instanceof PullRequestApproveData || data instanceof PullRequestDiscardData+ || data instanceof PullRequestReviewerRemoveData || data instanceof PullRequestReviewerAddData+ || data instanceof PullRequestMergeStrategyChangeData) {+ checkAsync(event.getRequest());+ }+ }++ @Transactional+ @Listen+ public void on(PullRequestEvent event) {+ if (!(event instanceof PullRequestMergePreviewCalculated) && !(event instanceof PullRequestBuildEvent))+ event.getRequest().setUpdateDate(event.getDate());+ }++ @Transactional+ @Listen+ public void on(PullRequestCodeCommentEvent event) {+ event.getRequest().setLastCodeCommentActivityDate(event.getDate());+ }++ @Listen+ @Transactional+ public void on(BuildEvent event) {+ Build build = event.getBuild();+ for (PullRequestBuild pullRequestBuild: build.getPullRequestBuilds()) {+ listenerRegistry.post(new PullRequestBuildEvent(pullRequestBuild));+ checkAsync(pullRequestBuild.getRequest());+ }+ }++ @Listen+ public void on(PullRequestMergePreviewCalculated event) {+ checkAsync(event.getRequest());+ }++ @Sessional+ protected void checkAsync(PullRequest request) {+ Long requestId = request.getId();+ Subject subject = SecurityUtils.getSubject();+ transactionManager.runAfterCommit(new Runnable() {++ @Override+ public void run() {+ dao.getSessionManager().runAsync(new Runnable() {++ @Override+ public void run() {+ try {+ ThreadContext.bind(subject);+ check(load(requestId));+ } finally {+ ThreadContext.unbindSubject();+ }+ }++ });+ }++ });+ }++ @Transactional+ @Override+ public void checkQuality(PullRequest request) {+ BranchProtection branchProtection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());+ if (branchProtection != null) {+ checkReviews(ReviewRequirement.fromString(branchProtection.getReviewRequirement()), request.getLatestUpdate());++ Set<FileProtection> checkedFileProtections = new HashSet<>();+ for (int i=request.getSortedUpdates().size()-1; i>=0; i--) {+ if (checkedFileProtections.containsAll(branchProtection.getFileProtections()))+ break;+ PullRequestUpdate update = request.getSortedUpdates().get(i);+ for (String file: update.getChangedFiles()) {+ FileProtection fileProtection = branchProtection.getFileProtection(file);+ if (fileProtection != null+ && !checkedFileProtections.contains(fileProtection)) {+ checkedFileProtections.add(fileProtection);+ checkReviews(ReviewRequirement.fromString(fileProtection.getReviewRequirement()), update);+ }+ }+ }+ }++ checkBuilds(request);++ ProjectFacade project = request.getTargetProject().getFacade();+ Permission writeCode = new ProjectPermission(project, ProjectPrivilege.CODE_WRITE);+ if (request.getSubmitter() == null || !request.getSubmitter().asSubject().isPermitted(writeCode)) {+ Collection<User> writers = new ArrayList<>();+ for (UserFacade facade: SecurityUtils.getAuthorizedUsers(project, ProjectPrivilege.CODE_WRITE))+ writers.add(userManager.load(facade.getId()));+ checkReviews(writers, 1, request.getLatestUpdate());+ }+ }++ private void checkBuilds(PullRequest request) {+ Collection<PullRequestBuild> prevRequirements = new ArrayList<>(request.getPullRequestBuilds());+ request.getPullRequestBuilds().clear();+ MergePreview preview = request.getMergePreview();+ if (preview != null && preview.getMerged() != null) {+ Project project = request.getTargetProject();+ ObjectId commitId = ObjectId.fromString(preview.getMerged());+ CISpec ciSpec = project.getCISpec(commitId);+ if (ciSpec == null)+ throw new OneException("No CI spec defined in merge preview commit");+ for (Job job: ciSpec.getJobs()) {+ for (JobTrigger trigger: job.getTriggers()) {+ if (trigger instanceof BranchUpdateTrigger) {+ BranchUpdateTrigger branchUpdateTrigger = (BranchUpdateTrigger) trigger;+ if (branchUpdateTrigger.isRejectIfNotSuccessful()) {+ RefUpdated updated = new RefUpdated(project, GitUtils.branch2ref(request.getTargetBranch()),+ request.getTarget().getObjectId(), commitId);+ if (branchUpdateTrigger.matches(updated, job)) {+ new MatrixRunner<List<String>>(JobParam.getParamMatrix(trigger.getParams())) {++ @Override+ public void run(Map<String, List<String>> paramMap) {+ Build build = jobManager.submit(request.getTargetProject(),+ commitId, job.getName(), paramMap, null);+ PullRequestBuild pullRequestBuild = null;+ for (PullRequestBuild prevRequirement: prevRequirements) {+ if (prevRequirement.getBuild().equals(build)) {+ pullRequestBuild = prevRequirement;+ break;+ }+ }+ if (pullRequestBuild == null) {+ pullRequestBuild = new PullRequestBuild();+ pullRequestBuild.setRequest(request);+ pullRequestBuild.setBuild(build);+ }+ request.getPullRequestBuilds().add(pullRequestBuild);+ }++ }.run();+ }+ }+ }+ }+ }+ }+ }++ private void checkReviews(ReviewRequirement reviewRequirement, PullRequestUpdate update) {+ PullRequest request = update.getRequest();++ for (User user: reviewRequirement.getUsers()) {+ if (!user.equals(request.getSubmitter())) {+ PullRequestReview review = request.getReview(user);+ if (review == null) {+ review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ request.getReviews().add(review);+ } else if (review.getExcludeDate() != null) {+ review.setExcludeDate(null);+ } else if (review.getUpdate() == null || review.getUpdate().getId()<update.getId()) {+ review.setResult(null);+ }+ }+ }++ for (Map.Entry<Group, Integer> entry: reviewRequirement.getGroups().entrySet()) {+ Group group = entry.getKey();+ int requiredCount = entry.getValue();+ checkReviews(group.getMembers(), requiredCount, update);+ }+ }++ private void checkReviews(Collection<User> users, int requiredCount, PullRequestUpdate update) {+ PullRequest request = update.getRequest();++ if (requiredCount == 0)+ requiredCount = users.size();++ int effectiveCount = 0;+ Set<User> potentialReviewers = new HashSet<>();+ for (User user: users) {+ if (user.equals(request.getSubmitter())) {+ effectiveCount++;+ } else {+ PullRequestReview review = request.getReview(user);+ if (review != null && review.getExcludeDate() == null) {+ if (review.getResult() == null)+ requiredCount--;+ else if (review.getUpdate() != null && review.getUpdate().getId()>=update.getId())+ effectiveCount++;+ else+ potentialReviewers.add(user);+ } else {+ potentialReviewers.add(user);+ }+ }+ if (effectiveCount >= requiredCount)+ break;+ }++ int missingCount = requiredCount - effectiveCount;+ Set<User> reviewers = new HashSet<>();++ List<User> candidateReviewers = new ArrayList<>();+ for (User user: potentialReviewers) {+ PullRequestReview review = request.getReview(user);+ if (review != null && review.getExcludeDate() == null)+ candidateReviewers.add(user);+ }++ sortByContributions(candidateReviewers, update);++ for (User user: candidateReviewers) {+ reviewers.add(user);+ request.getReview(user).setResult(null);+ if (reviewers.size() == missingCount)+ break;+ }++ if (reviewers.size() < missingCount) {+ candidateReviewers = new ArrayList<>();+ for (User user: potentialReviewers) {+ PullRequestReview review = request.getReview(user);+ if (review == null)+ candidateReviewers.add(user);+ }+ sortByContributions(candidateReviewers, update);+ for (User user: candidateReviewers) {+ reviewers.add(user);+ PullRequestReview review = new PullRequestReview();+ review.setRequest(request);+ review.setUser(user);+ request.getReviews().add(review);+ if (reviewers.size() == missingCount)+ break;+ }+ }++ if (reviewers.size() < missingCount) {+ List<PullRequestReview> excludedReviews = new ArrayList<>();+ for (User user: potentialReviewers) {+ PullRequestReview review = request.getReview(user);+ if (review != null && review.getExcludeDate() != null)+ excludedReviews.add(review);+ }+ excludedReviews.sort(Comparator.comparing(PullRequestReview::getExcludeDate));++ for (PullRequestReview review: excludedReviews) {+ reviewers.add(review.getUser());+ review.setExcludeDate(null);+ if (reviewers.size() == missingCount)+ break;+ }+ }+ if (reviewers.size() < missingCount) {+ String errorMessage = String.format("Impossible to provide required number of reviewers "+ + "(candidates: %s, required number of reviewers: %d, pull request: #%d)",+ reviewers, missingCount, update.getRequest().getNumber());+ throw new OneException(errorMessage);+ }+ }++ private void sortByContributions(List<User> users, PullRequestUpdate update) {+ if (users.size() <= 1)+ return;++ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);+ Map<User, Long> contributions = new HashMap<>();+ for (User user: users)+ contributions.put(user, 0L);++ int count = 0;+ for (FileChange change: update.getFileChanges()) {+ String path = change.getPath();+ int edits = change.getAdditions() + change.getDeletions();+ if (edits < 0)+ edits = 100;+ else if (edits == 0)+ edits = 1;+ int addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);+ while (addedContributions == 0) {+ if (path.contains("/")) {+ path = StringUtils.substringBeforeLast(path, "/");+ addedContributions = addContributions(contributions, commitInfoManager, path, edits, update);+ } else {+ addContributions(contributions, commitInfoManager, "", edits, update);+ break;+ }+ }+ if (++count >= MAX_CONTRIBUTION_FILES)+ break;+ }++ Collections.sort(users, new Comparator<User>() {++ @Override+ public int compare(User o1, User o2) {+ if (contributions.get(o1) < contributions.get(o2))+ return 1;+ else+ return -1;+ }++ });+ }++ private int addContributions(Map<User, Long> contributions, CommitInfoManager commitInfoManager,+ String path, int edits, PullRequestUpdate update) {+ int addedContributions = 0;+ for (Map.Entry<User, Long> entry: contributions.entrySet()) {+ User user = entry.getKey();+ int pathEdits = commitInfoManager.getEdits(+ update.getRequest().getTargetProject().getFacade(), user.getFacade(), path);+ entry.setValue(entry.getValue() + edits*pathEdits);+ addedContributions += pathEdits;+ }+ return addedContributions;+ }++ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,+ Project targetProject, User user, Root<PullRequest> root, CriteriaBuilder builder) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(builder.equal(root.get("targetProject"), targetProject));+ if (criteria != null)+ predicates.add(criteria.getPredicate(targetProject, root, builder, user));+ return predicates.toArray(new Predicate[0]);+ }++ private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject, User user,+ EntityQuery<PullRequest> requestQuery) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);+ Root<PullRequest> root = query.from(PullRequest.class);+ query.select(root).distinct(true);++ query.where(getPredicates(requestQuery.getCriteria(), targetProject, user, root, builder));++ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (EntitySort sort: requestQuery.getSorts()) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));+ else+ orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequestConstants.ORDER_FIELDS.get(sort.getField()))));+ }++ if (orders.isEmpty())+ orders.add(builder.desc(root.get("number")));+ query.orderBy(orders);++ return query;+ }++ @Sessional+ @Override+ public List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {+ CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);+ Query<PullRequest> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);+ return query.getResultList();+ }++ @Sessional+ @Override+ public int count(Project targetProject, User user, io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);++ criteriaQuery.where(getPredicates(requestCriteria, targetProject, user, root, builder));++ criteriaQuery.select(builder.countDistinct(root));+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();+ }++ @Sessional+ @Override+ public PullRequest findOpen(ProjectAndBranch target, ProjectAndBranch source) {+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ criteria.add(ofTarget(target)).add(ofSource(source)).add(ofOpen());+ return 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.setHeadCommitHash(request.getHeadCommitHash());+ update.setMergeBaseCommitHash(request.getBaseCommitHash());+ request.setMergeStrategy(mergeStrategy);+ open(request);++ return request;+ } else {+ throw new OneException("No merge base found");+ }+ }++ @Sessional+ @Override+ public PullRequest find(Project targetProject, long number) {+ EntityCriteria<PullRequest> criteria = newCriteria();+ criteria.add(Restrictions.eq("targetProject", targetProject));+ criteria.add(Restrictions.eq("number", number));+ return find(criteria);+ }++ @Sessional+ @Override+ public List<PullRequest> query(Project targetProject, String term, int count) {+ List<PullRequest> requests = new ArrayList<>();++ EntityCriteria<PullRequest> criteria = newCriteria();++ if (StringUtils.isNotBlank(term)) {+ if (term.startsWith("#")) {+ term = term.substring(1);+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", "#" + term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", "#" + term, MatchMode.ANYWHERE)));+ }+ } else {+ try {+ long buildNumber = Long.parseLong(term);+ criteria.add(Restrictions.eq("number", buildNumber));+ } catch (NumberFormatException e) {+ criteria.add(Restrictions.or(+ Restrictions.ilike("title", term, MatchMode.ANYWHERE),+ Restrictions.ilike("noSpaceTitle", term, MatchMode.ANYWHERE)));+ }+ }+ }++ criteria.addOrder(Order.desc("number"));+ requests.addAll(query(criteria, 0, count));++ return requests;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/git/GitUtils.java b/server-core/src/main/java/io/onedev/server/git/GitUtils.javaindex c4be5ea645..175ee7f4c5 100644--- a/server-core/src/main/java/io/onedev/server/git/GitUtils.java+++ b/server-core/src/main/java/io/onedev/server/git/GitUtils.java@@ -1,566 +1,542 @@-package io.onedev.server.git;--import java.io.File;-import java.io.IOException;-import java.util.ArrayList;-import java.util.Collection;-import java.util.Collections;-import java.util.Date;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.concurrent.Callable;--import javax.annotation.Nullable;--import org.eclipse.jgit.diff.DiffEntry;-import org.eclipse.jgit.diff.DiffEntry.ChangeType;-import org.eclipse.jgit.diff.DiffFormatter;-import org.eclipse.jgit.diff.RawTextComparator;-import org.eclipse.jgit.errors.AmbiguousObjectException;-import org.eclipse.jgit.errors.IncorrectObjectTypeException;-import org.eclipse.jgit.errors.MissingObjectException;-import org.eclipse.jgit.errors.RevisionSyntaxException;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.CommitBuilder;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectInserter;-import org.eclipse.jgit.lib.ObjectReader;-import org.eclipse.jgit.lib.PersonIdent;-import org.eclipse.jgit.lib.RefUpdate;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.merge.MergeStrategy;-import org.eclipse.jgit.merge.Merger;-import org.eclipse.jgit.merge.ResolveMerger;-import org.eclipse.jgit.revwalk.RevCommit;-import org.eclipse.jgit.revwalk.RevObject;-import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.revwalk.RevWalkUtils;-import org.eclipse.jgit.revwalk.filter.RevFilter;-import org.eclipse.jgit.treewalk.CanonicalTreeParser;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.eclipse.jgit.treewalk.filter.TreeFilter;-import org.eclipse.jgit.util.SystemReader;-import org.eclipse.jgit.util.io.NullOutputStream;--import com.google.common.base.Joiner;-import com.google.common.base.Objects;-import com.google.common.base.Preconditions;-import com.google.common.base.Splitter;-import com.google.common.base.Strings;-import com.google.common.collect.Iterables;--import io.onedev.commons.utils.LockUtils;-import io.onedev.commons.utils.PathUtils;-import io.onedev.server.git.command.FetchCommand;-import io.onedev.server.git.command.IsAncestorCommand;-import io.onedev.server.git.exception.ObsoleteCommitException;-import io.onedev.server.git.exception.RefUpdateException;-import io.onedev.server.util.diff.WhitespaceOption;--public class GitUtils {-- public static final int SHORT_SHA_LENGTH = 8;-- public static boolean isEmptyPath(String path) {- return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);- }-- public static String abbreviateSHA(String sha, int length) {- Preconditions.checkArgument(ObjectId.isId(sha));- return sha.substring(0, length);- }-- public static String abbreviateSHA(String sha) {- return abbreviateSHA(sha, SHORT_SHA_LENGTH);- }-- public static List<DiffEntry> diff(Repository repository, AnyObjectId oldRevId, AnyObjectId newRevId) {- List<DiffEntry> diffs = new ArrayList<>();- try ( DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);- RevWalk revWalk = new RevWalk(repository);- ObjectReader reader = repository.newObjectReader();) {- diffFormatter.setRepository(repository);- diffFormatter.setDetectRenames(true);- diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);-- CanonicalTreeParser oldTreeParser = new CanonicalTreeParser();- if (!oldRevId.equals(ObjectId.zeroId()))- oldTreeParser.reset(reader, revWalk.parseCommit(oldRevId).getTree());-- CanonicalTreeParser newTreeParser = new CanonicalTreeParser();- if (!newRevId.equals(ObjectId.zeroId()))- newTreeParser.reset(reader, revWalk.parseCommit(newRevId).getTree());-- for (DiffEntry entry: diffFormatter.scan(oldTreeParser, newTreeParser)) {- if (!Objects.equal(entry.getOldPath(), entry.getNewPath())- || !Objects.equal(entry.getOldMode(), entry.getNewMode())- || entry.getOldId()==null || !entry.getOldId().isComplete()- || entry.getNewId()== null || !entry.getNewId().isComplete()- || !entry.getOldId().equals(entry.getNewId())) {- diffs.add(entry);- }- }- } catch (IOException e) {- throw new RuntimeException(e);- }- return diffs;- }-- @Nullable- public static String getDetailMessage(RevCommit commit) {- int start = 0;- String fullMessage = commit.getFullMessage();- while (true) {- int index = fullMessage.indexOf('\n', start);- if (index == -1)- return null;- start = index+1;- int nextIndex = fullMessage.indexOf('\n', start);- if (nextIndex == -1)- return null;- start = nextIndex+1;- if (fullMessage.substring(index, nextIndex).trim().length() == 0) {- String detailMessage = fullMessage.substring(start).trim();- return detailMessage.length()!=0?detailMessage:null;- }- }- }-- public static String getBlobTypeName(int blobType) {- if (blobType == FileMode.TYPE_FILE)- return "File";- else if (blobType == FileMode.TYPE_GITLINK)- return "Sub module";- else if (blobType == FileMode.TYPE_SYMLINK)- return "Symbol link";- else- return "Folder";- }-- public static PersonIdent newPersonIdent(String name, String email, Date when) {- return new PersonIdent(name, email, when.getTime(),- SystemReader.getInstance().getTimezone(when.getTime()));- }-- /**- * Parse the original git raw date to Java date. The raw git date is in- * unix timestamp with timezone like:- * 1392312299 -0800- *- * @param input the input raw date string- * @return Java date- */- public static Date parseRawDate(String input) {- String[] pieces = Iterables.toArray(Splitter.on(" ").split(input), String.class);- return new Date(Long.valueOf(pieces[0]) * 1000L);- }-- /**- * Parse the raw user information into PersonIdent object, the raw information- * should be in format <code>[name] [<email>] [epoch timezone]</code>, for- * example:- *- * Jacob Thornton <[email protected]> 1328060294 -0800- *- * @param raw- * @return- */- public static @Nullable PersonIdent parsePersonIdent(String raw) {- if (Strings.isNullOrEmpty(raw))- return null;-- int pos1 = raw.indexOf('<');- if (pos1 <= 0)- throw new IllegalArgumentException("Raw " + raw);-- String name = raw.substring(0, pos1 - 1);-- int pos2 = raw.indexOf('>');- if (pos2 <= 0)- throw new IllegalArgumentException("Raw " + raw);-- String time = raw.substring(pos2 + 1).trim();- Date when = parseRawDate(time);-- String email = raw.substring(pos1 + 1, pos2 - 1);-- return newPersonIdent(name, email, when);- }-- public static int comparePath(@Nullable String path1, @Nullable String path2) {- List<String> segments1 = splitPath(path1);- List<String> segments2 = splitPath(path2);-- int index = 0;- for (String segment1: segments1) {- if (index<segments2.size()) {- int result = segment1.compareTo(segments2.get(index));- if (result != 0)- return result;- } else {- return 1;- }- index++;- }- if (index<segments2.size())- return -1;- else- return 0;- }-- public static List<String> splitPath(@Nullable String path) {- List<String> pathSegments;- if (path != null)- pathSegments = Splitter.on("/").omitEmptyStrings().splitToList(path);- else- pathSegments = new ArrayList<>();- return pathSegments;- }-- public static @Nullable String normalizePath(@Nullable String path) {- List<String> pathSegments = splitPath(PathUtils.normalizeDots(path));- if (!pathSegments.isEmpty())- return Joiner.on("/").join(pathSegments);- else- return null;- }-- /**- * Convert a git reference name to branch name.- *- * @param refName- * name of the git reference- * @return- * name of the branch, or <tt>null</tt> if specified ref- * does not represent a branch- */- public static @Nullable String ref2branch(String refName) {- if (refName.startsWith(Constants.R_HEADS))- return refName.substring(Constants.R_HEADS.length());- else- return null;- }-- public static String branch2ref(String branch) {- return Constants.R_HEADS + branch;- }-- /**- * Convert a git reference name to tag name.- *- * @param refName- * name of the git reference- * @return- * name of the tag, or <tt>null</tt> if specified ref- * does not represent a tag- */- public static @Nullable String ref2tag(String refName) {- if (refName.startsWith(Constants.R_TAGS))- return refName.substring(Constants.R_TAGS.length());- else- return null;- }-- public static String tag2ref(String tag) {- return Constants.R_TAGS + tag;- }-- public static BlobIdent getOldBlobIdent(DiffEntry diffEntry, String oldRev) {- BlobIdent blobIdent;- if (diffEntry.getChangeType() != ChangeType.ADD) {- blobIdent = new BlobIdent(oldRev, diffEntry.getOldPath(), diffEntry.getOldMode().getBits());- } else {- blobIdent = new BlobIdent(oldRev, null, null);- }- return blobIdent;- }-- public static BlobIdent getNewBlobIdent(DiffEntry diffEntry, String newRev) {- BlobIdent blobIdent;- if (diffEntry.getChangeType() != ChangeType.DELETE) {- blobIdent = new BlobIdent(newRev, diffEntry.getNewPath(), diffEntry.getNewMode().getBits());- } else {- blobIdent = new BlobIdent(newRev, null, null);- }- return blobIdent;- }-- /**- * @return- * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this- * case, these two commits can not be merged- */- @Nullable- public static ObjectId getMergeBase(Repository repository, ObjectId commit1, ObjectId commit2) {- try (RevWalk revWalk = new RevWalk(repository)) {- revWalk.setRevFilter(RevFilter.MERGE_BASE);-- revWalk.markStart(revWalk.parseCommit(commit1));- revWalk.markStart(revWalk.parseCommit(commit2));- RevCommit mergeBase = revWalk.next();- return mergeBase!=null?mergeBase.copy():null;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- /**- * @return- * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this- * case, these two commits can not be merged- */- @Nullable- public static ObjectId getMergeBase(Repository repository1, ObjectId commit1,- Repository repository2, ObjectId commit2, @Nullable String fetchRef) {- if (repository1.getDirectory() == null || !repository1.getDirectory().equals(repository2.getDirectory())) {- fetch(repository2, commit2, repository1, fetchRef);- }- return GitUtils.getMergeBase(repository1, commit1, commit2);- }-- public static void fetch(Repository fromRepository, ObjectId fromCommit, Repository toRepository,- @Nullable String fetchRef) {- if (fetchRef != null) {- new FetchCommand(toRepository.getDirectory())- .from(fromRepository.getDirectory().getAbsolutePath())- .refspec(fetchRef)- .call();- } else {- LockUtils.call("repository-fetch:" + fromRepository.getDirectory(), new Callable<Void>() {-- @Override- public Void call() throws Exception {- try {- RefUpdate refUpdate = fromRepository.updateRef("refs/temp/fetch");- refUpdate.setNewObjectId(fromCommit);- updateRef(refUpdate);- new FetchCommand(toRepository.getDirectory())- .from(fromRepository.getDirectory().getAbsolutePath())- .refspec(refUpdate.getName())- .call();- } catch (IOException e) {- throw new RuntimeException(e);- }- return null;- }-- });- }- }-- public static boolean isMergedInto(Repository repository, @Nullable Map<String, String> gitEnvs,- ObjectId base, ObjectId tip) {- if (gitEnvs != null && !gitEnvs.isEmpty()) {- IsAncestorCommand cmd = new IsAncestorCommand(repository.getDirectory(), gitEnvs);- cmd.ancestor(base.name()).descendant(tip.name());- return cmd.call();- } else {- try (RevWalk revWalk = new RevWalk(repository)) {- RevCommit baseCommit;- try {- baseCommit = revWalk.parseCommit(base);- } catch (MissingObjectException e) {- return false;- }- return revWalk.isMergedInto(baseCommit, revWalk.parseCommit(tip));- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }-- /**- * Get commit of specified revision id.- *- * @param revWalk- * @param revId- * @return- * <tt>null</tt> if specified id does not exist or does not- * represent a commit- */- @Nullable- public static RevCommit parseCommit(RevWalk revWalk, ObjectId revId) {- RevObject peeled;- try {- peeled = revWalk.peel(revWalk.parseAny(revId));- if (peeled instanceof RevCommit)- return (RevCommit) peeled;- else- return null;- } catch (MissingObjectException e) {- return null;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @Nullable- public static ObjectId resolve(Repository repository, String revision) {- try {- return repository.resolve(revision);- } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {- return null;- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @Nullable- public static ObjectId rebase(Repository repository, ObjectId source, ObjectId target, PersonIdent committer) {- try ( RevWalk revWalk = new RevWalk(repository);- ObjectInserter inserter = repository.newObjectInserter();) {- RevCommit sourceCommit = revWalk.parseCommit(source);- RevCommit targetCommit = revWalk.parseCommit(target);- revWalk.setRevFilter(RevFilter.NO_MERGES);- List<RevCommit> commits = RevWalkUtils.find(revWalk, sourceCommit, targetCommit);- Collections.reverse(commits);- RevCommit headCommit = targetCommit;- for (RevCommit commit: commits) {- ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);- merger.setBase(commit.getParent(0));- if (merger.merge(headCommit, commit)) {- if (!headCommit.getTree().getId().equals(merger.getResultTreeId())) {- CommitBuilder newCommit = new CommitBuilder();- newCommit.setAuthor(commit.getAuthorIdent());- newCommit.setCommitter(committer);- newCommit.setParentId(headCommit);- newCommit.setMessage(commit.getFullMessage());- newCommit.setTreeId(merger.getResultTreeId());- headCommit = revWalk.parseCommit(inserter.insert(newCommit));- }- } else {- return null;- }- }- inserter.flush();- return headCommit.copy();- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @Nullable- public static ObjectId merge(Repository repository, ObjectId source, ObjectId target,- boolean squash, PersonIdent committer, PersonIdent author, String commitMessage) {- try ( RevWalk revWalk = new RevWalk(repository);- ObjectInserter inserter = repository.newObjectInserter();) {- RevCommit sourceCommit = revWalk.parseCommit(source);- RevCommit targetCommit = revWalk.parseCommit(target);- Merger merger = MergeStrategy.RECURSIVE.newMerger(repository, true);- if (merger.merge(targetCommit, sourceCommit)) {- CommitBuilder mergedCommit = new CommitBuilder();- mergedCommit.setAuthor(author);- mergedCommit.setCommitter(committer);- if (squash)- mergedCommit.setParentId(targetCommit);- else- mergedCommit.setParentIds(targetCommit, sourceCommit);- mergedCommit.setMessage(commitMessage);- mergedCommit.setTreeId(merger.getResultTreeId());- ObjectId mergedCommitId = inserter.insert(mergedCommit);- inserter.flush();- return mergedCommitId;- } else {- return null;- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public static Collection<String> getChangedFiles(Repository repository, ObjectId oldCommitId, ObjectId newCommitId) {- Collection<String> changedFiles = new HashSet<>();- try ( RevWalk revWalk = new RevWalk(repository);- TreeWalk treeWalk = new TreeWalk(repository)) {- treeWalk.setFilter(TreeFilter.ANY_DIFF);- treeWalk.setRecursive(true);- RevCommit oldCommit = revWalk.parseCommit(oldCommitId);- RevCommit newCommit = revWalk.parseCommit(newCommitId);- treeWalk.addTree(oldCommit.getTree());- treeWalk.addTree(newCommit.getTree());- while (treeWalk.next()) {- changedFiles.add(treeWalk.getPathString());- }- } catch (IOException e) {- throw new RuntimeException(e);- }- return changedFiles;- }-- public static boolean isValid(File gitDir) {- return new File(gitDir, "objects").exists();- }-- public static RefUpdate getRefUpdate(Repository repository, String refName) {- try {- return repository.updateRef(refName);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public static void updateRef(RefUpdate refUpdate) {- try {- RefUpdate.Result result = refUpdate.forceUpdate();- if (result == RefUpdate.Result.LOCK_FAILURE- && refUpdate.getExpectedOldObjectId() != null- && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {- throw new ObsoleteCommitException(refUpdate.getOldObjectId());- } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED- && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {- throw new RefUpdateException(result);- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public static void deleteRef(RefUpdate refUpdate) {- try {- refUpdate.setForceUpdate(true);- RefUpdate.Result result = refUpdate.delete();- if (result == RefUpdate.Result.LOCK_FAILURE- && refUpdate.getExpectedOldObjectId() != null- && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {- throw new ObsoleteCommitException(refUpdate.getOldObjectId());- } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED- && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {- throw new RefUpdateException(result);- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public static void linkRef(RefUpdate refUpdate, String target) {- try {- RefUpdate.Result result = refUpdate.link(target);- if (result != RefUpdate.Result.FORCED && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE)- throw new RefUpdateException(result);- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- public static List<String> readLines(Repository repository, RevCommit commit, String path,- WhitespaceOption whitespaceOption) {- try {- TreeWalk treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, path, commit.getTree()));- ObjectId blobId = treeWalk.getObjectId(0);- ObjectReader objectReader = treeWalk.getObjectReader();- BlobIdent blobIdent = new BlobIdent(commit.name(), path, FileMode.REGULAR_FILE.getBits());- Blob blob = new Blob(blobIdent, blobId, objectReader);- List<String> normalizedLines = new ArrayList<>();- for (String line: Preconditions.checkNotNull(blob.getText()).getLines()) {- normalizedLines.add(whitespaceOption.process(line));- }- return normalizedLines;- } catch (IOException e) {- throw new RuntimeException(e);- }- }--}+package io.onedev.server.git;++import java.io.File;+import java.io.IOException;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Collections;+import java.util.Date;+import java.util.HashSet;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.eclipse.jgit.diff.DiffEntry;+import org.eclipse.jgit.diff.DiffEntry.ChangeType;+import org.eclipse.jgit.diff.DiffFormatter;+import org.eclipse.jgit.diff.RawTextComparator;+import org.eclipse.jgit.errors.AmbiguousObjectException;+import org.eclipse.jgit.errors.IncorrectObjectTypeException;+import org.eclipse.jgit.errors.MissingObjectException;+import org.eclipse.jgit.errors.RevisionSyntaxException;+import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.CommitBuilder;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectInserter;+import org.eclipse.jgit.lib.ObjectReader;+import org.eclipse.jgit.lib.PersonIdent;+import org.eclipse.jgit.lib.RefUpdate;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.merge.MergeStrategy;+import org.eclipse.jgit.merge.Merger;+import org.eclipse.jgit.merge.ResolveMerger;+import org.eclipse.jgit.revwalk.RevCommit;+import org.eclipse.jgit.revwalk.RevObject;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.revwalk.RevWalkUtils;+import org.eclipse.jgit.revwalk.filter.RevFilter;+import org.eclipse.jgit.treewalk.CanonicalTreeParser;+import org.eclipse.jgit.treewalk.TreeWalk;+import org.eclipse.jgit.treewalk.filter.TreeFilter;+import org.eclipse.jgit.util.SystemReader;+import org.eclipse.jgit.util.io.NullOutputStream;++import com.google.common.base.Joiner;+import com.google.common.base.Objects;+import com.google.common.base.Preconditions;+import com.google.common.base.Splitter;+import com.google.common.base.Strings;+import com.google.common.collect.Iterables;++import io.onedev.commons.utils.PathUtils;+import io.onedev.server.git.command.FetchCommand;+import io.onedev.server.git.command.IsAncestorCommand;+import io.onedev.server.git.exception.ObsoleteCommitException;+import io.onedev.server.git.exception.RefUpdateException;+import io.onedev.server.util.diff.WhitespaceOption;++public class GitUtils {++ public static final int SHORT_SHA_LENGTH = 8;++ public static boolean isEmptyPath(String path) {+ return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);+ }++ public static String abbreviateSHA(String sha, int length) {+ Preconditions.checkArgument(ObjectId.isId(sha));+ return sha.substring(0, length);+ }++ public static String abbreviateSHA(String sha) {+ return abbreviateSHA(sha, SHORT_SHA_LENGTH);+ }++ public static List<DiffEntry> diff(Repository repository, AnyObjectId oldRevId, AnyObjectId newRevId) {+ List<DiffEntry> diffs = new ArrayList<>();+ try ( DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);+ RevWalk revWalk = new RevWalk(repository);+ ObjectReader reader = repository.newObjectReader();) {+ diffFormatter.setRepository(repository);+ diffFormatter.setDetectRenames(true);+ diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);++ CanonicalTreeParser oldTreeParser = new CanonicalTreeParser();+ if (!oldRevId.equals(ObjectId.zeroId()))+ oldTreeParser.reset(reader, revWalk.parseCommit(oldRevId).getTree());++ CanonicalTreeParser newTreeParser = new CanonicalTreeParser();+ if (!newRevId.equals(ObjectId.zeroId()))+ newTreeParser.reset(reader, revWalk.parseCommit(newRevId).getTree());++ for (DiffEntry entry: diffFormatter.scan(oldTreeParser, newTreeParser)) {+ if (!Objects.equal(entry.getOldPath(), entry.getNewPath())+ || !Objects.equal(entry.getOldMode(), entry.getNewMode())+ || entry.getOldId()==null || !entry.getOldId().isComplete()+ || entry.getNewId()== null || !entry.getNewId().isComplete()+ || !entry.getOldId().equals(entry.getNewId())) {+ diffs.add(entry);+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return diffs;+ }++ @Nullable+ public static String getDetailMessage(RevCommit commit) {+ int start = 0;+ String fullMessage = commit.getFullMessage();+ while (true) {+ int index = fullMessage.indexOf('\n', start);+ if (index == -1)+ return null;+ start = index+1;+ int nextIndex = fullMessage.indexOf('\n', start);+ if (nextIndex == -1)+ return null;+ start = nextIndex+1;+ if (fullMessage.substring(index, nextIndex).trim().length() == 0) {+ String detailMessage = fullMessage.substring(start).trim();+ return detailMessage.length()!=0?detailMessage:null;+ }+ }+ }++ public static String getBlobTypeName(int blobType) {+ if (blobType == FileMode.TYPE_FILE)+ return "File";+ else if (blobType == FileMode.TYPE_GITLINK)+ return "Sub module";+ else if (blobType == FileMode.TYPE_SYMLINK)+ return "Symbol link";+ else+ return "Folder";+ }++ public static PersonIdent newPersonIdent(String name, String email, Date when) {+ return new PersonIdent(name, email, when.getTime(),+ SystemReader.getInstance().getTimezone(when.getTime()));+ }++ /**+ * Parse the original git raw date to Java date. The raw git date is in+ * unix timestamp with timezone like:+ * 1392312299 -0800+ *+ * @param input the input raw date string+ * @return Java date+ */+ public static Date parseRawDate(String input) {+ String[] pieces = Iterables.toArray(Splitter.on(" ").split(input), String.class);+ return new Date(Long.valueOf(pieces[0]) * 1000L);+ }++ /**+ * Parse the raw user information into PersonIdent object, the raw information+ * should be in format <code>[name] [<email>] [epoch timezone]</code>, for+ * example:+ *+ * Jacob Thornton <[email protected]> 1328060294 -0800+ *+ * @param raw+ * @return+ */+ public static @Nullable PersonIdent parsePersonIdent(String raw) {+ if (Strings.isNullOrEmpty(raw))+ return null;++ int pos1 = raw.indexOf('<');+ if (pos1 <= 0)+ throw new IllegalArgumentException("Raw " + raw);++ String name = raw.substring(0, pos1 - 1);++ int pos2 = raw.indexOf('>');+ if (pos2 <= 0)+ throw new IllegalArgumentException("Raw " + raw);++ String time = raw.substring(pos2 + 1).trim();+ Date when = parseRawDate(time);++ String email = raw.substring(pos1 + 1, pos2 - 1);++ return newPersonIdent(name, email, when);+ }++ public static int comparePath(@Nullable String path1, @Nullable String path2) {+ List<String> segments1 = splitPath(path1);+ List<String> segments2 = splitPath(path2);++ int index = 0;+ for (String segment1: segments1) {+ if (index<segments2.size()) {+ int result = segment1.compareTo(segments2.get(index));+ if (result != 0)+ return result;+ } else {+ return 1;+ }+ index++;+ }+ if (index<segments2.size())+ return -1;+ else+ return 0;+ }++ public static List<String> splitPath(@Nullable String path) {+ List<String> pathSegments;+ if (path != null)+ pathSegments = Splitter.on("/").omitEmptyStrings().splitToList(path);+ else+ pathSegments = new ArrayList<>();+ return pathSegments;+ }++ public static @Nullable String normalizePath(@Nullable String path) {+ List<String> pathSegments = splitPath(PathUtils.normalizeDots(path));+ if (!pathSegments.isEmpty())+ return Joiner.on("/").join(pathSegments);+ else+ return null;+ }++ /**+ * Convert a git reference name to branch name.+ *+ * @param refName+ * name of the git reference+ * @return+ * name of the branch, or <tt>null</tt> if specified ref+ * does not represent a branch+ */+ public static @Nullable String ref2branch(String refName) {+ if (refName.startsWith(Constants.R_HEADS))+ return refName.substring(Constants.R_HEADS.length());+ else+ return null;+ }++ public static String branch2ref(String branch) {+ return Constants.R_HEADS + branch;+ }++ /**+ * Convert a git reference name to tag name.+ *+ * @param refName+ * name of the git reference+ * @return+ * name of the tag, or <tt>null</tt> if specified ref+ * does not represent a tag+ */+ public static @Nullable String ref2tag(String refName) {+ if (refName.startsWith(Constants.R_TAGS))+ return refName.substring(Constants.R_TAGS.length());+ else+ return null;+ }++ public static String tag2ref(String tag) {+ return Constants.R_TAGS + tag;+ }++ public static BlobIdent getOldBlobIdent(DiffEntry diffEntry, String oldRev) {+ BlobIdent blobIdent;+ if (diffEntry.getChangeType() != ChangeType.ADD) {+ blobIdent = new BlobIdent(oldRev, diffEntry.getOldPath(), diffEntry.getOldMode().getBits());+ } else {+ blobIdent = new BlobIdent(oldRev, null, null);+ }+ return blobIdent;+ }++ public static BlobIdent getNewBlobIdent(DiffEntry diffEntry, String newRev) {+ BlobIdent blobIdent;+ if (diffEntry.getChangeType() != ChangeType.DELETE) {+ blobIdent = new BlobIdent(newRev, diffEntry.getNewPath(), diffEntry.getNewMode().getBits());+ } else {+ blobIdent = new BlobIdent(newRev, null, null);+ }+ return blobIdent;+ }++ /**+ * @return+ * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this+ * case, these two commits can not be merged+ */+ @Nullable+ public static ObjectId getMergeBase(Repository repository, ObjectId commit1, ObjectId commit2) {+ try (RevWalk revWalk = new RevWalk(repository)) {+ revWalk.setRevFilter(RevFilter.MERGE_BASE);++ revWalk.markStart(revWalk.parseCommit(commit1));+ revWalk.markStart(revWalk.parseCommit(commit2));+ RevCommit mergeBase = revWalk.next();+ return mergeBase!=null?mergeBase.copy():null;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ /**+ * @return+ * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this+ * case, these two commits can not be merged+ */+ @Nullable+ public static ObjectId getMergeBase(Repository repository1, ObjectId commit1,+ Repository repository2, ObjectId commit2) {+ if (repository1.getDirectory() == null+ || !repository1.getDirectory().equals(repository2.getDirectory())) {+ fetch(repository2, commit2, repository1);+ }+ return GitUtils.getMergeBase(repository1, commit1, commit2);+ }++ public static void fetch(Repository fromRepository, ObjectId fromCommit, Repository toRepository) {+ new FetchCommand(toRepository.getDirectory())+ .from(fromRepository.getDirectory().getAbsolutePath())+ .refspec(fromCommit.name())+ .call();+ }++ public static boolean isMergedInto(Repository repository, @Nullable Map<String, String> gitEnvs,+ ObjectId base, ObjectId tip) {+ if (gitEnvs != null && !gitEnvs.isEmpty()) {+ IsAncestorCommand cmd = new IsAncestorCommand(repository.getDirectory(), gitEnvs);+ cmd.ancestor(base.name()).descendant(tip.name());+ return cmd.call();+ } else {+ try (RevWalk revWalk = new RevWalk(repository)) {+ RevCommit baseCommit;+ try {+ baseCommit = revWalk.parseCommit(base);+ } catch (MissingObjectException e) {+ return false;+ }+ return revWalk.isMergedInto(baseCommit, revWalk.parseCommit(tip));+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }++ /**+ * Get commit of specified revision id.+ *+ * @param revWalk+ * @param revId+ * @return+ * <tt>null</tt> if specified id does not exist or does not+ * represent a commit+ */+ @Nullable+ public static RevCommit parseCommit(RevWalk revWalk, ObjectId revId) {+ RevObject peeled;+ try {+ peeled = revWalk.peel(revWalk.parseAny(revId));+ if (peeled instanceof RevCommit)+ return (RevCommit) peeled;+ else+ return null;+ } catch (MissingObjectException e) {+ return null;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Nullable+ public static ObjectId resolve(Repository repository, String revision) {+ try {+ return repository.resolve(revision);+ } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {+ return null;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Nullable+ public static ObjectId rebase(Repository repository, ObjectId source, ObjectId target, PersonIdent committer) {+ try ( RevWalk revWalk = new RevWalk(repository);+ ObjectInserter inserter = repository.newObjectInserter();) {+ RevCommit sourceCommit = revWalk.parseCommit(source);+ RevCommit targetCommit = revWalk.parseCommit(target);+ revWalk.setRevFilter(RevFilter.NO_MERGES);+ List<RevCommit> commits = RevWalkUtils.find(revWalk, sourceCommit, targetCommit);+ Collections.reverse(commits);+ RevCommit headCommit = targetCommit;+ for (RevCommit commit: commits) {+ ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);+ merger.setBase(commit.getParent(0));+ if (merger.merge(headCommit, commit)) {+ if (!headCommit.getTree().getId().equals(merger.getResultTreeId())) {+ CommitBuilder newCommit = new CommitBuilder();+ newCommit.setAuthor(commit.getAuthorIdent());+ newCommit.setCommitter(committer);+ newCommit.setParentId(headCommit);+ newCommit.setMessage(commit.getFullMessage());+ newCommit.setTreeId(merger.getResultTreeId());+ headCommit = revWalk.parseCommit(inserter.insert(newCommit));+ }+ } else {+ return null;+ }+ }+ inserter.flush();+ return headCommit.copy();+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Nullable+ public static ObjectId merge(Repository repository, ObjectId source, ObjectId target,+ boolean squash, PersonIdent committer, PersonIdent author, String commitMessage) {+ try ( RevWalk revWalk = new RevWalk(repository);+ ObjectInserter inserter = repository.newObjectInserter();) {+ RevCommit sourceCommit = revWalk.parseCommit(source);+ RevCommit targetCommit = revWalk.parseCommit(target);+ Merger merger = MergeStrategy.RECURSIVE.newMerger(repository, true);+ if (merger.merge(targetCommit, sourceCommit)) {+ CommitBuilder mergedCommit = new CommitBuilder();+ mergedCommit.setAuthor(author);+ mergedCommit.setCommitter(committer);+ if (squash)+ mergedCommit.setParentId(targetCommit);+ else+ mergedCommit.setParentIds(targetCommit, sourceCommit);+ mergedCommit.setMessage(commitMessage);+ mergedCommit.setTreeId(merger.getResultTreeId());+ ObjectId mergedCommitId = inserter.insert(mergedCommit);+ inserter.flush();+ return mergedCommitId;+ } else {+ return null;+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public static Collection<String> getChangedFiles(Repository repository, ObjectId oldCommitId, ObjectId newCommitId) {+ Collection<String> changedFiles = new HashSet<>();+ try ( RevWalk revWalk = new RevWalk(repository);+ TreeWalk treeWalk = new TreeWalk(repository)) {+ treeWalk.setFilter(TreeFilter.ANY_DIFF);+ treeWalk.setRecursive(true);+ RevCommit oldCommit = revWalk.parseCommit(oldCommitId);+ RevCommit newCommit = revWalk.parseCommit(newCommitId);+ treeWalk.addTree(oldCommit.getTree());+ treeWalk.addTree(newCommit.getTree());+ while (treeWalk.next()) {+ changedFiles.add(treeWalk.getPathString());+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ return changedFiles;+ }++ public static boolean isValid(File gitDir) {+ return new File(gitDir, "objects").exists();+ }++ public static RefUpdate getRefUpdate(Repository repository, String refName) {+ try {+ return repository.updateRef(refName);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public static void updateRef(RefUpdate refUpdate) {+ try {+ RefUpdate.Result result = refUpdate.forceUpdate();+ if (result == RefUpdate.Result.LOCK_FAILURE+ && refUpdate.getExpectedOldObjectId() != null+ && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {+ throw new ObsoleteCommitException(refUpdate.getOldObjectId());+ } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED+ && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {+ throw new RefUpdateException(result);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public static void deleteRef(RefUpdate refUpdate) {+ try {+ refUpdate.setForceUpdate(true);+ RefUpdate.Result result = refUpdate.delete();+ if (result == RefUpdate.Result.LOCK_FAILURE+ && refUpdate.getExpectedOldObjectId() != null+ && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {+ throw new ObsoleteCommitException(refUpdate.getOldObjectId());+ } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED+ && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {+ throw new RefUpdateException(result);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public static void linkRef(RefUpdate refUpdate, String target) {+ try {+ RefUpdate.Result result = refUpdate.link(target);+ if (result != RefUpdate.Result.FORCED && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE)+ throw new RefUpdateException(result);+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ public static List<String> readLines(Repository repository, RevCommit commit, String path,+ WhitespaceOption whitespaceOption) {+ try {+ TreeWalk treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, path, commit.getTree()));+ ObjectId blobId = treeWalk.getObjectId(0);+ ObjectReader objectReader = treeWalk.getObjectReader();+ BlobIdent blobIdent = new BlobIdent(commit.name(), path, FileMode.REGULAR_FILE.getBits());+ Blob blob = new Blob(blobIdent, blobId, objectReader);+ List<String> normalizedLines = new ArrayList<>();+ for (String line: Preconditions.checkNotNull(blob.getText()).getLines()) {+ normalizedLines.add(whitespaceOption.process(line));+ }+ return normalizedLines;+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.javaindex 689988717b..ff47c3e5f8 100644--- a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java+++ b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java@@ -1,105 +1,106 @@-package io.onedev.server.git.command;--import java.io.File;-import java.util.Map;--import javax.annotation.Nullable;--import org.apache.commons.lang3.exception.ExceptionUtils;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.command.Commandline;-import io.onedev.commons.utils.command.LineConsumer;-import io.onedev.server.git.GitVersion;-import io.onedev.server.git.config.GitConfig;--public abstract class GitCommand<V> {-- private static final Logger logger = LoggerFactory.getLogger(GitCommand.class);-- private static final String MIN_VERSION = "1.8.0";-- protected final File gitDir;-- private final Map<String, String> environments;-- public GitCommand(File gitDir, @Nullable Map<String, String> environments) {- this.gitDir = gitDir;- this.environments = environments;-- if (!gitDir.exists())- FileUtils.createDir(gitDir);- }-- public GitCommand(File gitDir) {- this(gitDir, null);- }-- /**- * Check if there are any errors with git command line.- *- * @return- * error message if failed to check git command line,- * or <tt>null</tt> otherwise- *- */- public static String checkError(String gitExe) {- try {- final String[] version = new String[]{null};-- new Commandline(gitExe).addArgs("--version").execute(new LineConsumer() {-- @Override- public void consume(String line) {- if (line.startsWith("git version "))- version[0] = line.substring("git version ".length());- }-- }, new LineConsumer() {-- @Override- public void consume(String line) {- logger.error(line);- }-- }).checkReturnCode();-- if (version[0] == null)- return "Unable to determine git version of '" + gitExe + "'";-- GitVersion gitVersion = new GitVersion(version[0]);-- if (gitVersion.isOlderThan(new GitVersion(MIN_VERSION)))- return "Version of git is " + gitVersion + ". OneDev requires at least " + MIN_VERSION;-- return null;-- } catch (Exception e) {- String message = ExceptionUtils.getMessage(e);- if (message.contains("CreateProcess error=2"))- return "Unable to find git command: " + gitExe;- else if (message.contains("error launching git"))- return "Unable to launch git command: " + gitExe;- else- return message;- }- }-- public Commandline cmd() {- String gitExe = getGitExe();- Commandline cmd = new Commandline(gitExe).workingDir(gitDir);- if (environments != null)- cmd.environments(environments);- return cmd;- }-- protected String getGitExe() {- return AppLoader.getInstance(GitConfig.class).getExecutable();- }-- public abstract V call();--}+package io.onedev.server.git.command;++import java.io.File;+import java.util.Map;++import javax.annotation.Nullable;++import org.apache.commons.lang3.exception.ExceptionUtils;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import io.onedev.commons.launcher.loader.AppLoader;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.command.Commandline;+import io.onedev.commons.utils.command.LineConsumer;+import io.onedev.server.git.GitVersion;+import io.onedev.server.git.config.GitConfig;++public abstract class GitCommand<V> {++ private static final Logger logger = LoggerFactory.getLogger(GitCommand.class);++ // requires at least 2.11.1 to use allowAnySHA1InWant+ private static final String MIN_VERSION = "2.11.1";++ protected final File gitDir;++ private final Map<String, String> environments;++ public GitCommand(File gitDir, @Nullable Map<String, String> environments) {+ this.gitDir = gitDir;+ this.environments = environments;++ if (!gitDir.exists())+ FileUtils.createDir(gitDir);+ }++ public GitCommand(File gitDir) {+ this(gitDir, null);+ }++ /**+ * Check if there are any errors with git command line.+ *+ * @return+ * error message if failed to check git command line,+ * or <tt>null</tt> otherwise+ *+ */+ public static String checkError(String gitExe) {+ try {+ final String[] version = new String[]{null};++ new Commandline(gitExe).addArgs("--version").execute(new LineConsumer() {++ @Override+ public void consume(String line) {+ if (line.startsWith("git version "))+ version[0] = line.substring("git version ".length());+ }++ }, new LineConsumer() {++ @Override+ public void consume(String line) {+ logger.error(line);+ }++ }).checkReturnCode();++ if (version[0] == null)+ return "Unable to determine git version of '" + gitExe + "'";++ GitVersion gitVersion = new GitVersion(version[0]);++ if (gitVersion.isOlderThan(new GitVersion(MIN_VERSION)))+ return "Version of git is " + gitVersion + ". OneDev requires at least " + MIN_VERSION;++ return null;++ } catch (Exception e) {+ String message = ExceptionUtils.getMessage(e);+ if (message.contains("CreateProcess error=2"))+ return "Unable to find git command: " + gitExe;+ else if (message.contains("error launching git"))+ return "Unable to launch git command: " + gitExe;+ else+ return message;+ }+ }++ public Commandline cmd() {+ String gitExe = getGitExe();+ Commandline cmd = new Commandline(gitExe).workingDir(gitDir);+ if (environments != null)+ cmd.environments(environments);+ return cmd;+ }++ protected String getGitExe() {+ return AppLoader.getInstance(GitConfig.class).getExecutable();+ }++ public abstract V call();++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.javaindex 780d8c3c12..990fd91ab2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java@@ -43,7 +43,7 @@ public class SystemSetting implements Serializable, Validatable {}@Editable(order=200, description="OneDev requires git command line to manage repositories. The minimum "- + "required version is 1.8.0.")+ + "required version is 2.11.1")@Valid@NotNull(message="may not be empty")public GitConfig getGitConfig() {diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.javaindex eadf9a7da5..e0aae6e7f9 100644--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java@@ -1,455 +1,455 @@-package io.onedev.server.search.code;--import static io.onedev.server.search.code.FieldConstants.BLOB_HASH;-import static io.onedev.server.search.code.FieldConstants.BLOB_INDEX_VERSION;-import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;-import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;-import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;-import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;-import static io.onedev.server.search.code.FieldConstants.BLOB_SYMBOL_LIST;-import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;-import static io.onedev.server.search.code.FieldConstants.COMMIT_HASH;-import static io.onedev.server.search.code.FieldConstants.COMMIT_INDEX_VERSION;-import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT;-import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_HASH;-import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_INDEX_VERSION;-import static io.onedev.server.search.code.FieldConstants.META;-import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;-import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;--import java.io.File;-import java.io.IOException;-import java.io.Serializable;-import java.nio.charset.StandardCharsets;-import java.util.Collection;-import java.util.List;-import java.util.concurrent.atomic.AtomicReference;--import javax.inject.Inject;-import javax.inject.Singleton;--import org.apache.commons.codec.digest.DigestUtils;-import org.apache.commons.lang.SerializationUtils;-import org.apache.lucene.document.BinaryDocValuesField;-import org.apache.lucene.document.Document;-import org.apache.lucene.document.Field.Store;-import org.apache.lucene.document.StoredField;-import org.apache.lucene.document.StringField;-import org.apache.lucene.document.TextField;-import org.apache.lucene.index.DirectoryReader;-import org.apache.lucene.index.IndexFormatTooOldException;-import org.apache.lucene.index.IndexReader;-import org.apache.lucene.index.IndexWriter;-import org.apache.lucene.index.IndexWriterConfig;-import org.apache.lucene.index.IndexWriterConfig.OpenMode;-import org.apache.lucene.index.LeafReaderContext;-import org.apache.lucene.search.BooleanClause.Occur;-import org.apache.lucene.search.BooleanQuery;-import org.apache.lucene.search.IndexSearcher;-import org.apache.lucene.search.SimpleCollector;-import org.apache.lucene.search.TopDocs;-import org.apache.lucene.store.Directory;-import org.apache.lucene.store.FSDirectory;-import org.apache.lucene.util.BytesRef;-import org.apache.wicket.request.cycle.RequestCycle;-import org.eclipse.jgit.lib.AnyObjectId;-import org.eclipse.jgit.lib.Constants;-import org.eclipse.jgit.lib.FileMode;-import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.lib.ObjectLoader;-import org.eclipse.jgit.lib.Repository;-import org.eclipse.jgit.revwalk.RevWalk;-import org.eclipse.jgit.treewalk.TreeWalk;-import org.eclipse.jgit.treewalk.filter.TreeFilter;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;--import com.google.common.base.Preconditions;--import io.onedev.commons.jsymbol.Symbol;-import io.onedev.commons.jsymbol.SymbolExtractor;-import io.onedev.commons.jsymbol.SymbolExtractorRegistry;-import io.onedev.commons.launcher.loader.Listen;-import io.onedev.commons.launcher.loader.ListenerRegistry;-import io.onedev.commons.utils.ExceptionUtils;-import io.onedev.commons.utils.FileUtils;-import io.onedev.commons.utils.StringUtils;-import io.onedev.commons.utils.concurrent.Prioritized;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.event.RefUpdated;-import io.onedev.server.event.system.SystemStarted;-import io.onedev.server.git.GitUtils;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.SessionManager;-import io.onedev.server.persistence.annotation.Sessional;-import io.onedev.server.storage.StorageManager;-import io.onedev.server.util.ContentDetector;-import io.onedev.server.util.IndexResult;-import io.onedev.server.util.work.BatchWorkManager;-import io.onedev.server.util.work.BatchWorker;--@Singleton-public class DefaultIndexManager implements IndexManager {-- private static final Logger logger = LoggerFactory.getLogger(DefaultIndexManager.class);-- private static final int UI_INDEXING_PRIORITY = 10;-- private static final int BACKEND_INDEXING_PRIORITY = 50;-- private static final int DATA_VERSION = 5;-- private final StorageManager storageManager;-- private final BatchWorkManager batchWorkManager;-- private final SessionManager sessionManager;-- private final ProjectManager projectManager;-- private final ListenerRegistry listenerRegistry;-- @Inject- public DefaultIndexManager(ListenerRegistry listenerRegistry, StorageManager storageManager,- BatchWorkManager batchWorkManager, SessionManager sessionManager, ProjectManager projectManager) {- this.listenerRegistry = listenerRegistry;- this.storageManager = storageManager;- this.batchWorkManager = batchWorkManager;- this.sessionManager = sessionManager;- this.projectManager = projectManager;- }-- private String getCommitIndexVersion(final IndexSearcher searcher, AnyObjectId commitId) throws IOException {- final AtomicReference<String> indexVersion = new AtomicReference<>(null);-- searcher.search(COMMIT_HASH.query(commitId.getName()), new SimpleCollector() {-- private int docBase;-- @Override- public void collect(int doc) throws IOException {- indexVersion.set(searcher.doc(docBase+doc).get(COMMIT_INDEX_VERSION.name()));- }-- @Override- protected void doSetNextReader(LeafReaderContext context) throws IOException {- docBase = context.docBase;- }-- @Override- public boolean needsScores() {- return false;- }-- });- return indexVersion.get();- }-- private IndexResult index(Repository repository, AnyObjectId commitId,- IndexWriter writer, final IndexSearcher searcher) throws Exception {- try ( RevWalk revWalk = new RevWalk(repository);- TreeWalk treeWalk = new TreeWalk(repository)) {- treeWalk.addTree(revWalk.parseCommit(commitId).getTree());- treeWalk.setRecursive(true);-- if (searcher != null) {- TopDocs topDocs = searcher.search(META.query(LAST_COMMIT.name()), 1);- if (topDocs.scoreDocs.length != 0) {- Document doc = searcher.doc(topDocs.scoreDocs[0].doc);- String lastCommitIndexVersion = doc.get(LAST_COMMIT_INDEX_VERSION.name());- if (lastCommitIndexVersion.equals(getIndexVersion())) {- String lastCommitHash = doc.get(LAST_COMMIT_HASH.name());- ObjectId lastCommitId = ObjectId.fromString(lastCommitHash);- if (repository.hasObject(lastCommitId)) {- treeWalk.addTree(revWalk.parseCommit(lastCommitId).getTree());- treeWalk.setFilter(TreeFilter.ANY_DIFF);- }- }- }- }-- int indexed = 0;- int checked = 0;- while (treeWalk.next()) {- if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_FILE- && (treeWalk.getTreeCount() == 1 || !treeWalk.idEqual(0, 1))) {- ObjectId blobId = treeWalk.getObjectId(0);- String blobPath = treeWalk.getPathString();- String blobName = treeWalk.getNameString();-- BooleanQuery.Builder builder = new BooleanQuery.Builder();- builder.add(BLOB_HASH.query(blobId.name()), Occur.MUST);- builder.add(BLOB_PATH.query(blobPath), Occur.MUST);- BooleanQuery query = builder.build();-- final AtomicReference<String> blobIndexVersionRef = new AtomicReference<>(null);- if (searcher != null) {- searcher.search(query, new SimpleCollector() {-- private LeafReaderContext context;-- @Override- public void collect(int doc) throws IOException {- blobIndexVersionRef.set(searcher.doc(context.docBase+doc).get(BLOB_INDEX_VERSION.name()));- }-- @Override- protected void doSetNextReader(LeafReaderContext context) throws IOException {- this.context = context;- }-- @Override- public boolean needsScores() {- return false;- }-- });- checked++;- }-- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);- String currentBlobIndexVersion = getIndexVersion(extractor);- String blobIndexVersion = blobIndexVersionRef.get();- if (blobIndexVersion != null) {- if (!blobIndexVersion.equals(currentBlobIndexVersion)) {- writer.deleteDocuments(query);- indexBlob(writer, repository, extractor, blobId, blobPath);- indexed++;- }- } else {- indexBlob(writer, repository, extractor, blobId, blobPath);- indexed++;- }- }- }-- // record current commit so that we know which commit has been indexed- Document document = new Document();- document.add(new StringField(COMMIT_HASH.name(), commitId.getName(), Store.NO));- document.add(new StoredField(COMMIT_INDEX_VERSION.name(), getIndexVersion()));- writer.updateDocument(COMMIT_HASH.term(commitId.getName()), document);-- // record last commit so that we only need to indexing changed files for subsequent commits- document = new Document();- document.add(new StringField(META.name(), LAST_COMMIT.name(), Store.NO));- document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), getIndexVersion()));- document.add(new StoredField(LAST_COMMIT_HASH.name(), commitId.getName()));- writer.updateDocument(META.term(LAST_COMMIT.name()), document);-- return new IndexResult(checked, indexed);- }- }-- private void indexBlob(IndexWriter writer, Repository repository,- SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {- Document document = new Document();-- document.add(new StoredField(BLOB_INDEX_VERSION.name(), getIndexVersion(extractor)));- document.add(new StringField(BLOB_HASH.name(), blobId.name(), Store.NO));- document.add(new StringField(BLOB_PATH.name(), blobPath, Store.NO));- document.add(new BinaryDocValuesField(BLOB_PATH.name(), new BytesRef(blobPath.getBytes(StandardCharsets.UTF_8))));-- String blobName = blobPath;- if (blobPath.indexOf('/') != -1)- blobName = StringUtils.substringAfterLast(blobPath, "/");-- document.add(new StringField(BLOB_NAME.name(), blobName.toLowerCase(), Store.NO));-- ObjectLoader objectLoader = repository.open(blobId);- if (objectLoader.getSize() <= MAX_INDEXABLE_SIZE) {- byte[] bytes = objectLoader.getCachedBytes();- String content = ContentDetector.convertToText(bytes, blobName);- if (content != null) {- document.add(new TextField(BLOB_TEXT.name(), content, Store.NO));-- if (extractor != null) {- List<Symbol> symbols = null;- try {- symbols = extractor.extract(blobName, StringUtils.removeBOM(content));- } catch (Exception e) {- logger.trace("Can not extract symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);- }- if (symbols != null) {- for (Symbol symbol: symbols) {- String fieldValue = symbol.getName();- if (fieldValue != null && symbol.isSearchable()) {- fieldValue = fieldValue.toLowerCase();-- String fieldName;- if (symbol.isPrimary())- fieldName = BLOB_PRIMARY_SYMBOLS.name();- else- fieldName = BLOB_SECONDARY_SYMBOLS.name();- document.add(new StringField(fieldName, fieldValue, Store.NO));- }- }- byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);- document.add(new StoredField(BLOB_SYMBOL_LIST.name(), bytesOfSymbols));- }- }- } else {- logger.debug("Ignore content of binary file '{}'.", blobPath);- }- } else {- logger.debug("Ignore content of large file '{}'.", blobPath);- }-- writer.addDocument(document);- }-- private BatchWorker getBatchWorker(Long projectId, Long forkRootId) {- return new BatchWorker("project-" + forkRootId + "-indexBlob", 1) {-- @Override- public void doWorks(Collection<Prioritized> works) {- sessionManager.run(new Runnable() {-- @Override- public void run() {- Preconditions.checkState(works.size() == 1);-- Project project = projectManager.load(projectId);- Project forkRoot = project.getForkRoot();-- ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();-- if (!forkRootId.equals(projectId) && !forkRoot.getRepository().hasObject(commitId))- GitUtils.fetch(project.getRepository(), commitId, forkRoot.getRepository(), null);- doIndex(forkRoot, commitId);-- listenerRegistry.post(new CommitIndexed(project, commitId.copy()));- }-- });- }-- };- }-- private IndexResult doIndex(Project project, ObjectId commit, Directory directory, IndexSearcher searcher) {- IndexWriterConfig writerConfig = new IndexWriterConfig(new NGramAnalyzer(NGRAM_SIZE, NGRAM_SIZE));- writerConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);- try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {- try {- logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());- IndexResult indexResult = index(project.getRepository(), commit, writer, searcher);- writer.commit();- return indexResult;- } catch (Exception e) {- writer.rollback();- throw ExceptionUtils.unchecked(e);- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- private IndexResult doIndex(Project project, ObjectId commit) {- try (Directory directory = FSDirectory.open(storageManager.getProjectIndexDir(project.getId()).toPath())) {- if (DirectoryReader.indexExists(directory)) {- try (IndexReader reader = DirectoryReader.open(directory)) {- IndexSearcher searcher = new IndexSearcher(reader);- if (getIndexVersion().equals(getCommitIndexVersion(searcher, commit)))- return new IndexResult(0, 0);- else- return doIndex(project, commit, directory, searcher);- }- } else {- return doIndex(project, commit, directory, null);- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @Override- public String getIndexVersion() {- return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion());- }-- @Override- public String getIndexVersion(SymbolExtractor<Symbol> extractor) {- String version;- if (extractor != null)- version = DATA_VERSION + ";" + extractor.getClass().getName() + ":" + extractor.getVersion();- else- version = String.valueOf(DATA_VERSION);- return DigestUtils.md5Hex(version);- }-- @Override- public boolean isIndexed(Project project, ObjectId commit) {- File indexDir = storageManager.getProjectIndexDir(project.getForkRoot().getId());- try (Directory directory = FSDirectory.open(indexDir.toPath())) {- if (DirectoryReader.indexExists(directory)) {- try (IndexReader reader = DirectoryReader.open(directory)) {- IndexSearcher searcher = new IndexSearcher(reader);- return getIndexVersion().equals(getCommitIndexVersion(searcher, commit));- }- } else {- return false;- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }-- @Sessional- @Listen- public void on(RefUpdated event) {- // only index branches at back end, tags will be indexed on demand from GUI- // as many tags might be pushed all at once when the repository is imported- if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewCommitId().equals(ObjectId.zeroId())) {- IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewCommitId());- batchWorkManager.submit(getBatchWorker(event.getProject().getId(), event.getProject().getForkRoot().getId()), work);- }- }-- @Sessional- @Listen- public void on(SystemStarted event) {- for (Project project: projectManager.query()) {- File indexDir = storageManager.getProjectIndexDir(project.getId());- if (indexDir.exists()) {- try (Directory directory = FSDirectory.open(indexDir.toPath())) {- if (DirectoryReader.indexExists(directory)) {- try (IndexReader reader = DirectoryReader.open(directory)) {- } catch (IndexFormatTooOldException e) {- FileUtils.cleanDir(indexDir);- }- }- } catch (IOException e) {- throw new RuntimeException(e);- }- }- }- }-- @Sessional- @Override- public void indexAsync(Project project, ObjectId commit) {- int priority;- if (RequestCycle.get() != null)- priority = UI_INDEXING_PRIORITY;- else- priority = BACKEND_INDEXING_PRIORITY;- IndexWork work = new IndexWork(priority, commit);- batchWorkManager.submit(getBatchWorker(project.getId(), project.getForkRoot().getId()), work);- }-- private static class IndexWork extends Prioritized {-- private final ObjectId commitId;-- public IndexWork(int priority, ObjectId commitId) {- super(priority);- this.commitId = commitId;- }-- public ObjectId getCommitId() {- return commitId;- }-- }--}+package io.onedev.server.search.code;++import static io.onedev.server.search.code.FieldConstants.BLOB_HASH;+import static io.onedev.server.search.code.FieldConstants.BLOB_INDEX_VERSION;+import static io.onedev.server.search.code.FieldConstants.BLOB_NAME;+import static io.onedev.server.search.code.FieldConstants.BLOB_PATH;+import static io.onedev.server.search.code.FieldConstants.BLOB_PRIMARY_SYMBOLS;+import static io.onedev.server.search.code.FieldConstants.BLOB_SECONDARY_SYMBOLS;+import static io.onedev.server.search.code.FieldConstants.BLOB_SYMBOL_LIST;+import static io.onedev.server.search.code.FieldConstants.BLOB_TEXT;+import static io.onedev.server.search.code.FieldConstants.COMMIT_HASH;+import static io.onedev.server.search.code.FieldConstants.COMMIT_INDEX_VERSION;+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT;+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_HASH;+import static io.onedev.server.search.code.FieldConstants.LAST_COMMIT_INDEX_VERSION;+import static io.onedev.server.search.code.FieldConstants.META;+import static io.onedev.server.search.code.IndexConstants.MAX_INDEXABLE_SIZE;+import static io.onedev.server.search.code.IndexConstants.NGRAM_SIZE;++import java.io.File;+import java.io.IOException;+import java.io.Serializable;+import java.nio.charset.StandardCharsets;+import java.util.Collection;+import java.util.List;+import java.util.concurrent.atomic.AtomicReference;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.apache.commons.codec.digest.DigestUtils;+import org.apache.commons.lang.SerializationUtils;+import org.apache.lucene.document.BinaryDocValuesField;+import org.apache.lucene.document.Document;+import org.apache.lucene.document.Field.Store;+import org.apache.lucene.document.StoredField;+import org.apache.lucene.document.StringField;+import org.apache.lucene.document.TextField;+import org.apache.lucene.index.DirectoryReader;+import org.apache.lucene.index.IndexFormatTooOldException;+import org.apache.lucene.index.IndexReader;+import org.apache.lucene.index.IndexWriter;+import org.apache.lucene.index.IndexWriterConfig;+import org.apache.lucene.index.IndexWriterConfig.OpenMode;+import org.apache.lucene.index.LeafReaderContext;+import org.apache.lucene.search.BooleanClause.Occur;+import org.apache.lucene.search.BooleanQuery;+import org.apache.lucene.search.IndexSearcher;+import org.apache.lucene.search.SimpleCollector;+import org.apache.lucene.search.TopDocs;+import org.apache.lucene.store.Directory;+import org.apache.lucene.store.FSDirectory;+import org.apache.lucene.util.BytesRef;+import org.apache.wicket.request.cycle.RequestCycle;+import org.eclipse.jgit.lib.AnyObjectId;+import org.eclipse.jgit.lib.Constants;+import org.eclipse.jgit.lib.FileMode;+import org.eclipse.jgit.lib.ObjectId;+import org.eclipse.jgit.lib.ObjectLoader;+import org.eclipse.jgit.lib.Repository;+import org.eclipse.jgit.revwalk.RevWalk;+import org.eclipse.jgit.treewalk.TreeWalk;+import org.eclipse.jgit.treewalk.filter.TreeFilter;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import com.google.common.base.Preconditions;++import io.onedev.commons.jsymbol.Symbol;+import io.onedev.commons.jsymbol.SymbolExtractor;+import io.onedev.commons.jsymbol.SymbolExtractorRegistry;+import io.onedev.commons.launcher.loader.Listen;+import io.onedev.commons.launcher.loader.ListenerRegistry;+import io.onedev.commons.utils.ExceptionUtils;+import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.concurrent.Prioritized;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.event.RefUpdated;+import io.onedev.server.event.system.SystemStarted;+import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;+import io.onedev.server.persistence.SessionManager;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.storage.StorageManager;+import io.onedev.server.util.ContentDetector;+import io.onedev.server.util.IndexResult;+import io.onedev.server.util.work.BatchWorkManager;+import io.onedev.server.util.work.BatchWorker;++@Singleton+public class DefaultIndexManager implements IndexManager {++ private static final Logger logger = LoggerFactory.getLogger(DefaultIndexManager.class);++ private static final int UI_INDEXING_PRIORITY = 10;++ private static final int BACKEND_INDEXING_PRIORITY = 50;++ private static final int DATA_VERSION = 5;++ private final StorageManager storageManager;++ private final BatchWorkManager batchWorkManager;++ private final SessionManager sessionManager;++ private final ProjectManager projectManager;++ private final ListenerRegistry listenerRegistry;++ @Inject+ public DefaultIndexManager(ListenerRegistry listenerRegistry, StorageManager storageManager,+ BatchWorkManager batchWorkManager, SessionManager sessionManager, ProjectManager projectManager) {+ this.listenerRegistry = listenerRegistry;+ this.storageManager = storageManager;+ this.batchWorkManager = batchWorkManager;+ this.sessionManager = sessionManager;+ this.projectManager = projectManager;+ }++ private String getCommitIndexVersion(final IndexSearcher searcher, AnyObjectId commitId) throws IOException {+ final AtomicReference<String> indexVersion = new AtomicReference<>(null);++ searcher.search(COMMIT_HASH.query(commitId.getName()), new SimpleCollector() {++ private int docBase;++ @Override+ public void collect(int doc) throws IOException {+ indexVersion.set(searcher.doc(docBase+doc).get(COMMIT_INDEX_VERSION.name()));+ }++ @Override+ protected void doSetNextReader(LeafReaderContext context) throws IOException {+ docBase = context.docBase;+ }++ @Override+ public boolean needsScores() {+ return false;+ }++ });+ return indexVersion.get();+ }++ private IndexResult index(Repository repository, AnyObjectId commitId,+ IndexWriter writer, final IndexSearcher searcher) throws Exception {+ try ( RevWalk revWalk = new RevWalk(repository);+ TreeWalk treeWalk = new TreeWalk(repository)) {+ treeWalk.addTree(revWalk.parseCommit(commitId).getTree());+ treeWalk.setRecursive(true);++ if (searcher != null) {+ TopDocs topDocs = searcher.search(META.query(LAST_COMMIT.name()), 1);+ if (topDocs.scoreDocs.length != 0) {+ Document doc = searcher.doc(topDocs.scoreDocs[0].doc);+ String lastCommitIndexVersion = doc.get(LAST_COMMIT_INDEX_VERSION.name());+ if (lastCommitIndexVersion.equals(getIndexVersion())) {+ String lastCommitHash = doc.get(LAST_COMMIT_HASH.name());+ ObjectId lastCommitId = ObjectId.fromString(lastCommitHash);+ if (repository.hasObject(lastCommitId)) {+ treeWalk.addTree(revWalk.parseCommit(lastCommitId).getTree());+ treeWalk.setFilter(TreeFilter.ANY_DIFF);+ }+ }+ }+ }++ int indexed = 0;+ int checked = 0;+ while (treeWalk.next()) {+ if ((treeWalk.getRawMode(0) & FileMode.TYPE_MASK) == FileMode.TYPE_FILE+ && (treeWalk.getTreeCount() == 1 || !treeWalk.idEqual(0, 1))) {+ ObjectId blobId = treeWalk.getObjectId(0);+ String blobPath = treeWalk.getPathString();+ String blobName = treeWalk.getNameString();++ BooleanQuery.Builder builder = new BooleanQuery.Builder();+ builder.add(BLOB_HASH.query(blobId.name()), Occur.MUST);+ builder.add(BLOB_PATH.query(blobPath), Occur.MUST);+ BooleanQuery query = builder.build();++ final AtomicReference<String> blobIndexVersionRef = new AtomicReference<>(null);+ if (searcher != null) {+ searcher.search(query, new SimpleCollector() {++ private LeafReaderContext context;++ @Override+ public void collect(int doc) throws IOException {+ blobIndexVersionRef.set(searcher.doc(context.docBase+doc).get(BLOB_INDEX_VERSION.name()));+ }++ @Override+ protected void doSetNextReader(LeafReaderContext context) throws IOException {+ this.context = context;+ }++ @Override+ public boolean needsScores() {+ return false;+ }++ });+ checked++;+ }++ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);+ String currentBlobIndexVersion = getIndexVersion(extractor);+ String blobIndexVersion = blobIndexVersionRef.get();+ if (blobIndexVersion != null) {+ if (!blobIndexVersion.equals(currentBlobIndexVersion)) {+ writer.deleteDocuments(query);+ indexBlob(writer, repository, extractor, blobId, blobPath);+ indexed++;+ }+ } else {+ indexBlob(writer, repository, extractor, blobId, blobPath);+ indexed++;+ }+ }+ }++ // record current commit so that we know which commit has been indexed+ Document document = new Document();+ document.add(new StringField(COMMIT_HASH.name(), commitId.getName(), Store.NO));+ document.add(new StoredField(COMMIT_INDEX_VERSION.name(), getIndexVersion()));+ writer.updateDocument(COMMIT_HASH.term(commitId.getName()), document);++ // record last commit so that we only need to indexing changed files for subsequent commits+ document = new Document();+ document.add(new StringField(META.name(), LAST_COMMIT.name(), Store.NO));+ document.add(new StoredField(LAST_COMMIT_INDEX_VERSION.name(), getIndexVersion()));+ document.add(new StoredField(LAST_COMMIT_HASH.name(), commitId.getName()));+ writer.updateDocument(META.term(LAST_COMMIT.name()), document);++ return new IndexResult(checked, indexed);+ }+ }++ private void indexBlob(IndexWriter writer, Repository repository,+ SymbolExtractor<Symbol> extractor, ObjectId blobId, String blobPath) throws IOException {+ Document document = new Document();++ document.add(new StoredField(BLOB_INDEX_VERSION.name(), getIndexVersion(extractor)));+ document.add(new StringField(BLOB_HASH.name(), blobId.name(), Store.NO));+ document.add(new StringField(BLOB_PATH.name(), blobPath, Store.NO));+ document.add(new BinaryDocValuesField(BLOB_PATH.name(), new BytesRef(blobPath.getBytes(StandardCharsets.UTF_8))));++ String blobName = blobPath;+ if (blobPath.indexOf('/') != -1)+ blobName = StringUtils.substringAfterLast(blobPath, "/");++ document.add(new StringField(BLOB_NAME.name(), blobName.toLowerCase(), Store.NO));++ ObjectLoader objectLoader = repository.open(blobId);+ if (objectLoader.getSize() <= MAX_INDEXABLE_SIZE) {+ byte[] bytes = objectLoader.getCachedBytes();+ String content = ContentDetector.convertToText(bytes, blobName);+ if (content != null) {+ document.add(new TextField(BLOB_TEXT.name(), content, Store.NO));++ if (extractor != null) {+ List<Symbol> symbols = null;+ try {+ symbols = extractor.extract(blobName, StringUtils.removeBOM(content));+ } catch (Exception e) {+ logger.trace("Can not extract symbols from blob (hash:" + blobId.name() + ", path:" + blobPath + ")", e);+ }+ if (symbols != null) {+ for (Symbol symbol: symbols) {+ String fieldValue = symbol.getName();+ if (fieldValue != null && symbol.isSearchable()) {+ fieldValue = fieldValue.toLowerCase();++ String fieldName;+ if (symbol.isPrimary())+ fieldName = BLOB_PRIMARY_SYMBOLS.name();+ else+ fieldName = BLOB_SECONDARY_SYMBOLS.name();+ document.add(new StringField(fieldName, fieldValue, Store.NO));+ }+ }+ byte[] bytesOfSymbols = SerializationUtils.serialize((Serializable) symbols);+ document.add(new StoredField(BLOB_SYMBOL_LIST.name(), bytesOfSymbols));+ }+ }+ } else {+ logger.debug("Ignore content of binary file '{}'.", blobPath);+ }+ } else {+ logger.debug("Ignore content of large file '{}'.", blobPath);+ }++ writer.addDocument(document);+ }++ private BatchWorker getBatchWorker(Long projectId, Long forkRootId) {+ return new BatchWorker("project-" + forkRootId + "-indexBlob", 1) {++ @Override+ public void doWorks(Collection<Prioritized> works) {+ sessionManager.run(new Runnable() {++ @Override+ public void run() {+ Preconditions.checkState(works.size() == 1);++ Project project = projectManager.load(projectId);+ Project forkRoot = project.getForkRoot();++ ObjectId commitId = ((IndexWork) works.iterator().next()).getCommitId();++ if (!forkRootId.equals(projectId) && !forkRoot.getRepository().hasObject(commitId))+ GitUtils.fetch(project.getRepository(), commitId, forkRoot.getRepository());+ doIndex(forkRoot, commitId);++ listenerRegistry.post(new CommitIndexed(project, commitId.copy()));+ }++ });+ }++ };+ }++ private IndexResult doIndex(Project project, ObjectId commit, Directory directory, IndexSearcher searcher) {+ IndexWriterConfig writerConfig = new IndexWriterConfig(new NGramAnalyzer(NGRAM_SIZE, NGRAM_SIZE));+ writerConfig.setOpenMode(OpenMode.CREATE_OR_APPEND);+ try (IndexWriter writer = new IndexWriter(directory, writerConfig)) {+ try {+ logger.debug("Indexing commit (project: {}, commit: {})", project.getName(), commit.getName());+ IndexResult indexResult = index(project.getRepository(), commit, writer, searcher);+ writer.commit();+ return indexResult;+ } catch (Exception e) {+ writer.rollback();+ throw ExceptionUtils.unchecked(e);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ private IndexResult doIndex(Project project, ObjectId commit) {+ try (Directory directory = FSDirectory.open(storageManager.getProjectIndexDir(project.getId()).toPath())) {+ if (DirectoryReader.indexExists(directory)) {+ try (IndexReader reader = DirectoryReader.open(directory)) {+ IndexSearcher searcher = new IndexSearcher(reader);+ if (getIndexVersion().equals(getCommitIndexVersion(searcher, commit)))+ return new IndexResult(0, 0);+ else+ return doIndex(project, commit, directory, searcher);+ }+ } else {+ return doIndex(project, commit, directory, null);+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Override+ public String getIndexVersion() {+ return DigestUtils.md5Hex(DATA_VERSION + ";" + SymbolExtractorRegistry.getVersion());+ }++ @Override+ public String getIndexVersion(SymbolExtractor<Symbol> extractor) {+ String version;+ if (extractor != null)+ version = DATA_VERSION + ";" + extractor.getClass().getName() + ":" + extractor.getVersion();+ else+ version = String.valueOf(DATA_VERSION);+ return DigestUtils.md5Hex(version);+ }++ @Override+ public boolean isIndexed(Project project, ObjectId commit) {+ File indexDir = storageManager.getProjectIndexDir(project.getForkRoot().getId());+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {+ if (DirectoryReader.indexExists(directory)) {+ try (IndexReader reader = DirectoryReader.open(directory)) {+ IndexSearcher searcher = new IndexSearcher(reader);+ return getIndexVersion().equals(getCommitIndexVersion(searcher, commit));+ }+ } else {+ return false;+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }++ @Sessional+ @Listen+ public void on(RefUpdated event) {+ // only index branches at back end, tags will be indexed on demand from GUI+ // as many tags might be pushed all at once when the repository is imported+ if (event.getRefName().startsWith(Constants.R_HEADS) && !event.getNewCommitId().equals(ObjectId.zeroId())) {+ IndexWork work = new IndexWork(BACKEND_INDEXING_PRIORITY, event.getNewCommitId());+ batchWorkManager.submit(getBatchWorker(event.getProject().getId(), event.getProject().getForkRoot().getId()), work);+ }+ }++ @Sessional+ @Listen+ public void on(SystemStarted event) {+ for (Project project: projectManager.query()) {+ File indexDir = storageManager.getProjectIndexDir(project.getId());+ if (indexDir.exists()) {+ try (Directory directory = FSDirectory.open(indexDir.toPath())) {+ if (DirectoryReader.indexExists(directory)) {+ try (IndexReader reader = DirectoryReader.open(directory)) {+ } catch (IndexFormatTooOldException e) {+ FileUtils.cleanDir(indexDir);+ }+ }+ } catch (IOException e) {+ throw new RuntimeException(e);+ }+ }+ }+ }++ @Sessional+ @Override+ public void indexAsync(Project project, ObjectId commit) {+ int priority;+ if (RequestCycle.get() != null)+ priority = UI_INDEXING_PRIORITY;+ else+ priority = BACKEND_INDEXING_PRIORITY;+ IndexWork work = new IndexWork(priority, commit);+ batchWorkManager.submit(getBatchWorker(project.getId(), project.getForkRoot().getId()), work);+ }++ private static class IndexWork extends Prioritized {++ private final ObjectId commitId;++ public IndexWork(int priority, ObjectId commitId) {+ super(priority);+ this.commitId = commitId;+ }++ public ObjectId getCommitId() {+ return commitId;+ }++ }++}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.javaindex 648da95cb0..533a82b244 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@@ -1,6 +1,5 @@package io.onedev.server.web.page.project.compare;-import java.io.IOException;import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;@@ -25,7 +24,6 @@ import org.apache.wicket.model.Model;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.lib.Ref;import com.google.common.collect.Lists;@@ -217,16 +215,9 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {};- try {- Ref ref = state.rightSide.getProject().getRepository().findRef(state.rightSide.getRevision());- String refName = ref!=null?ref.getName():null;- mergeBase = GitUtils.getMergeBase(- state.leftSide.getProject().getRepository(), leftCommitId,- state.rightSide.getProject().getRepository(), rightCommitId,- refName);- } catch (IOException e) {- throw new RuntimeException(e);- }+ mergeBase = GitUtils.getMergeBase(+ state.leftSide.getProject().getRepository(), leftCommitId,+ state.rightSide.getProject().getRepository(), rightCommitId);}@Overridediff --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 2220fed991..7835a059d2 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@@ -1,829 +1,828 @@-package io.onedev.server.web.page.project.pullrequests.create;--import java.util.ArrayList;-import java.util.Arrays;-import java.util.Collection;-import java.util.Comparator;-import java.util.Date;-import java.util.List;-import java.util.concurrent.atomic.AtomicReference;--import org.apache.commons.lang3.StringUtils;-import org.apache.wicket.Component;-import org.apache.wicket.RestartResponseAtInterceptPageException;-import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.head.CssHeaderItem;-import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Button;-import org.apache.wicket.markup.html.form.DropDownChoice;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;-import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-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.Lists;--import io.onedev.commons.utils.Pair;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.CodeCommentManager;-import io.onedev.server.entitymanager.PullRequestManager;-import io.onedev.server.git.GitUtils;-import io.onedev.server.git.RefInfo;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.PullRequestUpdate;-import io.onedev.server.model.User;-import io.onedev.server.model.support.MarkPos;-import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.model.support.pullrequest.CloseInfo;-import io.onedev.server.model.support.pullrequest.MergePreview;-import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.search.code.CommitIndexed;-import io.onedev.server.search.commit.CommitQuery;-import io.onedev.server.search.commit.Revision;-import io.onedev.server.search.commit.RevisionCriteria;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.diff.WhitespaceOption;-import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;-import io.onedev.server.web.component.branch.BranchLink;-import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;-import io.onedev.server.web.component.commit.list.CommitListPanel;-import io.onedev.server.web.component.diff.revision.CommentSupport;-import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.markdown.AttachmentSupport;-import io.onedev.server.web.component.project.comment.CommentInput;-import io.onedev.server.web.component.review.ReviewListPanel;-import io.onedev.server.web.component.tabbable.AjaxActionTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import io.onedev.server.web.page.security.LoginPage;-import io.onedev.server.web.util.ProjectAttachmentSupport;--@SuppressWarnings("serial")-public class NewPullRequestPage extends ProjectPage implements CommentSupport {-- private static final String TABS_ID = "tabs";-- private static final String TAB_PANEL_ID = "tabPanel";-- private ProjectAndBranch target;-- private ProjectAndBranch source;-- private IModel<PullRequest> requestModel;-- private Long commentId;-- private MarkPos mark;-- private String pathFilter;-- private String blameFile;-- private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;-- public static PageParameters paramsOf(Project project, ProjectAndBranch target, ProjectAndBranch source) {- PageParameters params = paramsOf(project);- params.set("target", target.toString());- params.set("source", source.toString());- return params;- }-- private String suggestSourceBranch() {- User user = getLoginUser();- List<Pair<String, Integer>> branchUpdates = new ArrayList<>();- for (RefInfo refInfo: getProject().getBranches()) {- RevCommit commit = (RevCommit) refInfo.getPeeledObj();- if (commit.getAuthorIdent().getEmailAddress().equals(user.getEmail()))- branchUpdates.add(new Pair<>(GitUtils.ref2branch(refInfo.getRef().getName()), commit.getCommitTime()));- }- branchUpdates.sort(Comparator.comparing(Pair::getSecond));- if (!branchUpdates.isEmpty())- return branchUpdates.get(branchUpdates.size()-1).getFirst();- else- return getProject().getDefaultBranch();- }-- public NewPullRequestPage(PageParameters params) {- super(params);-- User currentUser = getLoginUser();- if (currentUser == null)- throw new RestartResponseAtInterceptPageException(LoginPage.class);-- String targetParam = params.get("target").toString();- String sourceParam = params.get("source").toString();- String suggestedSourceBranch = null;- if (targetParam != null) {- target = new ProjectAndBranch(targetParam);- } else {- suggestedSourceBranch = suggestSourceBranch();- if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {- target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());- } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade())) {- target = new ProjectAndBranch(getProject().getForkedFrom(),- getProject().getForkedFrom().getDefaultBranch());- } else {- target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());- }- }-- if (sourceParam != null) {- source = new ProjectAndBranch(sourceParam);- } else {- if (suggestedSourceBranch == null)- suggestedSourceBranch = suggestSourceBranch();- source = new ProjectAndBranch(getProject(), suggestedSourceBranch);- }-- AtomicReference<PullRequest> pullRequestRef = new AtomicReference<>(null);- PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());- if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())- pullRequestRef.set(prevRequest);- else- pullRequestRef.set(OneDev.getInstance(PullRequestManager.class).findEffective(target, source));-- if (pullRequestRef.get() == null) {- ObjectId baseCommitId = GitUtils.getMergeBase(- target.getProject().getRepository(), target.getObjectId(),- source.getProject().getRepository(), source.getObjectId(),- GitUtils.branch2ref(source.getBranch()));- if (baseCommitId != null) {- PullRequest request = new PullRequest();- request.setTitle(StringUtils.capitalize(source.getBranch().replace('-', ' ').replace('_', ' ').toLowerCase()));- pullRequestRef.set(request);- request.setTarget(target);- request.setSource(source);- 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());- closeInfo.setStatus(CloseInfo.Status.MERGED);- request.setCloseInfo(closeInfo);- }-- PullRequestUpdate update = new PullRequestUpdate();- request.addUpdate(update);- update.setRequest(request);- update.setHeadCommitHash(request.getHeadCommitHash());- update.setMergeBaseCommitHash(request.getBaseCommitHash());-- OneDev.getInstance(PullRequestManager.class).checkQuality(request);-- if (request.isAllReviewsApproved())- request.setMergeStrategy(MergeStrategy.DO_NOT_MERGE);- else- request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);- }-- requestModel = new LoadableDetachableModel<PullRequest>() {-- @Override- protected PullRequest load() {- if (pullRequestRef.get() != null) {- pullRequestRef.get().setTarget(target);- pullRequestRef.get().setSource(source);- pullRequestRef.get().setSubmitter(SecurityUtils.getUser());- }- return pullRequestRef.get();- }-- };- } else {- Long requestId = pullRequestRef.get().getId();- requestModel = new LoadableDetachableModel<PullRequest>() {-- @Override- protected PullRequest load() {- return OneDev.getInstance(PullRequestManager.class).load(requestId);- }-- };- }- requestModel.setObject(pullRequestRef.get());-- }-- private PullRequest getPullRequest() {- return requestModel.getObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- setOutputMarkupId(true);-- add(new AffinalBranchPicker("target", target.getProjectId(), target.getBranch()) {-- @Override- protected void onSelect(AjaxRequestTarget target, Project project, String branch) {- PageParameters params = paramsOf(project, new ProjectAndBranch(project, branch), source);-- /*- * Use below code instead of calling setResponsePage() to make sure the dropdown is- * closed while creating the new page as otherwise clicking other places in original page- * while new page is loading will result in ComponentNotFound issue for the dropdown- * component- */- String url = RequestCycle.get().urlFor(NewPullRequestPage.class, params).toString();- target.appendJavaScript(String.format("window.location.href='%s';", url));- }-- });- PageParameters params = CommitDetailPage.paramsOf(target.getProject(), target.getObjectName());- Link<Void> targetCommitLink = new ViewStateAwarePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);- targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));- add(targetCommitLink);-- add(new AffinalBranchPicker("source", source.getProjectId(), source.getBranch()) {-- @Override- protected void onSelect(AjaxRequestTarget target, Project project, String branch) {- PageParameters params = paramsOf(getProject(), NewPullRequestPage.this.target,- new ProjectAndBranch(project, branch));-- // Refer to comments in target branch picker for not using setResponsePage- String url = RequestCycle.get().urlFor(NewPullRequestPage.class, params).toString();- target.appendJavaScript(String.format("window.location.href='%s';", url));- }-- });- params = CommitDetailPage.paramsOf(source.getProject(), source.getObjectName());- Link<Void> sourceCommitLink = new ViewStateAwarePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);- sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));- add(sourceCommitLink);-- add(new Link<Void>("swap") {-- @Override- public void onClick() {- PageParameters params = paramsOf(source.getProject(), source, target);- setResponsePage(NewPullRequestPage.class, params);- }-- });-- Fragment fragment;- PullRequest request = getPullRequest();- if (request == null) {- fragment = newUnrelatedHistoryFrag();- } else if (request.getId() != null && (request.isOpen() || !request.isMergeIntoTarget())) {- fragment = newEffectiveFrag();- } else if (request.getSource().equals(request.getTarget())) {- fragment = newSameBranchFrag();- } else if (request.isMerged()) {- fragment = newAcceptedFrag();- } else {- fragment = newCanSendFrag();- }- add(fragment);-- if (getPullRequest() != null) {- List<Tab> tabs = new ArrayList<>();-- tabs.add(new AjaxActionTab(Model.of("Commits")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component panel = newCommitsPanel();- getPage().replace(panel);- target.add(panel);- }-- });-- tabs.add(new AjaxActionTab(Model.of("Files")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component panel = newRevDiffPanel();- getPage().replace(panel);- target.add(panel);- }-- });-- add(new Tabbable(TABS_ID, tabs) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getPullRequest().isMerged());- }-- });-- add(newCommitsPanel());- } else {- add(new WebMarkupContainer(TABS_ID).setVisible(false));- add(new WebMarkupContainer(TAB_PANEL_ID).setVisible(false));- }- }-- private Component newCommitsPanel() {- return new CommitListPanel(TAB_PANEL_ID, getProject(), null) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getPullRequest().isMerged());- }-- @Override- protected CommitQuery getBaseQuery() {- 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));- return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));- }-- }.setOutputMarkupId(true);- }-- private RevisionDiffPanel newRevDiffPanel() {- PullRequest request = getPullRequest();-- IModel<Project> projectModel = new LoadableDetachableModel<Project>() {-- @Override- protected Project load() {- Project project = source.getProject();- project.cacheObjectId(source.getRevision(),- ObjectId.fromString(getPullRequest().getHeadCommitHash()));- return project;- }-- };-- IModel<String> blameModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return blameFile;- }-- @Override- public void setObject(String object) {- blameFile = object;- }-- };- IModel<String> pathFilterModel = new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return pathFilter;- }-- @Override- public void setObject(String object) {- pathFilter = object;- }-- };- IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {-- @Override- public void detach() {- }-- @Override- public WhitespaceOption getObject() {- return whitespaceOption;- }-- @Override- public void setObject(WhitespaceOption object) {- whitespaceOption = object;- }-- };-- /*- * we are passing source revision here instead of head commit hash of latest update- * as we want to preserve the branch name in case they are useful at some point- * later. Also it is guaranteed to be resolved to the same commit has as we've cached- * it above when loading the project- */- RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, projectModel,- new Model<PullRequest>(null), request.getBaseCommitHash(),- source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getPullRequest().isMerged());- }-- };- diffPanel.setOutputMarkupId(true);- return diffPanel;- }-- private Fragment newEffectiveFrag() {- Fragment fragment = new Fragment("status", "effectiveFrag", this);-- fragment.add(new Label("description", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- if (requestModel.getObject().isOpen())- return "<i class='fa fa-info-circle'></i> This change is already opened for merge by pull request";- else- return "<i class='fa fa-info-circle'></i> This change is squashed/rebased onto base branch via pull request";- }-- }).setEscapeModelStrings(false));-- fragment.add(new Link<Void>("link") {-- @Override- protected void onInitialize() {- super.onInitialize();- add(new Label("label", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- PullRequest request = getPullRequest();- return "#" + request.getNumber() + " - " + request.getTitle();- }-- }));- }-- @Override- public void onClick() {- PageParameters params = PullRequestDetailPage.paramsOf(getPullRequest(), null);- setResponsePage(PullRequestActivitiesPage.class, params);- }-- });-- return fragment;- }-- private Fragment newSameBranchFrag() {- return new Fragment("status", "sameBranchFrag", this);- }-- private Fragment newUnrelatedHistoryFrag() {- return new Fragment("status", "unrelatedHistoryFrag", this);- }-- private Fragment newAcceptedFrag() {- Fragment fragment = new Fragment("status", "mergedFrag", this);- fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource(), null));- fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget(), null));- fragment.add(new Link<Void>("swapBranches") {-- @Override- public void onClick() {- setResponsePage(- NewPullRequestPage.class,- paramsOf(getProject(), getPullRequest().getSource(), getPullRequest().getTarget()));- }-- });- return fragment;- }-- @Override- protected String getRobotsMeta() {- return "noindex,nofollow";- }-- private Fragment newCanSendFrag() {- Fragment fragment = new Fragment("status", "canSendFrag", this);- Form<?> form = new Form<Void>("form");- fragment.add(form);-- form.add(new Button("send") {-- @Override- public void onSubmit() {- super.onSubmit();-- Dao dao = OneDev.getInstance(Dao.class);- ProjectAndBranch target = getPullRequest().getTarget();- ProjectAndBranch source = getPullRequest().getSource();- if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName())- || !source.getObjectName().equals(getPullRequest().getSource().getObjectName())) {- getSession().warn("Either target branch or source branch has new commits just now, please re-check.");- setResponsePage(NewPullRequestPage.class, paramsOf(getProject(), target, source));- } else {- getPullRequest().setSource(source);- getPullRequest().setTarget(target);- for (PullRequestReview review: getPullRequest().getReviews())- review.setUser(dao.load(User.class, review.getUser().getId()));-- OneDev.getInstance(PullRequestManager.class).open(getPullRequest());-- setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), null));- }-- }- });-- WebMarkupContainer titleContainer = new WebMarkupContainer("title");- form.add(titleContainer);- final TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return getPullRequest().getTitle();- }-- @Override- public void setObject(String object) {- getPullRequest().setTitle(object);- }-- });- titleInput.setRequired(true).setLabel(Model.of("Title"));- titleContainer.add(titleInput);-- titleContainer.add(new FencedFeedbackPanel("feedback", titleInput));-- titleContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {-- @Override- public String getObject() {- return !titleInput.isValid()?" has-error":"";- }-- }));-- form.add(new CommentInput("comment", new IModel<String>() {-- @Override- public void detach() {- }-- @Override- public String getObject() {- return getPullRequest().getDescription();- }-- @Override- public void setObject(String object) {- getPullRequest().setDescription(object);- }-- }, false) {-- @Override- protected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID());- }-- @Override- protected Project getProject() {- return NewPullRequestPage.this.getProject();- }-- });-- form.add(newMergeStrategyContainer());-- form.add(new ReviewListPanel("reviewers", requestModel));-- return fragment;- }-- private Component newMergeStrategyContainer() {- WebMarkupContainer container = new WebMarkupContainer("mergeStrategy");-- IModel<MergeStrategy> mergeStrategyModel = new IModel<MergeStrategy>() {-- @Override- public void detach() {- }-- @Override- public MergeStrategy getObject() {- return getPullRequest().getMergeStrategy();- }-- @Override- public void setObject(MergeStrategy object) {- getPullRequest().setMergeStrategy(object);- }-- };-- List<MergeStrategy> mergeStrategies = Arrays.asList(MergeStrategy.values());- DropDownChoice<MergeStrategy> mergeStrategyDropdown =- new DropDownChoice<MergeStrategy>("select", mergeStrategyModel, mergeStrategies);-- mergeStrategyDropdown.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- Component newContainer = newMergeStrategyContainer();- container.replaceWith(newContainer);- target.add(newContainer);- }-- });-- container.add(mergeStrategyDropdown);-- container.add(new Label("help", getPullRequest().getMergeStrategy().getDescription()));-- container.add(new AjaxLazyLoadPanel("status") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);- }-- @Override- public Component getLazyLoadComponent(String componentId) {- PullRequest request = getPullRequest();- MergePreview mergePreview = new MergePreview(request.getTarget().getObjectName(),- request.getHeadCommitHash(), request.getMergeStrategy(), null);- ObjectId merged = mergePreview.getMergeStrategy().merge(request);- if (merged != null)- mergePreview.setMerged(merged.name());- request.setLastMergePreview(mergePreview);-- if (merged != null) {- Component result = new Label(componentId, "<i class=\"fa fa-check-circle\"></i> Able to merge without conflicts");- result.add(AttributeAppender.append("class", "no-conflict"));- result.setEscapeModelStrings(false);- return result;- } else {- Component result = new Label(componentId,- "<i class=\"fa fa-warning\"></i> There are merge conflicts. You can still create the pull request though");- result.add(AttributeAppender.append("class", "conflict"));- result.setEscapeModelStrings(false);- return result;- }- }-- @Override- public Component getLoadingComponent(String markupId) {- Component component = new Label(markupId, "<img src='/img/ajax-indicator-big.gif'></img> Calculating merge preview...");- component.add(AttributeAppender.append("class", "calculating"));- component.setEscapeModelStrings(false);- return component;- }-- });-- container.add(new Label("mergeWithoutReviewNote", "This pull request will be merged into target branch automatically "- + "as it is submitted by qualified user. Use strategy \"Do Not Merge\" if you want to review without "- + "merging now") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getPullRequest().isAllReviewsApproved() && getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);- }-- });-- container.setOutputMarkupId(true);-- return container;- }-- @Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- response.render(CssHeaderItem.forReference(new NewPullRequestResourceReference()));- }-- @Override- protected void onDetach() {- requestModel.detach();-- super.onDetach();- }-- @Override- public MarkPos getMark() {- return mark;- }-- @Override- public String getMarkUrl(MarkPos mark) {- 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.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;- state.whitespaceOption = whitespaceOption;- state.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();- }-- @Override- public Collection<String> getWebSocketObservables() {- Collection<String> regions = super.getWebSocketObservables();- PullRequest request = getPullRequest();- if (request != null) {- regions.add(CommitIndexed.getWebSocketObservable(request.getBaseCommit().name()));- regions.add(CommitIndexed.getWebSocketObservable(request.getHeadCommit().name()));- }- return regions;- }-- @Override- public void onMark(AjaxRequestTarget target, MarkPos mark) {- this.mark = mark;- }-- @Override- public CodeComment getOpenComment() {- if (commentId != null)- return OneDev.getInstance(CodeCommentManager.class).load(commentId);- else- return null;- }-- @Override- public void onAddComment(AjaxRequestTarget target, MarkPos mark) {- this.commentId = null;- this.mark = mark;- }-- @Override- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {- if (comment != null) {- commentId = comment.getId();- mark = comment.getMarkPos();- } else {- commentId = null;- }- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());- }-- @Override- public String getCommentUrl(CodeComment comment) {- RevisionComparePage.State state = new RevisionComparePage.State();- mark = comment.getMarkPos();- state.commentId = comment.getId();- state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());- state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());- state.pathFilter = pathFilter;- state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;- state.whitespaceOption = whitespaceOption;- state.compareWithMergeBase = false;- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();- }--}+package io.onedev.server.web.page.project.pullrequests.create;++import java.util.ArrayList;+import java.util.Arrays;+import java.util.Collection;+import java.util.Comparator;+import java.util.Date;+import java.util.List;+import java.util.concurrent.atomic.AtomicReference;++import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.RestartResponseAtInterceptPageException;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Button;+import org.apache.wicket.markup.html.form.DropDownChoice;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+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.Lists;++import io.onedev.commons.utils.Pair;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CodeCommentManager;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.PullRequestUpdate;+import io.onedev.server.model.User;+import io.onedev.server.model.support.MarkPos;+import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.search.code.CommitIndexed;+import io.onedev.server.search.commit.CommitQuery;+import io.onedev.server.search.commit.Revision;+import io.onedev.server.search.commit.RevisionCriteria;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.diff.WhitespaceOption;+import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;+import io.onedev.server.web.component.branch.BranchLink;+import io.onedev.server.web.component.branch.picker.AffinalBranchPicker;+import io.onedev.server.web.component.commit.list.CommitListPanel;+import io.onedev.server.web.component.diff.revision.CommentSupport;+import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.markdown.AttachmentSupport;+import io.onedev.server.web.component.project.comment.CommentInput;+import io.onedev.server.web.component.review.ReviewListPanel;+import io.onedev.server.web.component.tabbable.AjaxActionTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;+import io.onedev.server.web.page.security.LoginPage;+import io.onedev.server.web.util.ProjectAttachmentSupport;++@SuppressWarnings("serial")+public class NewPullRequestPage extends ProjectPage implements CommentSupport {++ private static final String TABS_ID = "tabs";++ private static final String TAB_PANEL_ID = "tabPanel";++ private ProjectAndBranch target;++ private ProjectAndBranch source;++ private IModel<PullRequest> requestModel;++ private Long commentId;++ private MarkPos mark;++ private String pathFilter;++ private String blameFile;++ private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;++ public static PageParameters paramsOf(Project project, ProjectAndBranch target, ProjectAndBranch source) {+ PageParameters params = paramsOf(project);+ params.set("target", target.toString());+ params.set("source", source.toString());+ return params;+ }++ private String suggestSourceBranch() {+ User user = getLoginUser();+ List<Pair<String, Integer>> branchUpdates = new ArrayList<>();+ for (RefInfo refInfo: getProject().getBranches()) {+ RevCommit commit = (RevCommit) refInfo.getPeeledObj();+ if (commit.getAuthorIdent().getEmailAddress().equals(user.getEmail()))+ branchUpdates.add(new Pair<>(GitUtils.ref2branch(refInfo.getRef().getName()), commit.getCommitTime()));+ }+ branchUpdates.sort(Comparator.comparing(Pair::getSecond));+ if (!branchUpdates.isEmpty())+ return branchUpdates.get(branchUpdates.size()-1).getFirst();+ else+ return getProject().getDefaultBranch();+ }++ public NewPullRequestPage(PageParameters params) {+ super(params);++ User currentUser = getLoginUser();+ if (currentUser == null)+ throw new RestartResponseAtInterceptPageException(LoginPage.class);++ String targetParam = params.get("target").toString();+ String sourceParam = params.get("source").toString();+ String suggestedSourceBranch = null;+ if (targetParam != null) {+ target = new ProjectAndBranch(targetParam);+ } else {+ suggestedSourceBranch = suggestSourceBranch();+ if (!suggestedSourceBranch.equals(getProject().getDefaultBranch())) {+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());+ } else if (getProject().getForkedFrom() != null && SecurityUtils.canReadCode(getProject().getForkedFrom().getFacade())) {+ target = new ProjectAndBranch(getProject().getForkedFrom(),+ getProject().getForkedFrom().getDefaultBranch());+ } else {+ target = new ProjectAndBranch(getProject(), getProject().getDefaultBranch());+ }+ }++ if (sourceParam != null) {+ source = new ProjectAndBranch(sourceParam);+ } else {+ if (suggestedSourceBranch == null)+ suggestedSourceBranch = suggestSourceBranch();+ source = new ProjectAndBranch(getProject(), suggestedSourceBranch);+ }++ AtomicReference<PullRequest> pullRequestRef = new AtomicReference<>(null);+ PullRequest prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser());+ if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())+ pullRequestRef.set(prevRequest);+ else+ pullRequestRef.set(OneDev.getInstance(PullRequestManager.class).findEffective(target, source));++ if (pullRequestRef.get() == null) {+ ObjectId baseCommitId = GitUtils.getMergeBase(+ target.getProject().getRepository(), target.getObjectId(),+ source.getProject().getRepository(), source.getObjectId());+ if (baseCommitId != null) {+ PullRequest request = new PullRequest();+ request.setTitle(StringUtils.capitalize(source.getBranch().replace('-', ' ').replace('_', ' ').toLowerCase()));+ pullRequestRef.set(request);+ request.setTarget(target);+ request.setSource(source);+ 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());+ closeInfo.setStatus(CloseInfo.Status.MERGED);+ request.setCloseInfo(closeInfo);+ }++ PullRequestUpdate update = new PullRequestUpdate();+ request.addUpdate(update);+ update.setRequest(request);+ update.setHeadCommitHash(request.getHeadCommitHash());+ update.setMergeBaseCommitHash(request.getBaseCommitHash());++ OneDev.getInstance(PullRequestManager.class).checkQuality(request);++ if (request.isAllReviewsApproved())+ request.setMergeStrategy(MergeStrategy.DO_NOT_MERGE);+ else+ request.setMergeStrategy(MergeStrategy.CREATE_MERGE_COMMIT);+ }++ requestModel = new LoadableDetachableModel<PullRequest>() {++ @Override+ protected PullRequest load() {+ if (pullRequestRef.get() != null) {+ pullRequestRef.get().setTarget(target);+ pullRequestRef.get().setSource(source);+ pullRequestRef.get().setSubmitter(SecurityUtils.getUser());+ }+ return pullRequestRef.get();+ }++ };+ } else {+ Long requestId = pullRequestRef.get().getId();+ requestModel = new LoadableDetachableModel<PullRequest>() {++ @Override+ protected PullRequest load() {+ return OneDev.getInstance(PullRequestManager.class).load(requestId);+ }++ };+ }+ requestModel.setObject(pullRequestRef.get());++ }++ private PullRequest getPullRequest() {+ return requestModel.getObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ setOutputMarkupId(true);++ add(new AffinalBranchPicker("target", target.getProjectId(), target.getBranch()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project, String branch) {+ PageParameters params = paramsOf(project, new ProjectAndBranch(project, branch), source);++ /*+ * Use below code instead of calling setResponsePage() to make sure the dropdown is+ * closed while creating the new page as otherwise clicking other places in original page+ * while new page is loading will result in ComponentNotFound issue for the dropdown+ * component+ */+ String url = RequestCycle.get().urlFor(NewPullRequestPage.class, params).toString();+ target.appendJavaScript(String.format("window.location.href='%s';", url));+ }++ });+ PageParameters params = CommitDetailPage.paramsOf(target.getProject(), target.getObjectName());+ Link<Void> targetCommitLink = new ViewStateAwarePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);+ targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));+ add(targetCommitLink);++ add(new AffinalBranchPicker("source", source.getProjectId(), source.getBranch()) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Project project, String branch) {+ PageParameters params = paramsOf(getProject(), NewPullRequestPage.this.target,+ new ProjectAndBranch(project, branch));++ // Refer to comments in target branch picker for not using setResponsePage+ String url = RequestCycle.get().urlFor(NewPullRequestPage.class, params).toString();+ target.appendJavaScript(String.format("window.location.href='%s';", url));+ }++ });+ params = CommitDetailPage.paramsOf(source.getProject(), source.getObjectName());+ Link<Void> sourceCommitLink = new ViewStateAwarePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);+ sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));+ add(sourceCommitLink);++ add(new Link<Void>("swap") {++ @Override+ public void onClick() {+ PageParameters params = paramsOf(source.getProject(), source, target);+ setResponsePage(NewPullRequestPage.class, params);+ }++ });++ Fragment fragment;+ PullRequest request = getPullRequest();+ if (request == null) {+ fragment = newUnrelatedHistoryFrag();+ } else if (request.getId() != null && (request.isOpen() || !request.isMergeIntoTarget())) {+ fragment = newEffectiveFrag();+ } else if (request.getSource().equals(request.getTarget())) {+ fragment = newSameBranchFrag();+ } else if (request.isMerged()) {+ fragment = newAcceptedFrag();+ } else {+ fragment = newCanSendFrag();+ }+ add(fragment);++ if (getPullRequest() != null) {+ List<Tab> tabs = new ArrayList<>();++ tabs.add(new AjaxActionTab(Model.of("Commits")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component panel = newCommitsPanel();+ getPage().replace(panel);+ target.add(panel);+ }++ });++ tabs.add(new AjaxActionTab(Model.of("Files")) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component panel = newRevDiffPanel();+ getPage().replace(panel);+ target.add(panel);+ }++ });++ add(new Tabbable(TABS_ID, tabs) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().isMerged());+ }++ });++ add(newCommitsPanel());+ } else {+ add(new WebMarkupContainer(TABS_ID).setVisible(false));+ add(new WebMarkupContainer(TAB_PANEL_ID).setVisible(false));+ }+ }++ private Component newCommitsPanel() {+ return new CommitListPanel(TAB_PANEL_ID, getProject(), null) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().isMerged());+ }++ @Override+ protected CommitQuery getBaseQuery() {+ 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));+ return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));+ }++ }.setOutputMarkupId(true);+ }++ private RevisionDiffPanel newRevDiffPanel() {+ PullRequest request = getPullRequest();++ IModel<Project> projectModel = new LoadableDetachableModel<Project>() {++ @Override+ protected Project load() {+ Project project = source.getProject();+ project.cacheObjectId(source.getRevision(),+ ObjectId.fromString(getPullRequest().getHeadCommitHash()));+ return project;+ }++ };++ IModel<String> blameModel = new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return blameFile;+ }++ @Override+ public void setObject(String object) {+ blameFile = object;+ }++ };+ IModel<String> pathFilterModel = new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return pathFilter;+ }++ @Override+ public void setObject(String object) {+ pathFilter = object;+ }++ };+ IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {++ @Override+ public void detach() {+ }++ @Override+ public WhitespaceOption getObject() {+ return whitespaceOption;+ }++ @Override+ public void setObject(WhitespaceOption object) {+ whitespaceOption = object;+ }++ };++ /*+ * we are passing source revision here instead of head commit hash of latest update+ * as we want to preserve the branch name in case they are useful at some point+ * later. Also it is guaranteed to be resolved to the same commit has as we've cached+ * it above when loading the project+ */+ RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, projectModel,+ new Model<PullRequest>(null), request.getBaseCommitHash(),+ source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getPullRequest().isMerged());+ }++ };+ diffPanel.setOutputMarkupId(true);+ return diffPanel;+ }++ private Fragment newEffectiveFrag() {+ Fragment fragment = new Fragment("status", "effectiveFrag", this);++ fragment.add(new Label("description", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ if (requestModel.getObject().isOpen())+ return "<i class='fa fa-info-circle'></i> This change is already opened for merge by pull request";+ else+ return "<i class='fa fa-info-circle'></i> This change is squashed/rebased onto base branch via pull request";+ }++ }).setEscapeModelStrings(false));++ fragment.add(new Link<Void>("link") {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Label("label", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ PullRequest request = getPullRequest();+ return "#" + request.getNumber() + " - " + request.getTitle();+ }++ }));+ }++ @Override+ public void onClick() {+ PageParameters params = PullRequestDetailPage.paramsOf(getPullRequest(), null);+ setResponsePage(PullRequestActivitiesPage.class, params);+ }++ });++ return fragment;+ }++ private Fragment newSameBranchFrag() {+ return new Fragment("status", "sameBranchFrag", this);+ }++ private Fragment newUnrelatedHistoryFrag() {+ return new Fragment("status", "unrelatedHistoryFrag", this);+ }++ private Fragment newAcceptedFrag() {+ Fragment fragment = new Fragment("status", "mergedFrag", this);+ fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource(), null));+ fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget(), null));+ fragment.add(new Link<Void>("swapBranches") {++ @Override+ public void onClick() {+ setResponsePage(+ NewPullRequestPage.class,+ paramsOf(getProject(), getPullRequest().getSource(), getPullRequest().getTarget()));+ }++ });+ return fragment;+ }++ @Override+ protected String getRobotsMeta() {+ return "noindex,nofollow";+ }++ private Fragment newCanSendFrag() {+ Fragment fragment = new Fragment("status", "canSendFrag", this);+ Form<?> form = new Form<Void>("form");+ fragment.add(form);++ form.add(new Button("send") {++ @Override+ public void onSubmit() {+ super.onSubmit();++ Dao dao = OneDev.getInstance(Dao.class);+ ProjectAndBranch target = getPullRequest().getTarget();+ ProjectAndBranch source = getPullRequest().getSource();+ if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName())+ || !source.getObjectName().equals(getPullRequest().getSource().getObjectName())) {+ getSession().warn("Either target branch or source branch has new commits just now, please re-check.");+ setResponsePage(NewPullRequestPage.class, paramsOf(getProject(), target, source));+ } else {+ getPullRequest().setSource(source);+ getPullRequest().setTarget(target);+ for (PullRequestReview review: getPullRequest().getReviews())+ review.setUser(dao.load(User.class, review.getUser().getId()));++ OneDev.getInstance(PullRequestManager.class).open(getPullRequest());++ setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), null));+ }++ }+ });++ WebMarkupContainer titleContainer = new WebMarkupContainer("title");+ form.add(titleContainer);+ final TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return getPullRequest().getTitle();+ }++ @Override+ public void setObject(String object) {+ getPullRequest().setTitle(object);+ }++ });+ titleInput.setRequired(true).setLabel(Model.of("Title"));+ titleContainer.add(titleInput);++ titleContainer.add(new FencedFeedbackPanel("feedback", titleInput));++ titleContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return !titleInput.isValid()?" has-error":"";+ }++ }));++ form.add(new CommentInput("comment", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return getPullRequest().getDescription();+ }++ @Override+ public void setObject(String object) {+ getPullRequest().setDescription(object);+ }++ }, false) {++ @Override+ protected AttachmentSupport getAttachmentSupport() {+ return new ProjectAttachmentSupport(getProject(), getPullRequest().getUUID());+ }++ @Override+ protected Project getProject() {+ return NewPullRequestPage.this.getProject();+ }++ });++ form.add(newMergeStrategyContainer());++ form.add(new ReviewListPanel("reviewers", requestModel));++ return fragment;+ }++ private Component newMergeStrategyContainer() {+ WebMarkupContainer container = new WebMarkupContainer("mergeStrategy");++ IModel<MergeStrategy> mergeStrategyModel = new IModel<MergeStrategy>() {++ @Override+ public void detach() {+ }++ @Override+ public MergeStrategy getObject() {+ return getPullRequest().getMergeStrategy();+ }++ @Override+ public void setObject(MergeStrategy object) {+ getPullRequest().setMergeStrategy(object);+ }++ };++ List<MergeStrategy> mergeStrategies = Arrays.asList(MergeStrategy.values());+ DropDownChoice<MergeStrategy> mergeStrategyDropdown =+ new DropDownChoice<MergeStrategy>("select", mergeStrategyModel, mergeStrategies);++ mergeStrategyDropdown.add(new OnChangeAjaxBehavior() {++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ Component newContainer = newMergeStrategyContainer();+ container.replaceWith(newContainer);+ target.add(newContainer);+ }++ });++ container.add(mergeStrategyDropdown);++ container.add(new Label("help", getPullRequest().getMergeStrategy().getDescription()));++ container.add(new AjaxLazyLoadPanel("status") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new DisableGlobalLoadingIndicatorListener());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);+ }++ @Override+ public Component getLazyLoadComponent(String componentId) {+ PullRequest request = getPullRequest();+ MergePreview mergePreview = new MergePreview(request.getTarget().getObjectName(),+ request.getHeadCommitHash(), request.getMergeStrategy(), null);+ ObjectId merged = mergePreview.getMergeStrategy().merge(request);+ if (merged != null)+ mergePreview.setMerged(merged.name());+ request.setLastMergePreview(mergePreview);++ if (merged != null) {+ Component result = new Label(componentId, "<i class=\"fa fa-check-circle\"></i> Able to merge without conflicts");+ result.add(AttributeAppender.append("class", "no-conflict"));+ result.setEscapeModelStrings(false);+ return result;+ } else {+ Component result = new Label(componentId,+ "<i class=\"fa fa-warning\"></i> There are merge conflicts. You can still create the pull request though");+ result.add(AttributeAppender.append("class", "conflict"));+ result.setEscapeModelStrings(false);+ return result;+ }+ }++ @Override+ public Component getLoadingComponent(String markupId) {+ Component component = new Label(markupId, "<img src='/img/ajax-indicator-big.gif'></img> Calculating merge preview...");+ component.add(AttributeAppender.append("class", "calculating"));+ component.setEscapeModelStrings(false);+ return component;+ }++ });++ container.add(new Label("mergeWithoutReviewNote", "This pull request will be merged into target branch automatically "+ + "as it is submitted by qualified user. Use strategy \"Do Not Merge\" if you want to review without "+ + "merging now") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().isAllReviewsApproved() && getPullRequest().getMergeStrategy() != MergeStrategy.DO_NOT_MERGE);+ }++ });++ container.setOutputMarkupId(true);++ return container;+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new NewPullRequestResourceReference()));+ }++ @Override+ protected void onDetach() {+ requestModel.detach();++ super.onDetach();+ }++ @Override+ public MarkPos getMark() {+ return mark;+ }++ @Override+ public String getMarkUrl(MarkPos mark) {+ 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.pathFilter = pathFilter;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;+ state.whitespaceOption = whitespaceOption;+ state.compareWithMergeBase = false;+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();+ }++ @Override+ public Collection<String> getWebSocketObservables() {+ Collection<String> regions = super.getWebSocketObservables();+ PullRequest request = getPullRequest();+ if (request != null) {+ regions.add(CommitIndexed.getWebSocketObservable(request.getBaseCommit().name()));+ regions.add(CommitIndexed.getWebSocketObservable(request.getHeadCommit().name()));+ }+ return regions;+ }++ @Override+ public void onMark(AjaxRequestTarget target, MarkPos mark) {+ this.mark = mark;+ }++ @Override+ public CodeComment getOpenComment() {+ if (commentId != null)+ return OneDev.getInstance(CodeCommentManager.class).load(commentId);+ else+ return null;+ }++ @Override+ public void onAddComment(AjaxRequestTarget target, MarkPos mark) {+ this.commentId = null;+ this.mark = mark;+ }++ @Override+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {+ if (comment != null) {+ commentId = comment.getId();+ mark = comment.getMarkPos();+ } else {+ commentId = null;+ }+ }++ @Override+ protected boolean isPermitted() {+ return SecurityUtils.canReadCode(getProject().getFacade());+ }++ @Override+ public String getCommentUrl(CodeComment comment) {+ RevisionComparePage.State state = new RevisionComparePage.State();+ mark = comment.getMarkPos();+ state.commentId = comment.getId();+ state.leftSide = new ProjectAndBranch(source.getProject(), getPullRequest().getBaseCommitHash());+ state.rightSide = new ProjectAndBranch(source.getProject(), getPullRequest().getHeadCommitHash());+ state.pathFilter = pathFilter;+ state.tabPanel = RevisionComparePage.TabPanel.FILE_CHANGES;+ state.whitespaceOption = whitespaceOption;+ state.compareWithMergeBase = false;+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getProject(), state)).toString();+ }++}