trait MergeService extends AnyRef

Ordering
  1. Alphabetic
  2. By Inheritance
Inherited
  1. MergeService
  2. AnyRef
  3. Any
  1. Hide All
  2. Show All
Visibility
  1. Public
  2. Protected

Value Members

  1. final def !=(arg0: Any): Boolean
    Definition Classes
    AnyRef → Any
  2. final def ##: Int
    Definition Classes
    AnyRef → Any
  3. final def ==(arg0: Any): Boolean
    Definition Classes
    AnyRef → Any
  4. final def asInstanceOf[T0]: T0
    Definition Classes
    Any
  5. def checkConflict(userName: String, repositoryName: String, branch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String): Option[String]

    Checks whether conflict will be caused in merging.

    Checks whether conflict will be caused in merging. Returns Some(errorMessage) if conflict will be caused.

  6. def checkConflict(userName: String, repositoryName: String, branch: String, issueId: Int): Option[String]

    Checks whether conflict will be caused in merging within pull request.

    Checks whether conflict will be caused in merging within pull request. Returns true if conflict will be caused.

  7. def checkConflictCache(userName: String, repositoryName: String, branch: String, issueId: Int): Option[Option[String]]

    Checks whether conflict will be caused in merging within pull request.

    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.

  8. def clone(): AnyRef
    Attributes
    protected[lang]
    Definition Classes
    AnyRef
    Annotations
    @throws(classOf[java.lang.CloneNotSupportedException]) @IntrinsicCandidate() @native()
  9. final def eq(arg0: AnyRef): Boolean
    Definition Classes
    AnyRef
  10. def equals(arg0: AnyRef): Boolean
    Definition Classes
    AnyRef → Any
  11. def fetchAsPullRequest(userName: String, repositoryName: String, requestUserName: String, requestRepositoryName: String, requestBranch: String, issueId: Int): Unit

    fetch remote branch to my repository refs/pull/{issueId}/head

  12. final def getClass(): Class[_ <: AnyRef]
    Definition Classes
    AnyRef → Any
    Annotations
    @IntrinsicCandidate() @native()
  13. def getReceiveHooks(): Seq[ReceiveHook]
    Attributes
    protected
  14. def hashCode(): Int
    Definition Classes
    AnyRef → Any
    Annotations
    @IntrinsicCandidate() @native()
  15. final def isInstanceOf[T0]: Boolean
    Definition Classes
    Any
  16. def mergePullRequest(repository: RepositoryInfo, issueId: Int, loginAccount: Account, message: String, strategy: String, isDraft: Boolean, settings: SystemSettings)(implicit s: (blockingApi)#Session, c: Context, context: Context): Either[String, ObjectId]
  17. def mergeWithMergeCommit(git: Git, repository: RepositoryInfo, branch: String, issueId: Int, message: String, loginAccount: Account, settings: SystemSettings)(implicit s: (blockingApi)#Session, c: Context): ObjectId

    merge the pull request with a merge commit

  18. def mergeWithRebase(git: Git, repository: RepositoryInfo, branch: String, issueId: Int, commits: Seq[RevCommit], loginAccount: Account, settings: SystemSettings)(implicit s: (blockingApi)#Session, c: Context): ObjectId

    rebase to the head of the pull request branch

  19. def mergeWithSquash(git: Git, repository: RepositoryInfo, branch: String, issueId: Int, message: String, loginAccount: Account, settings: SystemSettings)(implicit s: (blockingApi)#Session, c: Context): ObjectId

    squash commits in the pull request and append it

  20. final def ne(arg0: AnyRef): Boolean
    Definition Classes
    AnyRef
  21. final def notify(): Unit
    Definition Classes
    AnyRef
    Annotations
    @IntrinsicCandidate() @native()
  22. final def notifyAll(): Unit
    Definition Classes
    AnyRef
    Annotations
    @IntrinsicCandidate() @native()
  23. def pullRemote(localRepository: RepositoryInfo, localBranch: String, remoteRepository: RepositoryInfo, remoteBranch: String, loginAccount: Account, message: String, pullRequest: Option[PullRequest], settings: SystemSettings)(implicit s: (blockingApi)#Session, c: Context): Option[ObjectId]
  24. final def synchronized[T0](arg0: => T0): T0
    Definition Classes
    AnyRef
  25. def toString(): String
    Definition Classes
    AnyRef → Any
  26. def tryMergeRemote(localUserName: String, localRepositoryName: String, localBranch: String, remoteUserName: String, remoteRepositoryName: String, remoteBranch: String): Either[String, (ObjectId, ObjectId, ObjectId)]

    Checks whether conflict will be caused in merging.

    Checks whether conflict will be caused in merging. Returns true if conflict will be caused.

  27. final def wait(arg0: Long, arg1: Int): Unit
    Definition Classes
    AnyRef
    Annotations
    @throws(classOf[java.lang.InterruptedException])
  28. final def wait(arg0: Long): Unit
    Definition Classes
    AnyRef
    Annotations
    @throws(classOf[java.lang.InterruptedException]) @native()
  29. final def wait(): Unit
    Definition Classes
    AnyRef
    Annotations
    @throws(classOf[java.lang.InterruptedException])

Deprecated Value Members

  1. def finalize(): Unit
    Attributes
    protected[lang]
    Definition Classes
    AnyRef
    Annotations
    @throws(classOf[java.lang.Throwable]) @Deprecated
    Deprecated

    (Since version 9)

Inherited from AnyRef

Inherited from Any

Ungrouped