gfwleak/appsketch-works-asw-controller
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: diff commit 遇到 merge 时，parentId 取 parent[0] 当作 oldCommit

Browse Source
This commit is contained in:
shizhendong
2024-11-15 18:07:01 +08:00
parent 19369da30b
commit b368080eaf
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/net/geedge/asw/module/app/service/impl/GitServiceImpl.java
View File

@@ -323,8 +323,8 @@ public class GitServiceImpl implements IGitService {
while (iterator.hasNext()) { while (iterator.hasNext()) {
RevCommit currentCommit = iterator.next(); RevCommit currentCommit = iterator.next();
if (currentCommit.getId().getName().equals(commitId)) { if (currentCommit.getId().getName().equals(commitId)) {
if (iterator.hasNext()) { if (currentCommit.getParentCount() > 0) {
parentCommitId = iterator.next().getName(); parentCommitId = currentCommit.getParent(0).getName();
} }
break; break;
} }
@@ -370,23 +370,33 @@ public class GitServiceImpl implements IGitService {
* 获取 commitIdA -> commitIdB 文件差异 * 获取 commitIdA -> commitIdB 文件差异
* *
* @param workspaceId * @param workspaceId
* @param commitIdA * @param newCommitId
* @param commitIdB * @param oldCommitId
* @return * @return
*/ */
@Override @Override
public List<Map<Object, Object>> getDiffFileListInCommits(String workspaceId, String commitIdA, String commitIdB) { public List<Map<Object, Object>> getDiffFileListInCommits(String workspaceId, String newCommitId, String oldCommitId) {
log.info("[getDiffFileListInCommits] [begin] [workspaceId: {}] [commitIdA: {}] [commitIdB: {}]", workspaceId, commitIdA, commitIdB); log.info("[getDiffFileListInCommits] [begin] [workspaceId: {}] [newCommitId: {}] [oldCommitId: {}]", workspaceId, newCommitId, oldCommitId);
try (Git git = this.getGitInstance(workspaceId); try (Git git = this.getGitInstance(workspaceId);
Repository repository = git.getRepository(); Repository repository = git.getRepository();
RevWalk revWalk = new RevWalk(repository); RevWalk revWalk = new RevWalk(repository);
DiffFormatter diffFormatter = new DiffFormatter(null)) { DiffFormatter diffFormatter = new DiffFormatter(null)) {
CanonicalTreeParser oldTree = new CanonicalTreeParser(); RevCommit oldCommit = revWalk.parseCommit(repository.resolve(oldCommitId));
oldTree.reset(repository.newObjectReader(), revWalk.parseCommit(repository.resolve(commitIdB)).getTree()); RevCommit newCommit = revWalk.parseCommit(repository.resolve(newCommitId));
if (newCommit.getParentCount() > 0) {
final RevWalk rw = new RevWalk(repository);
oldCommit = rw.parseCommit(newCommit.getParent(0).getId());
rw.dispose();
}
// oldTree
CanonicalTreeParser oldTree = new CanonicalTreeParser();
oldTree.reset(repository.newObjectReader(), oldCommit.getTree());
// newTree
CanonicalTreeParser newTree = new CanonicalTreeParser(); CanonicalTreeParser newTree = new CanonicalTreeParser();
newTree.reset(repository.newObjectReader(), revWalk.parseCommit(repository.resolve(commitIdA)).getTree()); newTree.reset(repository.newObjectReader(), newCommit.getTree());
// diff // diff
List<Map<Object, Object>> files = T.ListUtil.list(true); List<Map<Object, Object>> files = T.ListUtil.list(true);
@@ -462,7 +472,7 @@ public class GitServiceImpl implements IGitService {
} }
return files; return files;
} catch (IOException e) { } catch (IOException e) {
log.error(e, "[getDiffFileListInCommits] [error] [workspaceId: {}] [newCommitId: {}] [oldCommitId: {}]", workspaceId, commitIdA, commitIdB); log.error(e, "[getDiffFileListInCommits] [error] [workspaceId: {}] [newCommitId: {}] [oldCommitId: {}]", workspaceId, newCommitId, oldCommitId);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }