org.eclipse.jgit.treewalk.AbstractTreeIterator Java Examples

The following examples show how to use org.eclipse.jgit.treewalk.AbstractTreeIterator. 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: DiffCalculator.java From diff-check with GNU Lesser General Public License v2.1

6 votes

private Map<String, BlobWrapper> getContentMapByTreeAndFilter(
        Git git, AbstractTreeIterator tree, TreeFilter filter) throws Exception {
    Map<String, BlobWrapper> contentMap = new LinkedHashMap<>();
    try (TreeWalk treeWalk = new TreeWalk(git.getRepository())) {
        treeWalk.addTree(tree);
        treeWalk.setRecursive(true);
        treeWalk.setFilter(filter);
        while (treeWalk.next()) {
            ObjectId objectId = treeWalk.getObjectId(0);
            ObjectLoader loader = git.getRepository().open(objectId);
            BlobWrapper blobWrapper = BlobWrapper.builder()
                    .blobId(objectId)
                    .content(loader.getBytes())
                    .build();
            contentMap.put(treeWalk.getPathString(), blobWrapper);
        }
    }
    return contentMap;
}

Example #2

Source File: SubtreeMerger.java From git-merge-repos with Apache License 2.0

6 votes

private AbstractTreeIterator getSingleTreeIterator(TreeWalk treeWalk, String commitMessage) {
	AbstractTreeIterator result = null;
	int treeCount = treeWalk.getTreeCount();
	for (int i = 0; i < treeCount; i++) {
		AbstractTreeIterator it = treeWalk.getTree(i, AbstractTreeIterator.class);
		if (it != null) {
			if (result != null) {
				String msg = "Trees of repositories overlap in path '"
						+ it.getEntryPathString()
						+ "'. "
						+ "We can only merge non-overlapping trees, "
						+ "so make sure the repositories have been prepared for that. "
						+ "One possible way is to process each repository to move the root to a subdirectory first.\n"
						+ "Current commit:\n" + commitMessage;
				throw new IllegalStateException(msg);
			} else {
				result = it;
			}
		}
	}
	return result;
}

Example #3

Source File: SubtreeMerger.java From git-merge-repos with Apache License 2.0

6 votes

private DirCache createTreeDirCache(Map<SubtreeConfig, RevCommit> parentCommits,
		String commitMessage) throws IOException {

	try (TreeWalk treeWalk = new TreeWalk(repository)) {
		treeWalk.setRecursive(true);
		addTrees(parentCommits, treeWalk);

		DirCacheBuilder builder = DirCache.newInCore().builder();
		while (treeWalk.next()) {
			AbstractTreeIterator iterator = getSingleTreeIterator(treeWalk, commitMessage);
			if (iterator == null) {
				throw new IllegalStateException(
						"Tree walker did not return a single tree (should not happen): "
								+ treeWalk.getPathString());
			}
			byte[] path = Arrays.copyOf(iterator.getEntryPathBuffer(),
					iterator.getEntryPathLength());
			DirCacheEntry entry = new DirCacheEntry(path);
			entry.setFileMode(iterator.getEntryFileMode());
			entry.setObjectId(iterator.getEntryObjectId());
			builder.add(entry);
		}
		builder.finish();
		return builder.getDirCache();
	}
}

Example #4

Source File: GitRepoMetaData.java From GitFx with Apache License 2.0

6 votes

public String getDiffBetweenCommits(int commitIndex) throws IOException,GitAPIException{
    if(commitIndex+1==commitCount)
        return "Nothing to Diff. This is first commit";
    AbstractTreeIterator current = prepareTreeParser(repository,commitSHA.get(commitIndex));
    AbstractTreeIterator parent = prepareTreeParser(repository,commitSHA.get(++commitIndex));
    ObjectReader reader = repository.newObjectReader();
    ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
    // finally get the list of changed files
    Git git = new Git(repository) ;
    List<DiffEntry> diff = git.diff().
            setOldTree(parent).
            setNewTree(current).
            //TODO Set the path filter to filter out the selected file
            //setPathFilter(PathFilter.create("README.md")).
            call();
    for (DiffEntry entry : diff) {
        System.out.println("Entry: " + entry + ", from: " + entry.getOldId() + ", to: " + entry.getNewId());
        DiffFormatter formatter = new DiffFormatter(byteStream) ;
            formatter.setRepository(repository);
            formatter.format(entry);
        }
   // System.out.println(byteStream.toString());
    String diffContent = byteStream.toString();
    return byteStream.toString();
}

Example #5

Source File: GitManagerImpl.java From WebIDE-Backend with BSD 3-Clause "New" or "Revised" License

6 votes

private AbstractTreeIterator prepareTreeParser(Repository repository, String ref) throws IOException {
    if ("~~staged~~".equals(ref)) {
        return new DirCacheIterator(DirCache.read(repository));
    } else if ("~~unstaged~~".equals(ref)) {
        return new FileTreeIterator(repository);
    }

    try (RevWalk walk = new RevWalk(repository)) {
        ObjectId commitObjectId = repository.resolve(ref);
        if (commitObjectId == null) {
            throw new GitInvalidRefException(format("invalid git ref %s", ref));
        }

        log.debug("ref: {}, commit id: {}", ref, commitObjectId.toString());

        RevCommit commit = walk.parseCommit(commitObjectId);
        RevTree tree = walk.parseTree(commit.getTree().getId());

        CanonicalTreeParser treeParser = new CanonicalTreeParser();
        try (ObjectReader objectReader = repository.newObjectReader()) {
            treeParser.reset(objectReader, tree.getId());
        }

        return treeParser;
    }
}

Example #6

Source File: GitManagerImpl.java From WebIDE-Backend with BSD 3-Clause "New" or "Revised" License

6 votes

@Override
public String diff(Workspace ws, String path, String oldRef, String newRef) throws IOException, GitAPIException {
    Repository repository = getRepository(ws.getSpaceKey());

    AbstractTreeIterator oldTreeParser = prepareTreeParser(repository, oldRef);
    AbstractTreeIterator newTreeParser = prepareTreeParser(repository, newRef);

    Config config = new Config();
    config.setBoolean("diff", null, "renames", true);
    DiffConfig diffConfig = config.get(DiffConfig.KEY);

    String relativePath = ws.getRelativePath(path).toString();

    try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
         Git git = Git.wrap(repository)) {

        git.diff()
            .setOldTree(oldTreeParser)
            .setNewTree(newTreeParser)
            .setPathFilter(FollowFilter.create(relativePath, diffConfig))
            .setOutputStream(baos)
            .call();

        return baos.toString();
    }
}

Example #7

Source File: ExportDiffTest.java From netbeans with Apache License 2.0

6 votes

public void testDiffRenameDetectionProblem () throws Exception {
    File file = new File(workDir, "file");
    File renamed = new File(workDir, "renamed");
    write(file, "hey, i will be renamed\n");
    add(file);
    commit(file);

    file.renameTo(renamed);
    write(renamed, "hey, i will be renamed\nand now i am\n");
    ByteArrayOutputStream baos = new ByteArrayOutputStream(10240);
    try (OutputStream out = new BufferedOutputStream(baos);
        DiffFormatter formatter = new DiffFormatter(out);) {
        formatter.setRepository(repository);
        formatter.setDetectRenames(true);
        AbstractTreeIterator firstTree = new DirCacheIterator(repository.readDirCache());
        AbstractTreeIterator secondTree = new FileTreeIterator(repository);
        formatter.format(firstTree, secondTree);
        formatter.flush();
    }
    assertFalse(
        "Fixed in JGit, modify and simplify the sources in ExportDiff command",
        baos.toString().contains("similarity index ")
    );
}

Example #8

Source File: UIGit.java From hop with Apache License 2.0

6 votes

private AbstractTreeIterator getTreeIterator( String commitId ) throws Exception {
  if ( commitId == null ) {
    return new EmptyTreeIterator();
  }
  if ( commitId.equals( WORKINGTREE ) ) {
    return new FileTreeIterator( git.getRepository() );
  } else if ( commitId.equals( INDEX ) ) {
    return new DirCacheIterator( git.getRepository().readDirCache() );
  } else {
    ObjectId id = git.getRepository().resolve( commitId );
    if ( id == null ) { // commitId does not exist
      return new EmptyTreeIterator();
    } else {
      CanonicalTreeParser treeIterator = new CanonicalTreeParser();
      try ( RevWalk rw = new RevWalk( git.getRepository() ) ) {
        RevTree tree = rw.parseTree( id );
        try ( ObjectReader reader = git.getRepository().newObjectReader() ) {
          treeIterator.reset( reader, tree.getId() );
        }
      }
      return treeIterator;
    }
  }
}

Example #9

Source File: ThreeWayMerger.java From onedev with MIT License

5 votes

/**
 * Create an iterator to walk the merge base.
 *
 * @return an iterator over the caller-specified merge base, or the natural
 *         merge base of the two input commits.
 * @throws java.io.IOException
 */
protected AbstractTreeIterator mergeBase() throws IOException {
	if (baseTree != null) {
		return openTree(baseTree);
	}
	RevCommit baseCommit = (baseCommitId != null) ? walk
			.parseCommit(baseCommitId) : getBaseCommit(sourceCommits[0],
			sourceCommits[1]);
	if (baseCommit == null) {
		baseCommitId = null;
		return new EmptyTreeIterator();
	}
	baseCommitId = baseCommit.toObjectId();
	return openTree(baseCommit.getTree());
}

Example #10

Source File: DiffCalculator.java From diff-check with GNU Lesser General Public License v2.1

5 votes

private List<DiffEntryWrapper> doCalculateCommitDiff(
        RevCommit oldCommit,
        RevCommit newCommit,
        ObjectReader reader,
        Git git,
        File repoDir,
        Set<String> excludedPathSet) throws Exception {

    if (Objects.equals(oldCommit.getId(), newCommit.getId())) {
        return Collections.emptyList();
    }

    if (Objects.equals(oldCommit.getTree().getId(), newCommit.getTree().getId())) {
        return Collections.emptyList();
    }

    RenameDetector detector = new RenameDetector(git.getRepository());
    AbstractTreeIterator oldTree = new CanonicalTreeParser(null, reader, oldCommit.getTree());
    AbstractTreeIterator newTree = new CanonicalTreeParser(null, reader, newCommit.getTree());

    List<DiffEntry> entries = git.diff()
            .setOldTree(oldTree)
            .setNewTree(newTree)
            .call();
    detector.reset();
    detector.addAll(entries);
    entries = detector.compute();

    return entries.stream()
            .filter(entry -> !excludedPathSet.contains(entry.getNewPath()))
            .map(entry -> {
                RawText oldText = newRawText(entry, DiffEntry.Side.OLD, reader);
                RawText newText = newRawText(entry, DiffEntry.Side.NEW, reader);
                return DiffEntryWrapper.builder()
                        .gitDir(repoDir)
                        .diffEntry(entry)
                        .editList(calculateEditList(oldText, newText))
                        .build();
            }).collect(Collectors.toList());
}

Example #11