Class RevertCommand

  • All Implemented Interfaces:
    java.util.concurrent.Callable<RevCommit>

    public class RevertCommand
    extends GitCommand<RevCommit>
    A class used to execute a revert command. It has setters for all supported options and arguments of this command and a call() method to finally execute the command. Each instance of this class should only be used for one invocation of the command (means: one call to call())
    See Also:
    Git documentation about revert
    • Constructor Detail

      • RevertCommand

        protected RevertCommand​(Repository repo)
        Parameters:
        repo -
    • Method Detail

      • include

        public RevertCommand include​(Ref commit)
        Parameters:
        commit - a reference to a commit which is reverted into the current head
        Returns:
        this
      • include

        public RevertCommand include​(AnyObjectId commit)
        Parameters:
        commit - the Id of a commit which is reverted into the current head
        Returns:
        this
      • include

        public RevertCommand include​(java.lang.String name,
                                     AnyObjectId commit)
        Parameters:
        name - a name given to the commit
        commit - the Id of a commit which is reverted into the current head
        Returns:
        this
      • setOurCommitName

        public RevertCommand setOurCommitName​(java.lang.String ourCommitName)
        Parameters:
        ourCommitName - the name that should be used in the "OURS" place for conflict markers
        Returns:
        this
      • getRevertedRefs

        public java.util.List<Ref> getRevertedRefs()
        Returns:
        the list of successfully reverted Ref's. Never null but maybe an empty list if no commit was successfully cherry-picked
      • getFailingResult

        public MergeResult getFailingResult()
        Returns:
        the result of the merge failure, null if no merge failure occurred during the revert
      • getUnmergedPaths

        public java.util.List<java.lang.String> getUnmergedPaths()
        Returns:
        the unmerged paths, will be null if no merge conflicts
      • setStrategy

        public RevertCommand setStrategy​(MergeStrategy strategy)
        Parameters:
        strategy - The merge strategy to use during this revert command.
        Returns:
        this
        Since:
        3.4