Package com.google.gerrit.entities

Class PatchSet.Conflicts

java.lang.Object
com.google.gerrit.entities.PatchSet.Conflicts
Enclosing class:
PatchSet
public abstract static class PatchSet.Conflicts extends Object

  • Constructor Summary

    Constructors
    Constructor
    Description
    Conflicts()
     

  • Method Summary

    Modifier and Type
    Method
    Description
    abstract boolean
    containsConflicts()
    Whether any of the files in the revision has a conflict due to merging ours() and theirs().
    static PatchSet.Conflicts
    create(Optional<org.eclipse.jgit.lib.ObjectId> ours, Optional<org.eclipse.jgit.lib.ObjectId> theirs, boolean containsConflicts)
     
    abstract Optional<org.eclipse.jgit.lib.ObjectId>
    ours()
    The SHA1 of the commit that was used as ours for the Git merge that created the revision.
    abstract Optional<org.eclipse.jgit.lib.ObjectId>
    theirs()
    The SHA1 of the commit that was used as theirs for the Git merge that created the revision.

    Methods inherited from class java.lang.Object

    clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

  • Constructor Details

    • Conflicts

      public Conflicts()

  • Method Details

    • ours

      public abstract Optional<org.eclipse.jgit.lib.ObjectId> ours()
      The SHA1 of the commit that was used as ours for the Git merge that created the revision.

      Guaranteed to be set if containsConflicts() is true. If containsConflicts() is false, only set if the revision was created by Gerrit as a result of performing a Git merge.

    • theirs

      public abstract Optional<org.eclipse.jgit.lib.ObjectId> theirs()
      The SHA1 of the commit that was used as theirs for the Git merge that created the revision.

      Guaranteed to be set if containsConflicts() is true. If containsConflicts() is false, only set if the revision was created by Gerrit as a result of performing a Git merge.

    • containsConflicts

      public abstract boolean containsConflicts()
      Whether any of the files in the revision has a conflict due to merging ours() and theirs().

      If true at least one of the files in the revision has a conflict and contains Git conflict markers.

      If false merging ours() and theirs() didn't have any conflict. In this case the files in the revision may only contain Git conflict marker if they were already present in ours() or theirs().

    • create

      public static PatchSet.Conflicts create(Optional<org.eclipse.jgit.lib.ObjectId> ours, Optional<org.eclipse.jgit.lib.ObjectId> theirs, boolean containsConflicts)