Top Description Constructors Methods

org.jabref.logic.git.io

public Class GitRevisionLocator

Class Inheritance

extends Object

java.lang.Object
org.jabref.logic.git.io.GitRevisionLocator

Imports

java.io.IOException, java.util.Optional, org.jabref.logic.JabRefException, org.eclipse.jgit.api.Git, org.eclipse.jgit.api.errors.GitAPIException, org.eclipse.jgit.lib.BranchConfig, .Constants, .ObjectId, .Ref, .Repository, org.eclipse.jgit.revwalk.RevCommit, .RevWalk, org.eclipse.jgit.revwalk.filter.RevFilter

Locates the three key commits required for a semantic merge:

base: the common ancestor of local (HEAD) and remote (origin/main)
local: the current working commit (HEAD)
remote: the latest commit on origin/main

Constructor Summary

Access	Constructor and Description
public	GitRevisionLocator()

Method Summary

Modifier and Type	Method and Description
public static RevCommit	findMergeBase(Repository repo, RevCommit a, RevCommit b)
public static boolean	isAncestor(Repository repo, ObjectId maybeAncestor, ObjectId commit)
public RevisionTriple	locateMergeCommits(Git git)

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll toString wait wait wait

Constructor Detail

GitRevisionLocator	back to summary
public GitRevisionLocator()

Method Detail

findMergeBase	back to summary
public static RevCommit findMergeBase(Repository repo, RevCommit a, RevCommit b) throws IOException

isAncestor	back to summary
public static boolean isAncestor(Repository repo, ObjectId maybeAncestor, ObjectId commit) throws IOException

locateMergeCommits	back to summary
public RevisionTriple locateMergeCommits(Git git) throws GitAPIException, IOException, JabRefException