in org.eclipse.jgit/src/org/eclipse/jgit/api/CherryPickCommand.java [98:213]
public CherryPickResult call() throws GitAPIException, NoMessageException,
UnmergedPathsException, ConcurrentRefUpdateException,
WrongRepositoryStateException, NoHeadException {
RevCommit newHead = null;
List<Ref> cherryPickedRefs = new LinkedList<>();
checkCallable();
try (RevWalk revWalk = new RevWalk(repo)) {
// get the head commit
Ref headRef = repo.exactRef(Constants.HEAD);
if (headRef == null) {
throw new NoHeadException(
JGitText.get().commitOnRepoWithoutHEADCurrentlyNotSupported);
}
newHead = revWalk.parseCommit(headRef.getObjectId());
// loop through all refs to be cherry-picked
for (Ref src : commits) {
// get the commit to be cherry-picked
// handle annotated tags
ObjectId srcObjectId = src.getPeeledObjectId();
if (srcObjectId == null) {
srcObjectId = src.getObjectId();
}
RevCommit srcCommit = revWalk.parseCommit(srcObjectId);
// get the parent of the commit to cherry-pick
final RevCommit srcParent = getParentCommit(srcCommit, revWalk);
String ourName = calculateOurName(headRef);
String cherryPickName = srcCommit.getId().abbreviate(OBJECT_ID_ABBREV_STRING_LENGTH).name()
+ " " + srcCommit.getShortMessage(); //$NON-NLS-1$
Merger merger = strategy.newMerger(repo);
merger.setProgressMonitor(monitor);
boolean noProblems;
Map<String, MergeFailureReason> failingPaths = null;
List<String> unmergedPaths = null;
if (merger instanceof ResolveMerger) {
ResolveMerger resolveMerger = (ResolveMerger) merger;
resolveMerger.setContentMergeStrategy(contentStrategy);
resolveMerger.setCommitNames(
new String[] { "BASE", ourName, cherryPickName }); //$NON-NLS-1$
resolveMerger
.setWorkingTreeIterator(new FileTreeIterator(repo));
resolveMerger.setBase(srcParent.getTree());
noProblems = merger.merge(newHead, srcCommit);
failingPaths = resolveMerger.getFailingPaths();
unmergedPaths = resolveMerger.getUnmergedPaths();
if (!resolveMerger.getModifiedFiles().isEmpty()) {
repo.fireEvent(new WorkingTreeModifiedEvent(
resolveMerger.getModifiedFiles(), null));
}
} else {
noProblems = merger.merge(newHead, srcCommit);
}
if (noProblems) {
if (AnyObjectId.isEqual(newHead.getTree().getId(),
merger.getResultTreeId())) {
continue;
}
DirCacheCheckout dco = new DirCacheCheckout(repo,
newHead.getTree(), repo.lockDirCache(),
merger.getResultTreeId());
dco.setFailOnConflict(true);
dco.setProgressMonitor(monitor);
dco.checkout();
if (!noCommit) {
try (Git git = new Git(getRepository())) {
newHead = git.commit()
.setMessage(srcCommit.getFullMessage())
.setReflogComment(reflogPrefix + " " //$NON-NLS-1$
+ srcCommit.getShortMessage())
.setAuthor(srcCommit.getAuthorIdent())
.setNoVerify(true).call();
}
}
cherryPickedRefs.add(src);
} else {
if (failingPaths != null && !failingPaths.isEmpty()) {
return new CherryPickResult(failingPaths);
}
// there are merge conflicts
String message;
if (unmergedPaths != null) {
CommitConfig cfg = repo.getConfig()
.get(CommitConfig.KEY);
message = srcCommit.getFullMessage();
char commentChar = cfg.getCommentChar(message);
message = new MergeMessageFormatter()
.formatWithConflicts(message, unmergedPaths,
commentChar);
} else {
message = srcCommit.getFullMessage();
}
if (!noCommit) {
repo.writeCherryPickHead(srcCommit.getId());
}
repo.writeMergeCommitMsg(message);
return CherryPickResult.CONFLICT;
}
}
} catch (IOException e) {
throw new JGitInternalException(
MessageFormat.format(
JGitText.get().exceptionCaughtDuringExecutionOfCherryPickCommand,
e), e);
}
return new CherryPickResult(newHead, cherryPickedRefs);
}