test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(项目设置): 修复git文件添加以及拉取时commitId并不是文件本身最后一次commitId的问题 

修复git文件添加以及拉取时commitId并不是文件本身最后一次commitId的问题
This commit is contained in:
song-tianyang 2023-04-12 18:22:45 +08:00 committed by 建国
parent 92bfed4ddf
commit fc3bdb491d
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
framework/sdk-parent/sdk/src/main/java/io/metersphere/metadata/utils/GitRepositoryUtil.java
View File

@ -118,8 +118,8 @@ public class GitRepositoryUtil {
InMemoryRepository repo = null;
try {
repo = this.getGitRepositoryInMemory(repositoryUrl, userName, token);
ObjectId fileCommitId = repo.resolve("refs/heads/" + branch);
RevCommit commit = this.getRevTreeByRepositoryAndCommitId(repo, fileCommitId);
ObjectId lastCommitId = repo.resolve("refs/heads/" + branch);
RevCommit commit = this.getRevTreeByRepositoryAndCommitId(repo, lastCommitId);
RevTree tree = commit.getTree();
TreeWalk treeWalk = new TreeWalk(repo);
treeWalk.addTree(tree);
@ -130,7 +130,11 @@ public class GitRepositoryUtil {
} else {
ObjectId objectId = treeWalk.getObjectId(0);
ObjectLoader loader = repo.open(objectId);
attachInfo = new RemoteFileAttachInfo(repositoryUrl, userName, token, branch, fileCommitId.getName(), filePath, commit.getFullMessage(), loader.getSize());
String fileLastCommitId = this.getFileLastCommitId(lastCommitId, filePath);
if (StringUtils.isEmpty(fileLastCommitId)) {
fileLastCommitId = lastCommitId.getName();
}
attachInfo = new RemoteFileAttachInfo(repositoryUrl, userName, token, branch, fileLastCommitId, filePath, commit.getFullMessage(), loader.getSize());
return attachInfo;
}
} catch (Exception e) {
@ -142,6 +146,14 @@ public class GitRepositoryUtil {
return null;
}
private String getFileLastCommitId(ObjectId objectId, String filePath) throws Exception {
Iterable<RevCommit> logs = git.log().add(objectId).addPath(filePath).call();
for (RevCommit rev : logs) {
return rev.getName();
}
return null;
}
private void validateParams(String... params) {
for (String param : params) {
if (StringUtils.isBlank(param)) {