Newer
Older
gitbucket_jkp / src / main / scala / service / MergeService.scala
@nazoking nazoking on 15 Mar 2015 7 KB (api-support)change crlf
package service
import util.LockUtil
import util.Directory._
import util.Implicits._
import util.ControlUtil._
import org.eclipse.jgit.merge.MergeStrategy
import org.eclipse.jgit.api.Git
import org.eclipse.jgit.transport.RefSpec
import org.eclipse.jgit.errors.NoMergeBaseException
import org.eclipse.jgit.lib.{ObjectId, CommitBuilder, PersonIdent}
import model.Account
import org.eclipse.jgit.revwalk.RevWalk
trait MergeService {
  import MergeService._
  /**
   * Checks whether conflict will be caused in merging within pull request.
   * Returns true if conflict will be caused.
   */
  def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Boolean = {
    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
      MergeCacheInfo(git, branch, issueId).checkConflict()
    }
  }
  /**
   * Checks whether conflict will be caused in merging within pull request.
   * only cache check.
   * Returns Some(true) if conflict will be caused.
   * Returns None if cache has not created yet.
   */
  def checkConflictCache(userName: String, repositoryName: String, branch: String, issueId: Int): Option[Boolean] = {
    using(Git.open(getRepositoryDir(userName, repositoryName))) { git =>
      MergeCacheInfo(git, branch, issueId).checkConflictCache()
    }
  }
  /** merge pull request */
  def mergePullRequest(git:Git, branch: String, issueId: Int, message:String, committer:PersonIdent): Unit = {
    MergeCacheInfo(git, branch, issueId).merge(message, committer)
  }
  /** fetch remote branch to my repository refs/pull/{issueId}/head */
  def fetchAsPullRequest(userName: String, repositoryName: String, requestUserName: String, requestRepositoryName: String, requestBranch:String, issueId:Int){
    using(Git.open(getRepositoryDir(userName, repositoryName))){ git =>
      git.fetch
        .setRemote(getRepositoryDir(requestUserName, requestRepositoryName).toURI.toString)
        .setRefSpecs(new RefSpec(s"refs/heads/${requestBranch}:refs/pull/${issueId}/head"))
        .call
    }
  }
  /**
   * Checks whether conflict will be caused in merging. Returns true if conflict will be caused.
   */
  def checkConflict(userName: String, repositoryName: String, branch: String,
                            requestUserName: String, requestRepositoryName: String, requestBranch: String): Boolean = {
    using(Git.open(getRepositoryDir(requestUserName, requestRepositoryName))) { git =>
      val remoteRefName = s"refs/heads/${branch}"
      val tmpRefName = s"refs/merge-check/${userName}/${branch}"
      val refSpec = new RefSpec(s"${remoteRefName}:${tmpRefName}").setForceUpdate(true)
      try {
        // fetch objects from origin repository branch
        git.fetch
           .setRemote(getRepositoryDir(userName, repositoryName).toURI.toString)
           .setRefSpecs(refSpec)
           .call
        // merge conflict check
        val merger = MergeStrategy.RECURSIVE.newMerger(git.getRepository, true)
        val mergeBaseTip = git.getRepository.resolve(s"refs/heads/${requestBranch}")
        val mergeTip = git.getRepository.resolve(tmpRefName)
        try {
          !merger.merge(mergeBaseTip, mergeTip)
        } catch {
          case e: NoMergeBaseException =>  true
        }
      } finally {
        val refUpdate = git.getRepository.updateRef(refSpec.getDestination)
        refUpdate.setForceUpdate(true)
        refUpdate.delete()
      }
    }
  }
}
object MergeService{
  case class MergeCacheInfo(git:Git, branch:String, issueId:Int){
    val repository = git.getRepository
    val mergedBranchName = s"refs/pull/${issueId}/merge"
    val conflictedBranchName = s"refs/pull/${issueId}/conflict"
    lazy val mergeBaseTip = repository.resolve(s"refs/heads/${branch}")
    lazy val mergeTip = repository.resolve(s"refs/pull/${issueId}/head")
    def checkConflictCache(): Option[Boolean] = {
      Option(repository.resolve(mergedBranchName)).flatMap{ merged =>
          if(parseCommit( merged ).getParents().toSet == Set( mergeBaseTip, mergeTip )){
            // merged branch exists
            Some(false)
          }else{
            None
          }
      }.orElse(Option(repository.resolve(conflictedBranchName)).flatMap{ conflicted =>
        if(parseCommit( conflicted ).getParents().toSet == Set( mergeBaseTip, mergeTip )){
          // conflict branch exists
          Some(true)
        }else{
          None
        }
      })
    }
    def checkConflict():Boolean ={
      checkConflictCache.getOrElse(checkConflictForce)
    }
    def checkConflictForce():Boolean ={
      val merger = MergeStrategy.RECURSIVE.newMerger(repository, true)
      val conflicted = try {
        !merger.merge(mergeBaseTip, mergeTip)
      } catch {
        case e: NoMergeBaseException => true
      }
      val mergeTipCommit = using(new RevWalk( repository ))(_.parseCommit( mergeTip ))
      val committer = mergeTipCommit.getCommitterIdent;
      def updateBranch(treeId:ObjectId, message:String, branchName:String){
        // creates merge commit
        val mergeCommitId = createMergeCommit(treeId, committer, message)
        // update refs
        val refUpdate = repository.updateRef(branchName)
        refUpdate.setNewObjectId(mergeCommitId)
        refUpdate.setForceUpdate(true)
        refUpdate.setRefLogIdent(committer)
        refUpdate.update()
      }
      if(!conflicted){
        updateBranch(merger.getResultTreeId, s"Merge ${mergeTip.name} into ${mergeBaseTip.name}", mergedBranchName)
        git.branchDelete().setForce(true).setBranchNames(conflictedBranchName).call()
      }else{
        updateBranch(mergeTipCommit.getTree().getId(), s"can't merge ${mergeTip.name} into ${mergeBaseTip.name}", conflictedBranchName)
        git.branchDelete().setForce(true).setBranchNames(mergedBranchName).call()
      }
      conflicted
    }
    // update branch from cache
    def merge(message:String, committer:PersonIdent) = {
      if(checkConflict()){
        throw new RuntimeException("This pull request can't merge automatically.")
      }
      val mergeResultCommit = parseCommit( Option(repository.resolve(mergedBranchName)).getOrElse(throw new RuntimeException(s"not found branch ${mergedBranchName}")) )
      // creates merge commit
      val mergeCommitId = createMergeCommit(mergeResultCommit.getTree().getId(), committer, message)
      // update refs
      val refUpdate = repository.updateRef(s"refs/heads/${branch}")
      refUpdate.setNewObjectId(mergeCommitId)
      refUpdate.setForceUpdate(false)
      refUpdate.setRefLogIdent(committer)
      refUpdate.setRefLogMessage("merged", true)
      refUpdate.update()
    }
    // return treeId
    private def createMergeCommit(treeId:ObjectId, committer:PersonIdent, message:String) = {
      val mergeCommit = new CommitBuilder()
      mergeCommit.setTreeId(treeId)
      mergeCommit.setParentIds(Array[ObjectId](mergeBaseTip, mergeTip): _*)
      mergeCommit.setAuthor(committer)
      mergeCommit.setCommitter(committer)
      mergeCommit.setMessage(message)
      // insertObject and got mergeCommit Object Id
      val inserter = repository.newObjectInserter
      val mergeCommitId = inserter.insert(mergeCommit)
      inserter.flush()
      inserter.release()
      mergeCommitId
    }
    private def parseCommit(id:ObjectId) = using(new RevWalk( repository ))(_.parseCommit(id))
  }
}