org.eclipse.jgit.revwalk.RevWalkUtils Java Examples
The following examples show how to use
org.eclipse.jgit.revwalk.RevWalkUtils.
You can vote up the ones you like or vote down the ones you don't like,
and go to the original project or source file by following the links above each example. You may check out the related API usage on the sidebar.
Example #1
Source File: JGitOperator.java From verigreen with Apache License 2.0 | 6 votes |
boolean isRefBehind( Ref behind, Ref tracking ) throws IOException { RevWalk walk = new RevWalk( _git.getRepository() ); try { RevCommit behindCommit = walk.parseCommit( behind.getObjectId() ); RevCommit trackingCommit = walk.parseCommit( tracking.getObjectId() ); walk.setRevFilter( RevFilter.MERGE_BASE ); walk.markStart( behindCommit ); walk.markStart( trackingCommit ); RevCommit mergeBase = walk.next(); walk.reset(); walk.setRevFilter( RevFilter.ALL ); int aheadCount = RevWalkUtils.count( walk, behindCommit, mergeBase ); int behindCount = RevWalkUtils.count( walk, trackingCommit, mergeBase ); return behindCount > aheadCount ? true:false; } catch (Throwable e) { throw new RuntimeException(String.format( "Failed to check if [%s] behind [%s]", behind, tracking), e); } finally { walk.dispose(); } }
Example #2
Source File: GitUtils.java From onedev with MIT License | 5 votes |
@Nullable public static ObjectId rebase(Repository repository, ObjectId source, ObjectId target, PersonIdent committer) { try ( RevWalk revWalk = new RevWalk(repository); ObjectInserter inserter = repository.newObjectInserter();) { RevCommit sourceCommit = revWalk.parseCommit(source); RevCommit targetCommit = revWalk.parseCommit(target); revWalk.setRevFilter(RevFilter.NO_MERGES); List<RevCommit> commits = RevWalkUtils.find(revWalk, sourceCommit, targetCommit); Collections.reverse(commits); RevCommit headCommit = targetCommit; for (RevCommit commit: commits) { ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true); merger.setBase(commit.getParent(0)); if (merger.merge(headCommit, commit)) { if (!headCommit.getTree().getId().equals(merger.getResultTreeId())) { if (!commit.getTree().getId().equals(merger.getResultTreeId()) || !commit.getParent(0).equals(headCommit)) { CommitBuilder commitBuilder = new CommitBuilder(); commitBuilder.setAuthor(commit.getAuthorIdent()); commitBuilder.setCommitter(committer); commitBuilder.setParentId(headCommit); commitBuilder.setMessage(commit.getFullMessage()); commitBuilder.setTreeId(merger.getResultTreeId()); headCommit = revWalk.parseCommit(inserter.insert(commitBuilder)); } else { headCommit = commit; } } } else { return null; } } inserter.flush(); return headCommit.copy(); } catch (IOException e) { throw new RuntimeException(e); } }
Example #3
Source File: GitServiceImpl.java From apidiff with MIT License | 5 votes |
@Override public Integer countCommits(Repository repository, String branch) throws Exception { RevWalk walk = new RevWalk(repository); try { Ref ref = repository.findRef(REMOTE_REFS_PREFIX + branch); ObjectId objectId = ref.getObjectId(); RevCommit start = walk.parseCommit(objectId); walk.setRevFilter(RevFilter.NO_MERGES); return RevWalkUtils.count(walk, start, null); } finally { walk.dispose(); } }
Example #4
Source File: GitServiceImpl.java From RefactoringMiner with MIT License | 5 votes |
@Override public int countCommits(Repository repository, String branch) throws Exception { RevWalk walk = new RevWalk(repository); try { Ref ref = repository.findRef(REMOTE_REFS_PREFIX + branch); ObjectId objectId = ref.getObjectId(); RevCommit start = walk.parseCommit(objectId); walk.setRevFilter(RevFilter.NO_MERGES); return RevWalkUtils.count(walk, start, null); } finally { walk.dispose(); } }
Example #5
Source File: CommitUtils.java From ParallelGit with Apache License 2.0 | 4 votes |
@Nonnull public static List<RevCommit> listUnmergedCommits(AnyObjectId sourceHead, AnyObjectId masterHead, ObjectReader reader) throws IOException { try(RevWalk rw = new RevWalk(reader)) { return unmodifiableList(RevWalkUtils.find(rw, rw.lookupCommit(sourceHead), rw.lookupCommit(masterHead))); } }
Example #6
Source File: CommitUtils.java From ParallelGit with Apache License 2.0 | 4 votes |
@Nonnull public static List<RevCommit> listUnmergedCommits(AnyObjectId sourceHead, AnyObjectId masterHead, ObjectReader reader) throws IOException { try(RevWalk rw = new RevWalk(reader)) { return unmodifiableList(RevWalkUtils.find(rw, rw.lookupCommit(sourceHead), rw.lookupCommit(masterHead))); } }