通过jgit来对比分支代码

最新推荐文章于 2024-06-09 16:06:06 发布

不是昵称

最新推荐文章于 2024-06-09 16:06:06 发布

阅读量306

点赞数 1

文章标签： java

本文链接：https://blog.csdn.net/qq_37401609/article/details/134297301

版权

package javaParsar;

import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.diff.DiffEntry;
import org.eclipse.jgit.diff.DiffFormatter;
import org.eclipse.jgit.diff.RawTextComparator;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
import org.eclipse.jgit.transport.URIish;
import org.eclipse.jgit.treewalk.AbstractTreeIterator;
import org.eclipse.jgit.treewalk.CanonicalTreeParser;

import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;

public class GitDiffExample {
    public static void main(String[] args) throws IOException, GitAPIException, URISyntaxException {
        String repoUrl = "http://gitlab.xxx.git";
        String username = "";
        String password = "";
        String branch1 = "master";
        String branch2 = "origin/feat/1.0.0";

        Repository repository = Git.cloneRepository()
                .setURI(repoUrl)
                .setCredentialsProvider(new UsernamePasswordCredentialsProvider(username, password))
                .call().getRepository();

        ObjectId objectId1 = repository.resolve(branch1);
        ObjectId objectId2 = repository.resolve(branch2);

        try (Git git = new Git(repository); RevWalk revWalk = new RevWalk(repository)) {
            RevCommit commit1 = revWalk.parseCommit(objectId1);
            RevCommit commit2 = revWalk.parseCommit(objectId2);

            List<DiffEntry> diffEntries = git.diff()
                    .setOldTree(prepareTreeParser(repository, commit1))
                    .setNewTree(prepareTreeParser(repository, commit2))
                    .call();

            try (DiffFormatter diffFormatter = new DiffFormatter(System.out)) {
                diffFormatter.setRepository(repository);
                diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);
                diffFormatter.setDetectRenames(true);

                for (DiffEntry diffEntry : diffEntries) {
                    diffFormatter.format(diffEntry);
                }
            }
        }
    }

    private static AbstractTreeIterator prepareTreeParser(Repository repository, RevCommit commit) throws IOException {
        try (RevWalk revWalk = new RevWalk(repository)) {
            RevTree tree = revWalk.parseTree(commit.getTree().getId());
            CanonicalTreeParser treeParser = new CanonicalTreeParser();
            try (ObjectReader objectReader = repository.newObjectReader()) {
                treeParser.reset(objectReader, tree.getId());
            }
            revWalk.dispose();
            return treeParser;
        }
    }
    }

org.eclipse.jgit org.eclipse.jgit 5.5.0.201909110433-r