Skip to content

Allow specify branch or tag on repo #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jyeros wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow specify branch or tag on repo #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/main/java/edu/baylor/ecs/cloudhubs/prophetapputils/ProphetUtilsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import edu.baylor.ecs.cloudhubs.prophetdto.app.utilsapp.RepoReq;
import edu.baylor.ecs.cloudhubs.prophetutils.ProphetUtilsFacade;
import org.apache.commons.io.FileUtils;
import org.eclipse.jgit.api.CloneCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.transport.URIish;
Expand Down Expand Up @@ -54,7 +55,16 @@ public ResponseEntity<ProphetAppData> getMultiRepoAppData(@RequestBody GitReq re
List<RepoReq> localRepos = new ArrayList<>();
for (RepoReq repo : request.getRepositories()) {
String repoUrl = repoPrefix + repo.getPath();
String repoName = new URIish(repoUrl).getHumanishName();
String fullRepoName = new URIish(repoUrl).getHumanishName();
String[] fullRepoNameSplitted = fullRepoName.split("#");
String branchName = null;
String repoName = fullRepoName;
if (fullRepoNameSplitted.length > 1) {
branchName = fullRepoNameSplitted[1];
repoName = fullRepoNameSplitted[0];
repoUrl = repoUrl.split("#")[0];
}

String repoDirName = dirName + "/" + repoName;
File repoDir = new File(repoDirName);
result = repoDir.mkdir();
Expand All @@ -64,11 +74,15 @@ public ResponseEntity<ProphetAppData> getMultiRepoAppData(@RequestBody GitReq re
}

try {
System.out.println("Cloning " + repoUrl + " into " + repoDirName);
Git.cloneRepository()
System.out.println("Cloning " + repoUrl + (branchName != null ? "#" + branchName : "") + " into " + repoDirName);
CloneCommand gitCloneCommand = Git.cloneRepository()
.setURI(repoUrl)
.setDirectory(Paths.get(repoDirName).toFile())
.call();
.setDirectory(Paths.get(repoDirName).toFile());
if (branchName != null) {
gitCloneCommand.setBranch(branchName);
}
gitCloneCommand.call();

System.out.println("Completed Cloning");
repo.setPath(repoDir.getCanonicalPath());
localRepos.add(repo);
Expand Down