private static boolean isMergeCommit(RevCommit currentCommit) { return currentCommit.getParentCount() > 1; }
@Override public boolean include(RevWalk walker, RevCommit c) { return c.getParentCount() < 2; }
@Override public boolean include(RevWalk walker, RevCommit c) { return c.getParentCount() >= 2; }
int getParentCount() { return sourceCommit.getParentCount(); }
private RevCommit getParentCommit(RevCommit srcCommit, RevWalk revWalk) throws MultipleParentsNotAllowedException, MissingObjectException, IOException { final RevCommit srcParent; if (mainlineParentNumber == null) { if (srcCommit.getParentCount() != 1) throw new MultipleParentsNotAllowedException( MessageFormat.format( JGitText.get().canOnlyCherryPickCommitsWithOneParent, srcCommit.name(), Integer.valueOf(srcCommit.getParentCount()))); srcParent = srcCommit.getParent(0); } else { if (mainlineParentNumber.intValue() > srcCommit.getParentCount()) throw new JGitInternalException(MessageFormat.format( JGitText.get().commitDoesNotHaveGivenParent, srcCommit, mainlineParentNumber)); srcParent = srcCommit .getParent(mainlineParentNumber.intValue() - 1); } revWalk.parseHeaders(srcParent); return srcParent; }
private List<RevCommit> getNewParents(RevCommit commitToPick) throws IOException { List<RevCommit> newParents = new ArrayList<>(); for (int p = 0; p < commitToPick.getParentCount(); p++) { String parentHash = commitToPick.getParent(p).getName(); if (!new File(rebaseState.getRewrittenDir(), parentHash).exists()) newParents.add(commitToPick.getParent(p)); else { String newParent = RebaseState.readFile( rebaseState.getRewrittenDir(), parentHash); if (newParent.length() == 0) newParents.add(walk.parseCommit(repo .resolve(Constants.HEAD))); else newParents.add(walk.parseCommit(ObjectId .fromString(newParent))); } } return newParents; }
if (preserveMerges || commit.getParentCount() == 1) cherryPickList.add(commit); pickLoop: while(iterator.hasNext()){ RevCommit commit = iterator.next(); for (int i = 0; i < commit.getParentCount(); i++) { boolean parentRewritten = new File(rewrittenDir, commit .getParent(i).getName()).exists();
if (c.getParentCount() == 0) { roots.add(c.copy()); for (int i = 0; i < cmit.getParentCount(); i++) { RevCommit p = cmit.getParent(i); if (!p.has(added) && !p.has(RevFlag.UNINTERESTING)
if (pnum > commit.getParentCount()) rev = null; else if (rev instanceof RevCommit) { RevCommit commit = ((RevCommit) rev); if (commit.getParentCount() == 0) rev = null; else if (rev instanceof RevCommit) { RevCommit commit = ((RevCommit) rev); if (commit.getParentCount() == 0) rev = null; else while (dist > 0) { RevCommit commit = (RevCommit) rev; if (commit.getParentCount() == 0) { rev = null; break;
boolean isMergeCommit = c.getParentCount() > 1;
@Override public void dragStart(DragSourceEvent event) { RevCommit commit = getSelectedCommit(); event.doit = commit.getParentCount() == 1; }
if (stashCommit.getParentCount() < 2 || stashCommit.getParentCount() > 3) throw new JGitInternalException(MessageFormat.format( JGitText.get().stashCommitIncorrectNumberOfParents, stashId.name(), Integer.valueOf(stashCommit.getParentCount()))); ObjectId stashHeadCommit = stashCommit.getParent(0); ObjectId untrackedCommit = null; if (applyUntracked && stashCommit.getParentCount() == 3) untrackedCommit = revWalk.parseCommit(stashCommit.getParent(2));
for (int i = 1; i < commitToPick.getParentCount(); i++) otherParentsUnchanged &= newParents.get(i).equals( commitToPick.getParent(i)); boolean isMerge = commitToPick.getParentCount() > 1; String ourCommitName = getOurCommitName(); CherryPickCommand pickCommand = git.cherryPick() .setProgressMonitor(monitor) .setCommit(false); for (int i = 1; i < commitToPick.getParentCount(); i++) merge.include(newParents.get(i)); MergeResult mergeResult = merge.call();
if (srcCommit.getParentCount() != 1) throw new MultipleParentsNotAllowedException( MessageFormat.format( JGitText.get().canOnlyRevertCommitsWithOneParent, srcCommit.name(), Integer.valueOf(srcCommit.getParentCount())));
@NotNull private static String loadRepositoryId(@NotNull Repository repository, @NotNull Ref ref) throws IOException { ObjectId oid = ref.getObjectId(); final RevWalk revWalk = new RevWalk(repository); while (true) { final RevCommit revCommit = revWalk.parseCommit(oid); if (revCommit.getParentCount() == 0) { return LayoutHelper.loadRepositoryId(repository.newObjectReader(), oid); } oid = revCommit.getParent(0); } }
@Override public boolean isEnabled() { GitHistoryPage page = getPage(); if (page == null) return false; IStructuredSelection selection = getSelection(page); if (selection.size() != 1) return false; RevCommit commit = (RevCommit) selection.getFirstElement(); return (commit.getParentCount() == 1); } }
private static ObjectId[] trees(final RevCommit commit) { final ObjectId[] r = new ObjectId[commit.getParentCount() + 1]; for (int i = 0; i < r.length - 1; i++) r[i] = commit.getParent(i).getTree().getId(); r[r.length - 1] = commit.getTree().getId(); return r; }
private List<DiffEntry> diffsForTheCommit(Repository repo, RevCommit commit) throws IOException { AnyObjectId currentCommit = repo.resolve(commit.getName()); AnyObjectId parentCommit = commit.getParentCount() > 0 ? repo.resolve(commit.getParent(0).getName()) : null; return this.getDiffBetweenCommits(repo, parentCommit, currentCommit); }
public CommitInfo createCommitInfo(RevCommit entry) { final Date date = GitFacade.getCommitDate(entry); String author = entry.getAuthorIdent().getName(); boolean merge = entry.getParentCount() > 1; String shortMessage = entry.getShortMessage(); String trimmedMessage = Strings.trimString(shortMessage, 78); String name = entry.getName(); String commitHashText = getShortCommitHash(name); return new CommitInfo(commitHashText, name, author, date, merge, trimmedMessage, shortMessage); }
@Override protected void show(final RevCommit c) throws Exception { if (c.has(RevFlag.UNINTERESTING)) outw.print('-'); c.getId().copyTo(outbuffer, outw); if (parents) for (int i = 0; i < c.getParentCount(); i++) { outw.print(' '); c.getParent(i).getId().copyTo(outbuffer, outw); } outw.println(); }