Top Description Fields Constructors Methods

org.jabref.logic.git.merge.execution

public final Class MergeBookkeeper

Record the GUI-produced merge result into Git history. Creates the right commit shape based on the merge graph:

BEHIND: fast-forward if content equals remote; otherwise create a new commit on top of remote.
DIVERGED: create a merge commit with parents [localHead, remote].

Preconditions:

GUI has already saved the final .bib file to disk.
No unrelated unstaged changes (defensive check recommended).

Field Summary

Modifier and Type	Field and Description
private final GitHandlerRegistry	registry

Constructor Summary

Access	Constructor and Description
public	MergeBookkeeper(GitHandlerRegistry registry)

Method Summary

Modifier and Type	Method and Description
private static boolean	blobEqualsCommitPath(Git git, RevCommit commit, String relativePath, Path file)
private BookkeepingResult	commitWithParents(Repository repo, String branchRef, ObjectId treeId, String message, ObjectId... parents)
public BookkeepingResult	resultRecord(Path bibFilePath, PullPlan computation)

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

Field Detail

registry	back to summary
private final GitHandlerRegistry registry

Constructor Detail

MergeBookkeeper	back to summary
public MergeBookkeeper(GitHandlerRegistry registry)

Method Detail

blobEqualsCommitPath	back to summary
private static boolean blobEqualsCommitPath(Git git, RevCommit commit, String relativePath, Path file) throws JabRefException, IOException

commitWithParents	back to summary
private BookkeepingResult commitWithParents(Repository repo, String branchRef, ObjectId treeId, String message, ObjectId... parents) throws IOException

resultRecord	back to summary
public BookkeepingResult resultRecord(Path bibFilePath, PullPlan computation) throws IOException, GitAPIException, JabRefException