Package org.projectnessie.versioned

Interface MergeResult<COMMIT>

All Superinterfaces:
Result
@Immutable public interface MergeResult<COMMIT> extends Result

  • Method Details

    • wasApplied

      @Default default boolean wasApplied()
      Indicates whether the merge or transplant operation has been applied.

    • wasSuccessful

      @Default default boolean wasSuccessful()
      Indicates whether the merge or transplant operation was successful without any conflicts.

    • getResultantTargetHash

      @Nullable Hash getResultantTargetHash()
      Commit-ID of the target branch after the merge/transplant operation.

    • getCommonAncestor

      @Nullable Hash getCommonAncestor()
      Commit-ID of the identified common ancestor, only returned for a merge operation.

    • getSourceRef

      NamedRef getSourceRef()
      The source ref.

    • getTargetBranch

      BranchName getTargetBranch()
      Name of the target branch.

    • getEffectiveTargetHash

      Hash getEffectiveTargetHash()
      Head commit-ID of the target branch identified by the merge or transplant operation.

    • getExpectedHash

      @Nullable Hash getExpectedHash()
      The expected commit-ID of the target branch, as specified by the caller.

    • getSourceCommits

      @Deprecated List<COMMIT> getSourceCommits()
      Deprecated.
      List of commit-IDs to be merged or transplanted.

    • getTargetCommits

      @Nullable @Deprecated List<COMMIT> getTargetCommits()
      Deprecated.
      List of commit-IDs between getExpectedHash() and getEffectiveTargetHash(), if the expected hash was provided.

    • getCreatedCommits

      List<COMMIT> getCreatedCommits()
      List of new commits that where created and added to the target branch.

      The returned list will always be empty if the merge or transplant operation failed. It will also always be empty in dry-run mode. Furthermore, it will also be empty if the operation resulted in a fast-forward merge or transplant, because no new commit is created in this case. Otherwise, if commits were squashed, the returned list will contain exactly one element: the squashed commit; conversely, if individual commits were preserved, the list will generally contain as many commits as there were source commits to rebase (unless some source commits were filtered out).

      The REST API does not expose this property currently; it is used by the Nessie events notification system.

    • getDetails

      Map<org.projectnessie.model.ContentKey,MergeResult.KeyDetails> getDetails()
      Details of all keys encountered during the merge or transplant operation.

    • builder

      static <COMMIT extends Hashable> org.projectnessie.versioned.ImmutableMergeResult.Builder<COMMIT> builder()