public Status status() {
try {
return git.status().call();
} catch (GitAPIException e) {
throw new RuntimeIOException(e);
}
}
private void commit(Git git, String message) throws GitAPIException {
Status status = git.status().call();
if (!status.getAdded().isEmpty()
|| !status.getChanged().isEmpty()
|| !status.getRemoved().isEmpty()) {
git.commit().setMessage(message).call();
}
}
/**
* @param gitConfigFolder e.g. /your/project/root/.git
* @return Returns true if 'git status' has modified files inside the 'Changes to be committed'
* section
*/
public static boolean isCommitNecessary(String gitConfigFolder) throws MojoExecutionException {
try {
Repository repo = new FileRepository(gitConfigFolder);
Git git = new Git(repo);
Status status = git.status().call();
Set<String> modified = status.getModified();
return (modified.size() != 0);
} catch (Exception e) {
throw new MojoExecutionException("Error trying to find out if git commit is needed", e);
}
}
public void reset() {
try {
if (!git.status().call().isClean()) git.reset().setMode(ResetType.HARD).call();
makeCheckout("master", false);
git.branchDelete().setBranchNames(vmBranch).setForce(true).call();
} catch (Exception e) {
clean(e);
}
}
private void logStatus(final Git git) throws GitAPIException {
final Status status = git.status().call();
if (!status.getAdded().isEmpty()) {
LOG.info("Added files {}", status.getAdded());
}
if (!status.getChanged().isEmpty()) {
LOG.info("Changed files {}", status.getChanged());
}
if (!status.getRemoved().isEmpty()) {
LOG.info("Removed files {}", status.getRemoved());
}
if (!status.getModified().isEmpty()) {
LOG.info("Modified files {}", status.getModified());
}
if (!status.getMissing().isEmpty()) {
LOG.info("Missing files {}", status.getMissing());
}
}
@Override
protected void executeCustom(Git git) throws Exception {
StatusCommand sc = git.status();
Status status = sc.call();
if (isclean != null && status.isClean()) {
PropertyHelper.getPropertyHelper(getProject()).setNewProperty(isclean, "true");
}
if (isdirty != null && !status.isClean()) {
PropertyHelper.getPropertyHelper(getProject()).setNewProperty(isdirty, "true");
}
if (untracked != null) {
ResourceCollection resources = buildResourcesCollection(status.getUntracked());
getProject().addReference(untracked, resources);
}
if (added != null) {
ResourceCollection resources = buildResourcesCollection(status.getAdded());
getProject().addReference(added, resources);
}
if (modified != null) {
ResourceCollection resources = buildResourcesCollection(status.getModified());
getProject().addReference(modified, resources);
}
if (changed != null) {
ResourceCollection resources = buildResourcesCollection(status.getChanged());
getProject().addReference(changed, resources);
}
if (missing != null) {
ResourceCollection resources = buildResourcesCollection(status.getMissing());
getProject().addReference(missing, resources);
}
if (removed != null) {
ResourceCollection resources = buildResourcesCollection(status.getRemoved());
getProject().addReference(removed, resources);
}
}
public void commitAllChanges(final String message) {
final Repository repository = getRepository();
try {
final Git git = new Git(repository);
git.add().addFilepattern(".").call();
final Status status = git.status().call();
if (status.getChanged().size() > 0
|| status.getAdded().size() > 0
|| status.getModified().size() > 0
|| status.getRemoved().size() > 0) {
final RevCommit rev =
git.commit()
.setAll(true)
.setCommitter(person)
.setAuthor(person)
.setMessage(message)
.call();
LOGGER.info("Git commit " + rev.getName() + " [" + message + "]");
}
} catch (final Exception e) {
throw new IllegalStateException("Could not commit changes to local Git repository", e);
}
}
// 2. Get branch/commit hash for the source repo - the actual source code
@Test
public void existsIn2() throws IOException {
final String repo = "binrepo-devex";
// final String repo = "search_raptor_binary";
// String githubUrl = "https://github.scm.corp.ebay.com/api/v3";
// String accessToken = "1cf7d9792235b8592eda18bd7dcc2de37f99b3bc";
final String path = "D:\\dev\\devex\\.binrepo-devex\\.git";
File gitDir = new File(path);
org.eclipse.jgit.lib.Repository repository =
new org.eclipse.jgit.storage.file.FileRepository(gitDir);
String branch = repository.getBranch();
System.out.println("Branch=" + branch);
final Map<String, Ref> allRefs = repository.getAllRefs();
for (String s : allRefs.keySet()) {
System.out.println("Here" + s);
}
RevWalk revWalk = new RevWalk(repository);
ObjectId resolve = repository.resolve(Constants.HEAD);
RevCommit commitRev = revWalk.parseCommit(resolve);
String commitHash = commitRev.getName();
System.out.println(commitHash + "\t" + commitRev.getFullMessage());
Git binaryRepo = Git.open(gitDir);
final ListBranchCommand listBranchCommand = binaryRepo.branchList();
System.out.println(listBranchCommand.getRepository().getFullBranch());
// get "status"
final StatusCommand statusCommand = binaryRepo.status();
Collection<String> toadd = GitUtils.getFilesToStage(statusCommand);
for (String s : toadd) {
System.out.println("To be added:" + s);
}
// add files to "staging"
if (toadd.size() > 0) {
AddCommand addCmd = binaryRepo.add();
for (String file : toadd) {
addCmd.addFilepattern(file);
}
try {
addCmd.call();
} catch (Exception e) {
e.printStackTrace();
}
}
final StoredConfig config = repository.getConfig();
String url = config.getString("remote", "origin", "url");
if (url != null) {
System.out.println("Origin comes from " + url);
}
// commit
final CommitCommand commit = binaryRepo.commit();
String msg = "Saving Repo:%s Branch:%s CommitHash:%s Time:%s";
final String formattedMsg = String.format(msg, repo, branch, commitHash, new Date().toString());
commit.setMessage(formattedMsg);
try {
commit.call();
} catch (Exception e) {
e.printStackTrace();
}
// push to origin now
final PushCommand push = binaryRepo.push();
final String remote = push.getRemote();
System.out.println("Remote to push to:'" + remote + "'");
try {
push.call();
} catch (Exception e) {
e
.printStackTrace(); // To change body of catch statement use File | Settings | File
// Templates.
}
}
public void updateBinaryRepository() throws IOException, GitException, MapServiceException {
// 1. Check if repository exists remotely [email protected]/Binary/Repo_Binary.git
// find the name of the "source repository"
final String repoUrl = getSourceRemoteUrl();
// find where ".git" folder is found
// SourceRepository = D:\dev\devex\binrepo-devex
// BinaryRepository = D:\dev\devex\.binrepo-devex
final File srcRepoDir = sourceRepository.getDirectory();
final File sourceDir = srcRepoDir.getParentFile();
final String sourceRepoFolder = srcRepoDir.getParentFile().getCanonicalPath();
final File parent = srcRepoDir.getParentFile().getParentFile();
final File binaryRepoDir = new File(parent, "." + srcRepoDir.getParentFile().getName());
System.out.println(
"SourceRepository = "
+ sourceRepoFolder
+ "\nBinaryRepository = "
+ binaryRepoDir.getCanonicalPath());
// 2. Get branch/commit hash for the source repo - the actual source code
final org.eclipse.jgit.lib.Repository repository =
new org.eclipse.jgit.storage.file.FileRepository(srcRepoDir);
final String branch = repository.getBranch();
final RevWalk revWalk = new RevWalk(repository);
final ObjectId resolve = repository.resolve(Constants.HEAD);
final RevCommit commit = revWalk.parseCommit(resolve);
String commitHash = commit.getName();
System.out.println("CommitHash:" + commitHash + "\tMessage:" + commit.getFullMessage());
// 3. Call the BinRepo service and check if a corresponding BinRepo entry exists
final String url =
getUrlForFindByRepoBranchCommit()
+ "repourl="
+ URLEncoder.encode(repoUrl, UTF_8)
+ "&branch="
+ URLEncoder.encode(branch, UTF_8)
+ "&commitid="
+ URLEncoder.encode(commitHash, UTF_8);
System.out.println("svc url : " + url);
WebResource webResource = client.resource(url);
boolean noContent = false;
BinRepoBranchCommitDO binRepoBranchCommitDO1 = null;
try {
binRepoBranchCommitDO1 =
webResource.accept(MediaType.APPLICATION_JSON).get(BinRepoBranchCommitDO.class);
} catch (UniformInterfaceException e) {
int statusCode = e.getResponse().getClientResponseStatus().getStatusCode();
System.out.println("Service Status Code : " + statusCode);
noContent =
(statusCode == 204 || statusCode == 404); // HTTP 204 is NO CONTENT which is ok for us
} catch (Exception e) { // Catch-all to deal with network problems etc.
e.printStackTrace();
}
System.out.println(
binRepoBranchCommitDO1 != null
? binRepoBranchCommitDO1.toString()
: "Resource not found on server");
// 4. If not copy all the target folders from the source repo to the binary repo - root to root
// copy of artifacts
if (noContent) {
System.out.println(
"Source Directory:'"
+ sourceDir.getCanonicalPath()
+ "' Destination Directory:'"
+ binaryRepoDir.getCanonicalPath()
+ "'");
FileUtil.copyBinaries(sourceDir, binaryRepoDir);
}
// 5. Call git status to get the delta (Use StatusCommand and refine it)
Git binaryRepo;
try {
binaryRepo = Git.open(binaryRepoDir);
} catch (IOException e) {
throw new GitException("Unable to open repository" + binaryRepoDir, e);
}
// get "status"
final StatusCommand statusCommand = binaryRepo.status();
// TODO: RGIROTI Ask Nambi if we should actually filter this to only add .class files and
// nothing else
Collection<String> filesToStage = GitUtils.getFilesToStage(statusCommand);
/*for (String file : filesToStage) {
System.out.println("File to be added:" + file);
}*/
// add files to "staging" - if there is nothing to stage none of the other operations make any
// sense at all
if (filesToStage.size() > 0) {
final AddCommand addCmd = binaryRepo.add();
for (String file : filesToStage) {
addCmd.addFilepattern(file);
}
final String[] filesArr = filesToStage.toArray(new String[filesToStage.size()]);
final String files = StringUtils.join(filesArr, ",");
try {
addCmd.call();
} catch (Exception e) {
throw new GitException("Unable to add files to repository" + files, e);
}
// 6. Commit the changes to local and call push after that (use JGit API for this)
// 6a. COmmit message should use format "Saving url:branch:commit:UTC time"
// commit
final CommitCommand commitCommand = binaryRepo.commit();
String msg = "Saving Repo:%s Branch:%s CommitHash:%s Time:%s";
final String formattedMsg =
String.format(msg, repoUrl, branch, commitHash, new Date().toString());
commitCommand.setMessage(formattedMsg);
String commitHashBinRepo;
try {
final RevCommit call = commitCommand.call();
commitHashBinRepo = call.getName();
} catch (Exception e) {
throw new GitException("Unable to read commit hash from commit command", e);
}
// push to origin now
final PushCommand push = binaryRepo.push();
final String remote = push.getRemote();
final String remoteBranch = push.getRepository().getBranch();
System.out.println("Remote to push to:'" + remote + "'");
try {
push.call();
} catch (Exception e) {
throw new GitException("Unable to push to remote", e);
}
// Calculate the remote url for binary repository
String binRepoUrl = calculateBinaryRepositoryUrl();
// 7. Call the BinRepo service and create a new entity for this change - repoUrl, branch, and
// commit
System.out.println(
"Update Bin Repo Service with the new changes - POST new object to service");
final BinRepoBranchCommitDO binRepoBranchCommitDO =
newInstance(repoUrl, branch, commitHash, binRepoUrl, remoteBranch, commitHashBinRepo);
webResource = client.resource(getUrlForPost());
BinRepoBranchCommitDO postedDO = null;
try {
postedDO =
webResource
.accept(MediaType.APPLICATION_XML)
.post(BinRepoBranchCommitDO.class, binRepoBranchCommitDO);
} catch (UniformInterfaceException e) {
int statusCode = e.getResponse().getClientResponseStatus().getStatusCode();
System.out.println("status code: " + statusCode);
throw new MapServiceException("Unable to register the commit details in update binrepo", e);
}
System.out.println(postedDO != null ? postedDO.toString() : "Post failed");
}
}
public void createBinaryRepository() throws IOException, GitException, MapServiceException {
// check whether "binary repository" exists
if (isBinaryRepositoryAvailable()) throw new GitException("Repository already exists");
// find the name of the "source repository"
// String sourceRepoName = getRepositoryName();
// find where ".git" folder is found
File f = sourceRepository.getDirectory();
File sourceRepoFolder = f.getParentFile();
String sourceRepoFolderName = f.getParentFile().getName();
// calculate binary repository folder
File parent = f.getParentFile().getParentFile();
File binaryRepoFolder = new File(parent, ("." + sourceRepoFolderName));
// create binary repository folder
FileUtils.mkdir(binaryRepoFolder, true);
// initialize "git" repository
InitCommand initCmd = Git.init();
initCmd.setDirectory(binaryRepoFolder);
Git binaryRepo = null;
try {
System.out.println("initializing bare repository");
binaryRepo = initCmd.call();
} catch (GitAPIException e) {
throw new GitException("unable to initialize repository", e);
}
System.out.println("adding readme.md file");
createReadMeFile(binaryRepoFolder);
// get "status"
StatusCommand statusC = binaryRepo.status();
Collection<String> toadd = GitUtils.getFilesToStage(statusC);
// add "readme" file to staging
if (toadd.size() > 0) {
AddCommand add = binaryRepo.add();
for (String file : toadd) {
add.addFilepattern(file);
}
try {
add.call();
CommitCommand commit = binaryRepo.commit();
commit.setMessage("initial commit");
System.out.println("performing first commit");
commit.call();
} catch (NoFilepatternException e) {
throw new GitException("unable to add file(s)", e);
} catch (GitAPIException e) {
throw new GitException("Unable to add or commit", e);
}
}
// Calculate the remote url for binary repository
String remoteUrl = calculateBinaryRepositoryUrl();
// TODO: check whether the remote exists, if not create it, else fail
GitHub github = new GitHubClient().getGithub();
GHOrganization githubOrg = github.getOrganization("Binary");
GHRepository repository = githubOrg.getRepository(GitUtils.getRepositoryName(remoteUrl));
if (repository == null) {
System.out.println("creating remote repository : " + remoteUrl);
GHRepository repo =
githubOrg.createRepository(
GitUtils.getRepositoryName(remoteUrl),
"Binary repository",
"https://github.scm.corp.ebay.com",
"Owners",
true);
System.out.println(repo.getUrl() + " created successfully ");
} else {
// fail, it shouldn't come here
}
// add "remote" repository
StoredConfig config = binaryRepo.getRepository().getConfig();
config.setString("remote", "origin", "url", remoteUrl);
System.out.println("adding remote origin " + remoteUrl);
config.save();
// get "status"
StatusCommand stat = binaryRepo.status();
Collection<String> filesToAdd = GitUtils.getFilesToStage(stat);
// add files to "staging"
if (filesToAdd.size() > 0) {
AddCommand addCmd = binaryRepo.add();
for (String file : filesToAdd) {
addCmd.addFilepattern(file);
}
try {
addCmd.call();
} catch (NoFilepatternException e) {
throw new GitException("unable to add files", e);
} catch (GitAPIException e) {
throw new GitException("unable to add files", e);
}
}
// commit
System.out.println("commiting the files");
CommitCommand commit = binaryRepo.commit();
// add the 'source' repository git-url, commit-id and branch
commit.setMessage("adding readme.md file");
try {
commit.call();
} catch (NoHeadException e) {
throw new GitException("unable to commit", e);
} catch (NoMessageException e) {
throw new GitException("unable to commit", e);
} catch (UnmergedPathsException e) {
throw new GitException("unable to commit", e);
} catch (ConcurrentRefUpdateException e) {
throw new GitException("unable to commit", e);
} catch (WrongRepositoryStateException e) {
throw new GitException("unable to commit", e);
} catch (GitAPIException e) {
throw new GitException("unable to commit", e);
}
// push
System.out.println("pushing to remote");
PushCommand push = binaryRepo.push();
try {
push.call();
} catch (InvalidRemoteException e) {
throw new GitException("unable to push", e);
} catch (TransportException e) {
throw new GitException("unable to push", e);
} catch (GitAPIException e) {
throw new GitException("unable to push", e);
}
// read the branch from "source" repository
String branchname = sourceRepository.getBranch();
// create a "branch"
if (!branchname.toLowerCase().equals("master")) {
CreateBranchCommand branchCmd = binaryRepo.branchCreate();
branchCmd.setName(branchname);
try {
// create branch
branchCmd.call();
// checkout the branch
CheckoutCommand checkout = binaryRepo.checkout();
checkout.setName(branchname);
checkout.call();
} catch (RefAlreadyExistsException e) {
throw new GitException("unable to create a branch", e);
} catch (RefNotFoundException e) {
throw new GitException("unable to create a branch", e);
} catch (InvalidRefNameException e) {
throw new GitException("unable to create a branch", e);
} catch (GitAPIException e) {
throw new GitException("unable to create a branch", e);
}
}
// find the "localobr" folders and exclude them during copy
List<String> excludes = new ArrayList<String>();
Collection<File> excludeFiles =
FileUtil.findDirectoriesThatEndWith(sourceRepoFolder, "localobr");
for (File file : excludeFiles) {
excludes.add(file.getCanonicalPath());
}
// copy the classes
System.out.println("copying binary files");
copyBinaryFolders("target", excludes, binaryRepoFolder);
// get "status"
StatusCommand statusCmd = binaryRepo.status();
Collection<String> tobeAdded = GitUtils.getFilesToStage(statusCmd);
// add files to "staging"
if (tobeAdded.size() > 0) {
AddCommand addCmd = binaryRepo.add();
for (String file : tobeAdded) {
addCmd.addFilepattern(file);
}
try {
addCmd.call();
} catch (NoFilepatternException e) {
throw new GitException("unable to add files", e);
} catch (GitAPIException e) {
throw new GitException("unable to add files", e);
}
}
// commit
System.out.println("commiting the files");
CommitCommand commit1 = binaryRepo.commit();
commit1.setMessage("saving the files");
try {
commit1.call();
} catch (NoHeadException e) {
throw new GitException("unable to commit", e);
} catch (NoMessageException e) {
throw new GitException("unable to commit", e);
} catch (UnmergedPathsException e) {
throw new GitException("unable to commit", e);
} catch (ConcurrentRefUpdateException e) {
throw new GitException("unable to commit", e);
} catch (WrongRepositoryStateException e) {
throw new GitException("unable to commit", e);
} catch (GitAPIException e) {
throw new GitException("unable to commit", e);
}
// push
System.out.println("pushing to remote");
PushCommand pushCmd = binaryRepo.push();
try {
pushCmd.call();
} catch (InvalidRemoteException e) {
throw new GitException("unable to push", e);
} catch (TransportException e) {
throw new GitException("unable to push", e);
} catch (GitAPIException e) {
throw new GitException("unable to push", e);
}
final String repoUrl = getSourceRemoteUrl();
// branchName was computed above
final org.eclipse.jgit.lib.Repository repo =
new org.eclipse.jgit.storage.file.FileRepository(f);
final RevWalk revWalk = new RevWalk(repo);
final ObjectId resolve = repo.resolve(Constants.HEAD);
final RevCommit commitRev = revWalk.parseCommit(resolve);
final String commitHash = commitRev.getName();
Git git = Git.open(binaryRepoFolder);
final RevCommit binRepoResolveCommitRev;
try {
binRepoResolveCommitRev = git.log().call().iterator().next();
} catch (NoHeadException e) {
throw new GitException("No head found for repo", e);
} catch (GitAPIException e) {
throw new GitException("No head found for repo", e);
}
final String binRepoResolveCommitHash = binRepoResolveCommitRev.getName();
final String binRepoBranchName = git.getRepository().getBranch();
System.out.println("Update Bin Repo Service with the new changes - POST new object to service");
final BinRepoBranchCommitDO binRepoBranchCommitDO =
newInstance(
repoUrl,
branchname,
commitHash,
remoteUrl,
binRepoBranchName,
binRepoResolveCommitHash);
final WebResource resource = client.resource(getUrlForPost());
BinRepoBranchCommitDO postedDO = null;
try {
postedDO =
resource
.accept(MediaType.APPLICATION_XML)
.post(BinRepoBranchCommitDO.class, binRepoBranchCommitDO);
System.out.println("Posted Object = " + postedDO.toString());
} catch (UniformInterfaceException e) {
int statusCode = e.getResponse().getClientResponseStatus().getStatusCode();
System.out.println("status code: " + statusCode);
throw new MapServiceException("Unable to register the commit details", e);
}
// System.out.println(postedDO != null ? postedDO.toString() : "postedDO was null");
System.out.println("updated the map service");
}
/**
* Gets the status of this file.
*
* @return status of this file.
*/
public TextArea getStatus() {
TextArea area = null;
try {
Path repoPath = this.getHost().repository;
Git git = Git.open(repoPath.toFile());
//
// I would like to use absolutePath, but that seems to barf when
// we try to relativize this if a full path is not given.
//
Path relativePath = repoPath.relativize(Paths.get(this.file.getPath()));
Status status = git.status().addPath(relativePath.toString()).call();
if (logger.isDebugEnabled()) {
logger.debug(this.file.getAbsolutePath());
logger.debug("Added: " + status.getAdded());
logger.debug("Changed: " + status.getChanged());
logger.debug("Conflicting: " + status.getConflicting());
logger.debug("Missing: " + status.getMissing());
logger.debug("Modified: " + status.getModified());
logger.debug("Removed: " + status.getRemoved());
logger.debug("Uncommitted: " + status.getUncommittedChanges());
logger.debug("Untracked: " + status.getUntracked());
logger.debug("Untracked folders; " + status.getUntrackedFolders());
}
//
// Are we a file or directory?
//
StringBuffer buffer = new StringBuffer();
int length = 0;
if (this.file.isFile()) {
if (status.getAdded().contains(relativePath.toString())) {
buffer.append("Added" + "\n");
length++;
}
if (status.getChanged().contains(relativePath.toString())) {
buffer.append("Changed" + "\n");
length++;
}
if (status.getConflicting().contains(relativePath.toString())) {
buffer.append("Conflicting" + "\n");
length++;
}
if (status.getMissing().contains(relativePath.toString())) {
buffer.append("Missing" + "\n");
length++;
}
if (status.getModified().contains(relativePath.toString())) {
buffer.append("Modified" + "\n");
length++;
}
if (status.getRemoved().contains(relativePath.toString())) {
buffer.append("Removed" + "\n");
length++;
}
if (status.getUncommittedChanges().contains(relativePath.toString())) {
buffer.append("Uncommitted" + "\n");
length++;
}
if (status.getUntracked().contains(relativePath.toString())) {
buffer.append("Untracked (New)" + "\n");
length++;
}
if (status.getUntrackedFolders().contains(relativePath.toString())) {
buffer.append("Untracked Folders (New)" + "\n");
length++;
}
} else if (this.file.isDirectory()) {
if (status.getUntracked().size() > 0) {
buffer.append("Untracked (New)" + "\n");
length++;
}
if (status.getUntrackedFolders().size() > 0) {
buffer.append("Untracked Folders (New)" + "\n");
length++;
}
}
if (length > 0) {
area = new TextArea();
area.setValue(buffer.toString().trim());
area.setWidth("100.0%");
area.setRows(length);
area.setReadOnly(true);
}
} catch (IOException | NoWorkTreeException | GitAPIException e) {
logger.error(e);
}
return area;
}
private void stageMissingFilesAsDeleted(final Git git) throws GitAPIException {
final Status status = git.status().call();
for (final String missingFile : status.getMissing()) {
git.rm().addFilepattern(missingFile).call();
}
}
/**
* Get the current status of the Git repository.
*
* @return {@link org.eclipse.jgit.api.Status} object
* @throws NoWorkTreeException
* @throws GitAPIException
*/
public Status status() throws NoWorkTreeException, GitAPIException {
return git.status().call();
}